Mercurial > octave
changeset 21347:2f9de06a526e
maint: Clean up calls to run-octave in build system
* doc/interpreter/images.awk, doc/module.mk: Call run-octave with $(SHELL) as
command interpreter. Remove unnecessary directory prefix and use long options
for consistency.
* scripts/module.mk (check-missing-semicolon): Call run-octave with $(SHELL) as
command interpreter. Fix relative path and apply standard options.
* test/module.mk (check, check-jit): Call run-octave with $(SHELL) as command
interpreter.
| author | Mike Miller <mtmiller@octave.org> |
|---|---|
| date | Thu, 25 Feb 2016 09:37:06 -0800 |
| parents | afc3108f13fe |
| children | ee5ade71523e |
| files | doc/interpreter/images.awk doc/module.mk scripts/module.mk test/module.mk |
| diffstat | 4 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/doc/interpreter/images.awk Thu Feb 25 11:16:12 2016 -0500 +++ b/doc/interpreter/images.awk Thu Feb 25 09:37:06 2016 -0800 @@ -29,7 +29,7 @@ for (j = 2; j <= NF; j++) { printf ("%s%s.%s: %s%s\n", dir, $j, ext, dir, script); - printf ("\t$(AM_V_GEN)$(abs_top_builddir)/run-octave -f -q -H -p $(abs_top_srcdir)/%s --eval \"%s ('%s', '%s', '%s');\"\n", + printf ("\t$(AM_V_GEN)$(SHELL) run-octave --norc --silent --no-history --path $(abs_top_srcdir)/%s --eval \"%s ('%s', '%s', '%s');\"\n", dir, basename, dir, $j, ext); } }
--- a/doc/module.mk Thu Feb 25 11:16:12 2016 -0500 +++ b/doc/module.mk Thu Feb 25 09:37:06 2016 -0800 @@ -81,7 +81,7 @@ define gen-propdoc-texi rm -f $@-t $@ && \ - $(top_builddir)/run-octave -f -q -H -p $(srcdir)/doc/interpreter --eval "genpropdoc ('$(1)');" > $@-t && \ + $(SHELL) run-octave --norc --silent --no-history --path $(srcdir)/doc/interpreter --eval "genpropdoc ('$(1)');" > $@-t && \ mv $@-t $@ endef @@ -355,7 +355,7 @@ doc/interpreter/doc-cache: $(DOCSTRING_FILES) doc/interpreter/mk_doc_cache.m | $(OCTAVE_INTERPRETER_TARGETS) doc/interpreter/$(octave_dirstamp) $(AM_V_GEN)rm -f $@-t $@ && \ - $(top_builddir)/run-octave -f -q -H $(srcdir)/doc/interpreter/mk_doc_cache.m - $(srcdir)/doc/interpreter/macros.texi $(DOCSTRING_FILES) > $@-t && \ + $(SHELL) run-octave --norc --silent --no-history $(srcdir)/doc/interpreter/mk_doc_cache.m - $(srcdir)/doc/interpreter/macros.texi $(DOCSTRING_FILES) > $@-t && \ mv $@-t $@ $(MUNGED_TEXI_SRC): $(DOCSTRING_FILES)
--- a/scripts/module.mk Thu Feb 25 11:16:12 2016 -0500 +++ b/scripts/module.mk Thu Feb 25 09:37:06 2016 -0800 @@ -152,7 +152,7 @@ ( echo "warning on Octave:missing-semicolon;"; \ for m in $(addprefix $(srcdir), $(FCN_FILES)) $(GEN_FCN_FILES); do \ echo "source ('$$m');"; \ - done ) | ../run-octave -qf + done ) | $(SHELL) run-octave --norc --silent --no-history .PHONY: check-missing-semicolon ## Add rule to generate ctags.
--- a/test/module.mk Thu Feb 25 11:16:12 2016 -0500 +++ b/test/module.mk Thu Feb 25 09:37:06 2016 -0800 @@ -58,11 +58,11 @@ @$(gdbinit_install_rule) check-local: $(GENERATED_TEST_FILES) | $(OCTAVE_INTERPRETER_TARGETS) test/$(octave_dirstamp) - cd test && ../run-octave $(RUN_OCTAVE_OPTIONS) --norc --silent --no-history $(abs_top_srcdir)/test/fntests.m $(abs_top_srcdir)/test + cd test && $(SHELL) ../run-octave $(RUN_OCTAVE_OPTIONS) --norc --silent --no-history $(abs_top_srcdir)/test/fntests.m $(abs_top_srcdir)/test if AMCOND_HAVE_LLVM check-jit: $(GENERATED_TEST_FILES) | $(OCTAVE_INTERPRETER_TARGETS) test/$(octave_dirstamp) - cd test && ../run-octave $(RUN_OCTAVE_OPTIONS) --jit-compiler --norc --silent --no-history $(abs_top_srcdir)/test/fntests.m $(abs_top_srcdir)/test + cd test && $(SHELL) ../run-octave $(RUN_OCTAVE_OPTIONS) --jit-compiler --norc --silent --no-history $(abs_top_srcdir)/test/fntests.m $(abs_top_srcdir)/test endif test/sparse.tst: test/build-sparse-tests.sh | test/$(octave_dirstamp)