Mercurial > octave

comparison Makefile.am @ 21598:cf552443c104

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 43d9eec519bd
comparison
equal deleted inserted replaced
21597:fe1447ae68cf 21598:cf552443c104
35 35
36 BUILT_DISTFILES += \ 36 BUILT_DISTFILES += \
37 AUTHORS \ 37 AUTHORS \
38 BUGS \ 38 BUGS \
39 ChangeLog \ 39 ChangeLog \
40 HG-ID \
40 INSTALL.OCTAVE 41 INSTALL.OCTAVE
41 42
42 EXTRA_DIST += \ 43 EXTRA_DIST += \
43 CITATION \ 44 CITATION \
44 COPYING \ 45 COPYING \
50 build-aux/find-files-with-tests.sh \ 51 build-aux/find-files-with-tests.sh \
51 build-aux/mk-default-qt-settings.in.sh \ 52 build-aux/mk-default-qt-settings.in.sh \
52 build-aux/mk-f77-def.in.sh \ 53 build-aux/mk-f77-def.in.sh \
53 build-aux/mk-mxarray-h.in.sh \ 54 build-aux/mk-mxarray-h.in.sh \
54 build-aux/mk-version-h.in.sh \ 55 build-aux/mk-version-h.in.sh \
55 build-aux/mk-build-info-cc.in.sh \
56 build-aux/mk-octave-config-h.sh \ 56 build-aux/mk-octave-config-h.sh \
57 build-aux/mk-opts.pl \ 57 build-aux/mk-opts.pl \
58 build-aux/move-if-change \ 58 build-aux/move-if-change \
59 build-aux/stl_algo.h-fixed \ 59 build-aux/stl_algo.h-fixed \
60 build-aux/subst-config-vals.in.sh \ 60 build-aux/subst-config-vals.in.sh \
68 GEN_CONFIG_SHELL = \ 68 GEN_CONFIG_SHELL = \
69 build-aux/mk-default-qt-settings.sh \ 69 build-aux/mk-default-qt-settings.sh \
70 build-aux/mk-f77-def.sh \ 70 build-aux/mk-f77-def.sh \
71 build-aux/mk-mxarray-h.sh \ 71 build-aux/mk-mxarray-h.sh \
72 build-aux/mk-version-h.sh \ 72 build-aux/mk-version-h.sh \
73 build-aux/mk-build-info-cc.sh \
74 build-aux/subst-config-vals.sh \ 73 build-aux/subst-config-vals.sh \
75 build-aux/subst-cross-config-vals.sh \ 74 build-aux/subst-cross-config-vals.sh \
76 build-aux/subst-default-vals.sh \ 75 build-aux/subst-default-vals.sh \
77 build-aux/subst-f77-isnan-macro.sh \ 76 build-aux/subst-f77-isnan-macro.sh \
78 build-aux/subst-script-vals.sh 77 build-aux/subst-script-vals.sh
285 284
286 ChangeLog: 285 ChangeLog:
287 $(AM_V_GEN)$(changelog-from-hg-log) 286 $(AM_V_GEN)$(changelog-from-hg-log)
288 .PHONY: ChangeLog 287 .PHONY: ChangeLog
289 288
289 HG-ID:
290 $(AM_V_GEN)rm -f $@-t && \
291 if [ -d $(srcdir)/.hg ]; then \
292 ( cd $(srcdir) && hg identify --id ) > $@-t && \
293 $(simple_move_if_change_rule); \
294 elif [ ! -f $(srcdir)/HG-ID ]; then \
295 echo "$(srcdir)/HG-ID is missing!" 1>&2; \
296 echo "unknown" >& $@-t && mv $@-t $@; \
297 else \
298 echo "preserving existing HG-ID file" 1>&2; \
299 $(cp_update_rule); \
300 fi
301 .PHONY: HG-ID
302
290 octetc_DATA += \ 303 octetc_DATA += \
291 CITATION \ 304 CITATION \
292 NEWS 305 NEWS
293 306
294 if AMCOND_INSTALL_BUILD_LOGS 307 if AMCOND_INSTALL_BUILD_LOGS