Mercurial > octave
changeset 22020:e154d23b2fd1
maint: reduce multiple mentions of the HG-ID file name and contents
* build-aux/mk-hg-id.sh: Use ${hg_id} variable everywhere HG-ID is mentioned.
* Makefile.am (all-local): Use $(HG_ID_VAR) instead of reading HG-ID again.
* libgui/src/module.mk (libgui/src/liboctgui-build-info.cc): Likewise.
* libinterp/module.mk (libinterp/liboctinterp-build-info.cc): Likewise.
* liboctave/module.mk (liboctave/liboctave-build-info.cc): Likewise.
* src/module.mk (src/octave-build-info.cc): Likewise.
| author | Mike Miller <mtmiller@octave.org> |
|---|---|
| date | Fri, 01 Jul 2016 08:14:50 -0700 |
| parents | 2d8e9bdf5683 |
| children | e67ff2b11147 |
| files | Makefile.am build-aux/mk-hg-id.sh libgui/src/module.mk libinterp/module.mk liboctave/module.mk src/module.mk |
| diffstat | 6 files changed, 14 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile.am Fri Jul 01 07:48:09 2016 -0400 +++ b/Makefile.am Fri Jul 01 08:14:50 2016 -0700 @@ -321,7 +321,7 @@ @echo " make check - to run the tests" @echo " make install - to install (PREFIX=$(prefix))" @echo "" - @echo " HG ID for this build is \"`cat HG-ID`\"" + @echo " HG ID for this build is \"$(HG_ID_VAR)\"" @echo "" run-octave: run-octave.in build-aux/subst-script-vals.sh @@ -383,7 +383,8 @@ .PHONY: ChangeLog ## The mk-hg-id.sh script will be executed each time Make runs. It will -## update the HG-ID file in the build tree if it is out of date. +## update the HG-ID file in the build tree if it is out of date. As a side +## effect, HG_ID_VAR is assigned the contents of the file. if AMCOND_ENABLE_HG_ID HG_ID_VAR := \
--- a/build-aux/mk-hg-id.sh Fri Jul 01 07:48:09 2016 -0400 +++ b/build-aux/mk-hg-id.sh Fri Jul 01 08:14:50 2016 -0700 @@ -41,10 +41,10 @@ ( cd $srcdir && hg identify --id || echo "unknown" ) > ${hg_id}-t ${move_if_change} ${hg_id}-t ${hg_id} elif [ ! -f $srcdir/${hg_id} ]; then - echo "WARNING: $srcdir/HG-ID is missing!" 1>&2 + echo "WARNING: $srcdir/${hg_id} is missing!" 1>&2 echo "unknown" > ${hg_id}-t && mv ${hg_id}-t ${hg_id} else - echo "preserving existing HG-ID file" 1>&2 + echo "preserving existing ${hg_id} file" 1>&2 if [ "x$srcdir" != "x." ] && [ -f $srcdir/${hg_id} ] && [ ! -f ${hg_id} ]; then cp ${srcdir}/${hg_id} ${hg_id} touch -r ${srcdir}/${hg_id} ${hg_id} @@ -52,7 +52,7 @@ fi if [ "`cat ${hg_id}`" = "hg-id-disabled" ]; then - echo "WARNING: HG-ID is 'hg-id-disabled'" 1>&2 + echo "WARNING: ${hg_id} is 'hg-id-disabled'" 1>&2 fi cat ${hg_id}
--- a/libgui/src/module.mk Fri Jul 01 07:48:09 2016 -0400 +++ b/libgui/src/module.mk Fri Jul 01 08:14:50 2016 -0700 @@ -236,9 +236,9 @@ $(octave_gui_UI_H) \ $(octave_gui_RC) -libgui/src/liboctgui-build-info.cc: libgui/src/liboctgui-build-info.in.cc HG-ID | libgui/src/$(octave-dirstamp) +libgui/src/liboctgui-build-info.cc: libgui/src/liboctgui-build-info.in.cc | libgui/src/$(octave-dirstamp) $(AM_V_GEN)rm -f $@-t && \ $(SED) \ -e "s|%NO_EDIT_WARNING%|DO NOT EDIT! Generated automatically by Makefile|" \ - -e "s|%OCTAVE_HG_ID%|`cat $(builddir)/HG-ID`|" $< > $@-t && \ + -e "s|%OCTAVE_HG_ID%|$(HG_ID_VAR)|" $< > $@-t && \ $(simple_move_if_change_rule)
--- a/libinterp/module.mk Fri Jul 01 07:48:09 2016 -0400 +++ b/libinterp/module.mk Fri Jul 01 08:14:50 2016 -0700 @@ -238,11 +238,11 @@ libinterp/version.h: libinterp/version.in.h build-aux/mk-version-h.sh | libinterp/$(octave-dirstamp) $(AM_V_GEN)$(call simple-filter-rule,build-aux/mk-version-h.sh) -libinterp/liboctinterp-build-info.cc: libinterp/liboctinterp-build-info.in.cc HG-ID | libinterp/$(octave-dirstamp) +libinterp/liboctinterp-build-info.cc: libinterp/liboctinterp-build-info.in.cc | libinterp/$(octave-dirstamp) $(AM_V_GEN)rm -f $@-t && \ $(SED) \ -e "s|%NO_EDIT_WARNING%|DO NOT EDIT! Generated automatically by Makefile|" \ - -e "s|%OCTAVE_HG_ID%|`cat $(builddir)/HG-ID`|" $< > $@-t && \ + -e "s|%OCTAVE_HG_ID%|$(HG_ID_VAR)|" $< > $@-t && \ $(simple_move_if_change_rule) if AMCOND_ENABLE_DYNAMIC_LINKING
--- a/liboctave/module.mk Fri Jul 01 07:48:09 2016 -0400 +++ b/liboctave/module.mk Fri Jul 01 08:14:50 2016 -0700 @@ -110,11 +110,11 @@ nobase_liboctavetests_DATA = $(LIBOCTAVE_TST_FILES) -liboctave/liboctave-build-info.cc: liboctave/liboctave-build-info.in.cc HG-ID | liboctave/$(octave-dirstamp) +liboctave/liboctave-build-info.cc: liboctave/liboctave-build-info.in.cc | liboctave/$(octave-dirstamp) $(AM_V_GEN)rm -f $@-t && \ $(SED) \ -e "s|%NO_EDIT_WARNING%|DO NOT EDIT! Generated automatically by Makefile|" \ - -e "s|%OCTAVE_HG_ID%|`cat $(builddir)/HG-ID`|" $< > $@-t && \ + -e "s|%OCTAVE_HG_ID%|$(HG_ID_VAR)|" $< > $@-t && \ $(simple_move_if_change_rule)
--- a/src/module.mk Fri Jul 01 07:48:09 2016 -0400 +++ b/src/module.mk Fri Jul 01 08:14:50 2016 -0700 @@ -211,11 +211,11 @@ src/main.cc: src/main.in.cc build-aux/subst-default-vals.sh | src/$(octave_dirstamp) $(AM_V_GEN)$(call simple-filter-rule,build-aux/subst-default-vals.sh) -src/octave-build-info.cc: src/octave-build-info.in.cc HG-ID | src/$(octave-dirstamp) +src/octave-build-info.cc: src/octave-build-info.in.cc | src/$(octave-dirstamp) $(AM_V_GEN)rm -f $@-t && \ $(SED) \ -e "s|%NO_EDIT_WARNING%|DO NOT EDIT! Generated automatically by Makefile|" \ - -e "s|%OCTAVE_HG_ID%|`cat $(builddir)/HG-ID`|" $< > $@-t && \ + -e "s|%OCTAVE_HG_ID%|$(HG_ID_VAR)|" $< > $@-t && \ $(simple_move_if_change_rule) ALL_LOCAL_TARGETS += $(OCTAVE_VERSION_LINKS) $(OCTAVE_CROSS_TOOLS)