Mercurial > octave
comparison libinterp/build-info.in.cc @ 21598:cf552443c104
revise method of handling hg id for build info
* Makefile.am (HG-ID): New target and file to distribute.
* build-info.h: Don't include config.h.
* build-info.in.cc: Strip CR from line endings.
* build-info.h, build-info.in.cc
(octave_hg_id): Rename from oct_hg_id.
(octave_build_date): Rename from oct_build_date.
(octave_build_time): Rename from oct_build_time.
Change all callers.
* toplev.cc (F__octave_config_info__): Rename fields: builddate to
build_date, buildtime to build_time, hgid to hg_id, and releasedate to
* libinterp/module.mk (upate_hg_id): Delete rule.
(octinclude_HEADERS): Include build-info.h in the list.
(BUILT_SOURCES): Remove update_hg_id from the list.
(libinterp/build-info.cc): Don't depend on build-aux/mk-build-info.sh.
Depend on HG-ID instead of libinterp/hg.id. Call sed directly here
instead of using a shell script.
* build-aux/mk-build-info-cc.in.sh: Delete.
* Makefile.am (EXTRA_DIST): Remove build-aux/mk-build-info-cc.sh.in
from the list.
(GEN_CONFIG_SHELL): Remove build-aux/mk-build-info-cc.sh
from the list.
* configure.ac (OCTAVE_CONFIG_MOVE_IF_CHANGE_FILES): Remove
build-aux/mk-build-info-cc.sh from the list.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Sat, 09 Apr 2016 18:58:28 -0400 |
parents | fe1447ae68cf |
children | 184b85b31e03 |
comparison
equal
deleted
inserted
replaced
21597:fe1447ae68cf | 21598:cf552443c104 |
---|---|
19 along with Octave; see the file COPYING. If not, see | 19 along with Octave; see the file COPYING. If not, see |
20 <http://www.gnu.org/licenses/>. | 20 <http://www.gnu.org/licenses/>. |
21 | 21 |
22 */ | 22 */ |
23 | 23 |
24 #ifdef HAVE_CONFIG_H | |
25 # include "config.h" | |
26 #endif | |
27 | |
24 #include "build-info.h" | 28 #include "build-info.h" |
25 | 29 |
26 std::string oct_hg_id (void) | 30 std::string |
31 octave_hg_id (void) | |
27 { | 32 { |
28 return "%OCTAVE_HG_ID%"; | 33 return "%OCTAVE_HG_ID%"; |
29 } | 34 } |
30 | 35 |
31 std::string oct_build_date (void) | 36 std::string |
37 octave_build_date (void) | |
32 { | 38 { |
33 return __DATE__; | 39 return __DATE__; |
34 } | 40 } |
35 | 41 |
36 std::string oct_build_time (void) | 42 std::string |
43 octave_build_time (void) | |
37 { | 44 { |
38 return __TIME__; | 45 return __TIME__; |
39 } | 46 } |