Mercurial > octave
changeset 21281:b76955e83fe4
maint: Run all build shell scripts with SHELL as command interpreter
* Makefile.am, common.mk, doc/module.mk, libinterp/corefcn/module.mk,
libinterp/module.mk, libinterp/octave-value/module.mk,
libinterp/operators/module.mk, liboctave/module.mk, scripts/module.mk,
test/module.mk: Use $(SHELL) variable as command interpreter for all build
helper shell scripts.
* config-images.sh, config-module.sh, config-ops.sh: Use ${SHELL}
environment variable as command interpreter for move-if-change helper
script.
| author | Mike Miller <mtmiller@octave.org> |
|---|---|
| date | Tue, 16 Feb 2016 23:08:31 -0800 |
| parents | ebdf74c15722 |
| children | 7abdce2ae900 |
| files | Makefile.am build-aux/common.mk doc/interpreter/config-images.sh doc/module.mk libinterp/corefcn/module.mk libinterp/dldfcn/config-module.sh libinterp/module.mk libinterp/octave-value/module.mk libinterp/operators/module.mk liboctave/module.mk liboctave/operators/config-ops.sh scripts/module.mk test/module.mk |
| diffstat | 13 files changed, 35 insertions(+), 32 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile.am Wed Feb 17 02:54:00 2016 -0500 +++ b/Makefile.am Tue Feb 16 23:08:31 2016 -0800 @@ -189,7 +189,7 @@ chmod a+rx "$@" octave-config.h: config.h build-aux/mk-octave-config-h.sh - $(AM_V_GEN)$(top_srcdir)/build-aux/mk-octave-config-h.sh $< > $@-t && \ + $(AM_V_GEN)$(SHELL) $(top_srcdir)/build-aux/mk-octave-config-h.sh $< > $@-t && \ mv $@-t $@ bits/stl_algo.h: build-aux/stl_algo.h-fixed
--- a/build-aux/common.mk Wed Feb 17 02:54:00 2016 -0500 +++ b/build-aux/common.mk Tue Feb 16 23:08:31 2016 -0800 @@ -477,7 +477,7 @@ define simple_move_if_change_rule if [ -s $@-t ]; then \ - $(top_srcdir)/build-aux/move-if-change $@-t $@; \ + $(SHELL) $(top_srcdir)/build-aux/move-if-change $@-t $@; \ else \ echo "$@-t is empty!" 1>&2; \ rm -f $@-t; \
--- a/doc/interpreter/config-images.sh Wed Feb 17 02:54:00 2016 -0500 +++ b/doc/interpreter/config-images.sh Tue Feb 16 23:08:31 2016 -0800 @@ -3,6 +3,7 @@ set -e AWK=${AWK:-awk} +SHELL=${SHELL:-/bin/sh} if [ $# -eq 1 ]; then top_srcdir="$1" @@ -16,4 +17,4 @@ $AWK -v dir=doc/interpreter -f $interp_dir/images.awk < $interp_dir/images > $interp_dir/images.mk-t -$move_if_change $interp_dir/images.mk-t $interp_dir/images.mk +$SHELL $move_if_change $interp_dir/images.mk-t $interp_dir/images.mk
--- a/doc/module.mk Wed Feb 17 02:54:00 2016 -0500 +++ b/doc/module.mk Tue Feb 16 23:08:31 2016 -0800 @@ -552,7 +552,7 @@ DIRSTAMP_FILES += doc/refcard/$(octave_dirstamp) $(srcdir)/doc/interpreter/images.mk: $(srcdir)/doc/interpreter/config-images.sh $(srcdir)/doc/interpreter/images.awk $(srcdir)/doc/interpreter/images - $(srcdir)/doc/interpreter/config-images.sh $(top_srcdir) + $(SHELL) $(srcdir)/doc/interpreter/config-images.sh $(top_srcdir) $(refcard_DVI) : %.dvi : %.tex | doc/refcard/$(octave_dirstamp) -$(AM_V_TEX)cd $(@D) && \
--- a/libinterp/corefcn/module.mk Wed Feb 17 02:54:00 2016 -0500 +++ b/libinterp/corefcn/module.mk Tue Feb 16 23:08:31 2016 -0800 @@ -279,7 +279,7 @@ $(libinterp_corefcn_libcorefcn_la_CPPFLAGS) $(CPPFLAGS) \ $(libinterp_corefcn_libcorefcn_la_CXXFLAGS) $(CXXFLAGS) \ -DMAKE_BUILTINS $< > $@-t1 && \ - $(srcdir)/libinterp/mkdefs $(srcdir)/libinterp $< < $@-t1 > $@-t && \ + $(SHELL) $(srcdir)/libinterp/mkdefs $(srcdir)/libinterp $< < $@-t1 > $@-t && \ rm -f $@-t1 && \ mv $@-t $@ @@ -304,9 +304,9 @@ libinterp/corefcn/oct-errno.cc: libinterp/corefcn/oct-errno.in.cc Makefile $(AM_V_GEN)rm -f $@-t && \ if test -n "$(PERL)"; then \ - $(srcdir)/libinterp/mk-errno-list --perl "$(PERL)" < $< > $@-t; \ + $(SHELL) $(srcdir)/libinterp/mk-errno-list --perl "$(PERL)" < $< > $@-t; \ elif test -n "$(PYTHON)"; then \ - $(srcdir)/libinterp/mk-errno-list --python "$(PYTHON)" < $< > $@-t; \ + $(SHELL) $(srcdir)/libinterp/mk-errno-list --python "$(PYTHON)" < $< > $@-t; \ else \ $(SED) '/@SYSDEP_ERRNO_LIST@/D' $< > $@-t; \ fi && \
--- a/libinterp/dldfcn/config-module.sh Wed Feb 17 02:54:00 2016 -0500 +++ b/libinterp/dldfcn/config-module.sh Tue Feb 16 23:08:31 2016 -0800 @@ -3,6 +3,7 @@ set -e AWK=${AWK:-awk} +SHELL=${SHELL:-/bin/sh} if [ $# -eq 1 ]; then top_srcdir="$1" @@ -16,4 +17,4 @@ $AWK -f $dld_dir/config-module.awk < $dld_dir/module-files > $dld_dir/module.mk-t -$move_if_change $dld_dir/module.mk-t $dld_dir/module.mk +$SHELL $move_if_change $dld_dir/module.mk-t $dld_dir/module.mk
--- a/libinterp/module.mk Wed Feb 17 02:54:00 2016 -0500 +++ b/libinterp/module.mk Tue Feb 16 23:08:31 2016 -0800 @@ -136,7 +136,7 @@ include libinterp/dldfcn/module.mk $(srcdir)/libinterp/dldfcn/module.mk: $(srcdir)/libinterp/dldfcn/config-module.sh $(srcdir)/libinterp/dldfcn/config-module.awk $(srcdir)/libinterp/dldfcn/module-files - $(srcdir)/libinterp/dldfcn/config-module.sh $(top_srcdir) + $(SHELL) $(srcdir)/libinterp/dldfcn/config-module.sh $(top_srcdir) if AMCOND_ENABLE_DYNAMIC_LINKING OCT_FILES = $(DLDFCN_LIBS:.la=.oct) @@ -190,7 +190,7 @@ ULT_DIST_SRC := \ $(filter-out $(GENERATED_PARSER_FILES), $(DIST_SRC)) $(ULT_PARSER_SRC) -SRC_DEF_FILES := $(shell $(srcdir)/libinterp/find-defun-files.sh "$(srcdir)" $(ULT_DIST_SRC)) +SRC_DEF_FILES := $(shell $(SHELL) $(srcdir)/libinterp/find-defun-files.sh "$(srcdir)" $(ULT_DIST_SRC)) DLDFCN_DEF_FILES = $(DLDFCN_SRC:.cc=.df) @@ -222,13 +222,13 @@ $(libinterp_liboctinterp_la_CPPFLAGS) $(LLVM_CPPFLAGS) $(CPPFLAGS) \ $(libinterp_liboctinterp_la_CXXFLAGS) $(CXXFLAGS) \ -DMAKE_BUILTINS $< > $@-t1 && \ - $(srcdir)/libinterp/mkdefs $(srcdir)/libinterp $< < $@-t1 > $@-t && \ + $(SHELL) $(srcdir)/libinterp/mkdefs $(srcdir)/libinterp $< < $@-t1 > $@-t && \ rm -f $@-t1 && \ mv $@-t $@ ## Rules to build test files -LIBINTERP_TST_FILES_SRC := $(shell $(top_srcdir)/build-aux/find-files-with-tests.sh "$(srcdir)" $(ULT_DIST_SRC) $(DLDFCN_SRC)) +LIBINTERP_TST_FILES_SRC := $(shell $(SHELL) $(top_srcdir)/build-aux/find-files-with-tests.sh "$(srcdir)" $(ULT_DIST_SRC) $(DLDFCN_SRC)) LIBINTERP_TST_FILES := $(addsuffix -tst,$(LIBINTERP_TST_FILES_SRC)) @@ -254,7 +254,7 @@ libinterp/build-env-features.cc: $(top_builddir)/config.h libinterp/build-env-features.sh $(AM_V_GEN)rm -f $@-t && \ - $(srcdir)/libinterp/build-env-features.sh $< > $@-t && \ + $(SHELL) $(srcdir)/libinterp/build-env-features.sh $< > $@-t && \ $(simple_move_if_change_rule) libinterp/version.h: libinterp/version.in.h Makefile @@ -272,12 +272,12 @@ libinterp/builtins.cc: $(DEF_FILES) libinterp/mkbuiltins $(AM_V_GEN)rm -f $@-t && \ - $(srcdir)/libinterp/mkbuiltins --source $(DEF_FILES) > $@-t && \ + $(SHELL) $(srcdir)/libinterp/mkbuiltins --source $(DEF_FILES) > $@-t && \ $(simple_move_if_change_rule) libinterp/builtin-defun-decls.h: $(SRC_DEF_FILES) libinterp/mkbuiltins $(AM_V_GEN)rm -f $@-t && \ - $(srcdir)/libinterp/mkbuiltins --header $(SRC_DEF_FILES) > $@-t && \ + $(SHELL) $(srcdir)/libinterp/mkbuiltins --header $(SRC_DEF_FILES) > $@-t && \ $(simple_move_if_change_rule) if AMCOND_ENABLE_DYNAMIC_LINKING @@ -285,7 +285,7 @@ libinterp/dldfcn/PKG_ADD: $(DLDFCN_DEF_FILES) libinterp/mk-pkg-add $(AM_V_GEN)rm -f $@-t && \ - $(srcdir)/libinterp/mk-pkg-add $(DLDFCN_DEF_FILES) > $@-t && \ + $(SHELL) $(srcdir)/libinterp/mk-pkg-add $(DLDFCN_DEF_FILES) > $@-t && \ $(simple_move_if_change_rule) endif @@ -303,7 +303,7 @@ fi && \ $(PERL) $(srcdir)/libinterp/gendoc.pl $(ALL_DEF_FILES) > $@-t && \ mv $@-t $@ && \ - $(top_srcdir)/build-aux/move-if-change $@ libinterp/DOCSTRINGS && \ + $(SHELL) $(top_srcdir)/build-aux/move-if-change $@ libinterp/DOCSTRINGS && \ touch $@ OCTAVE_INTERPRETER_TARGETS += \
--- a/libinterp/octave-value/module.mk Wed Feb 17 02:54:00 2016 -0500 +++ b/libinterp/octave-value/module.mk Tue Feb 16 23:08:31 2016 -0800 @@ -142,7 +142,7 @@ $(libinterp_octave_value_liboctave_value_la_CPPFLAGS) $(JAVA_CPPFLAGS) $(CPPFLAGS) \ $(libinterp_octave_value_liboctave_value_la_CXXFLAGS) $(CXXFLAGS) \ -DMAKE_BUILTINS $< > $@-t1 && \ - $(srcdir)/libinterp/mkdefs $(srcdir)/libinterp $< < $@-t1 > $@-t && \ + $(SHELL) $(srcdir)/libinterp/mkdefs $(srcdir)/libinterp $< < $@-t1 > $@-t && \ mv $@-t $@ && \ rm -f $@-t1
--- a/libinterp/operators/module.mk Wed Feb 17 02:54:00 2016 -0500 +++ b/libinterp/operators/module.mk Tue Feb 16 23:08:31 2016 -0800 @@ -138,5 +138,5 @@ ## Special rules for sources which must be built before rest of compilation. libinterp/operators/ops.cc: $(LIBINTERP_OPERATORS_SRC) libinterp/mkops $(AM_V_GEN)rm -f $@-t $@ && \ - $(srcdir)/libinterp/mkops $(LIBINTERP_OPERATORS_SRC) > $@-t && \ + $(SHELL) $(srcdir)/libinterp/mkops $(LIBINTERP_OPERATORS_SRC) > $@-t && \ mv $@-t $@
--- a/liboctave/module.mk Wed Feb 17 02:54:00 2016 -0500 +++ b/liboctave/module.mk Tue Feb 16 23:08:31 2016 -0800 @@ -94,7 +94,7 @@ $(liboctave_util_libutil_la_SOURCES) \ $(LIBOCTAVE_TEMPLATE_SRC) -LIBOCTAVE_TST_FILES_SRC := $(shell $(top_srcdir)/build-aux/find-files-with-tests.sh "$(srcdir)" $(LIBOCTAVE_TST_SRC)) +LIBOCTAVE_TST_FILES_SRC := $(shell $(SHELL) $(top_srcdir)/build-aux/find-files-with-tests.sh "$(srcdir)" $(LIBOCTAVE_TST_SRC)) LIBOCTAVE_TST_FILES := $(addsuffix -tst,$(LIBOCTAVE_TST_FILES_SRC))
--- a/liboctave/operators/config-ops.sh Wed Feb 17 02:54:00 2016 -0500 +++ b/liboctave/operators/config-ops.sh Tue Feb 16 23:08:31 2016 -0800 @@ -3,6 +3,7 @@ set -e AWK=${AWK:-awk} +SHELL=${SHELL:-/bin/sh} if [ $# -lt 3 ]; then src_type="all" @@ -34,7 +35,7 @@ inc | all) VX_INC=$($AWK -f $mk_ops -v prefix=vx -v list_h_files=1 $liboctave_dir/vx-ops) echo "VX_OP_INC = $VX_INC" > $liboctave_dir/vx-op-inc.mk-t - $move_if_change $liboctave_dir/vx-op-inc.mk-t $liboctave_dir/vx-op-inc.mk + $SHELL $move_if_change $liboctave_dir/vx-op-inc.mk-t $liboctave_dir/vx-op-inc.mk ;; esac ;; @@ -46,7 +47,7 @@ src | all) VX_SRC=$($AWK -f $mk_ops -v prefix=vx -v list_cc_files=1 $liboctave_dir/vx-ops) echo "VX_OP_SRC = $VX_SRC" > $liboctave_dir/vx-op-src.mk-t - $move_if_change $liboctave_dir/vx-op-src.mk-t $liboctave_dir/vx-op-src.mk + $SHELL $move_if_change $liboctave_dir/vx-op-src.mk-t $liboctave_dir/vx-op-src.mk ;; esac ;; @@ -58,7 +59,7 @@ inc | all) MX_INC=$($AWK -f $mk_ops -v prefix=mx -v list_h_files=1 $liboctave_dir/mx-ops) echo "MX_OP_INC = $MX_INC" > $liboctave_dir/mx-op-inc.mk-t - $move_if_change $liboctave_dir/mx-op-inc.mk-t $liboctave_dir/mx-op-inc.mk + $SHELL $move_if_change $liboctave_dir/mx-op-inc.mk-t $liboctave_dir/mx-op-inc.mk ;; esac ;; @@ -70,7 +71,7 @@ src | all) MX_SRC=$($AWK -f $mk_ops -v prefix=mx -v list_cc_files=1 $liboctave_dir/mx-ops) echo "MX_OP_SRC = $MX_SRC" > $liboctave_dir/mx-op-src.mk-t - $move_if_change $liboctave_dir/mx-op-src.mk-t $liboctave_dir/mx-op-src.mk + $SHELL $move_if_change $liboctave_dir/mx-op-src.mk-t $liboctave_dir/mx-op-src.mk ;; esac ;; @@ -82,7 +83,7 @@ inc | all) SMX_INC=$($AWK -f $mk_ops -v prefix=smx -v list_h_files=1 $liboctave_dir/smx-ops) echo "SMX_OP_INC = $SMX_INC" > $liboctave_dir/smx-op-inc.mk-t - $move_if_change $liboctave_dir/smx-op-inc.mk-t $liboctave_dir/smx-op-inc.mk + $SHELL $move_if_change $liboctave_dir/smx-op-inc.mk-t $liboctave_dir/smx-op-inc.mk ;; esac ;; @@ -94,7 +95,7 @@ src | all) SMX_SRC=$($AWK -f $mk_ops -v prefix=smx -v list_cc_files=1 $liboctave_dir/smx-ops) echo "SMX_OP_SRC = $SMX_SRC" > $liboctave_dir/smx-op-src.mk-t - $move_if_change $liboctave_dir/smx-op-src.mk-t $liboctave_dir/smx-op-src.mk + $SHELL $move_if_change $liboctave_dir/smx-op-src.mk-t $liboctave_dir/smx-op-src.mk ;; esac ;;
--- a/scripts/module.mk Wed Feb 17 02:54:00 2016 -0500 +++ b/scripts/module.mk Tue Feb 16 23:08:31 2016 -0800 @@ -90,7 +90,7 @@ define PKG_ADD_FILE_TEMPLATE $(1)/PKG_ADD: $$($(2)_FCN_FILES) $$($(2)_GEN_FCN_FILES) $(1)/$(octave_dirstamp) scripts/mk-pkg-add $$(AM_V_GEN)rm -f $$@-t $$@ && \ - $$(srcdir)/scripts/mk-pkg-add $(srcdir) $$($(2)_FCN_FILES) -- $$($(2)_GEN_FCN_FILES) > $$@-t && \ + $$(SHELL) $$(srcdir)/scripts/mk-pkg-add $(srcdir) $$($(2)_FCN_FILES) -- $$($(2)_GEN_FCN_FILES) > $$@-t && \ mv $$@-t $$@ endef @@ -117,7 +117,7 @@ fi && \ $(PERL) $(srcdir)/scripts/mkdoc.pl "$(srcdir)" $(FCN_FILES) -- $(GEN_FCN_FILES) > $@-t && \ mv $@-t $@ && \ - $(top_srcdir)/build-aux/move-if-change $@ scripts/DOCSTRINGS && \ + $(SHELL) $(top_srcdir)/build-aux/move-if-change $@ scripts/DOCSTRINGS && \ touch $@ OCTAVE_INTERPRETER_TARGETS += \
--- a/test/module.mk Wed Feb 17 02:54:00 2016 -0500 +++ b/test/module.mk Tue Feb 16 23:08:31 2016 -0800 @@ -67,20 +67,20 @@ test/sparse.tst: test/build-sparse-tests.sh | test/$(octave_dirstamp) $(AM_V_GEN)rm -f $@-t $@ && \ - $(srcdir)/test/build-sparse-tests.sh > $@-t && \ + $(SHELL) $(srcdir)/test/build-sparse-tests.sh > $@-t && \ mv $@-t $@ GENERATED_BC_OVERLOADS_DIRS := \ - $(shell $(srcdir)/test/build-bc-overload-tests.sh test --list-dirs) + $(shell $(SHELL) $(srcdir)/test/build-bc-overload-tests.sh test --list-dirs) GENERATED_BC_OVERLOADS_FILES := \ - $(shell $(srcdir)/test/build-bc-overload-tests.sh test --list-files) + $(shell $(SHELL) $(srcdir)/test/build-bc-overload-tests.sh test --list-files) $(GENERATED_BC_OVERLOADS_FILES): test/.bc-overload-tests-stamp test/.bc-overload-tests-stamp: test/build-bc-overload-tests.sh test/bc-overloads-expected | test/$(octave_dirstamp) $(AM_V_GEN)rm -f $@ && \ - $(srcdir)/test/build-bc-overload-tests.sh test $(srcdir)/test/bc-overloads-expected && \ + $(SHELL) $(srcdir)/test/build-bc-overload-tests.sh test $(srcdir)/test/bc-overloads-expected && \ touch $@ GENERATED_TEST_FILES = \