Mercurial > octave-nkf

comparison run-octave.in @ 20514:ac0f7acdc3fd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
avoid executing startup file twice when using run-octave script (bug #45872) * site-rcfile: Rename from local-rcfile. * version-rcfile: Rename from main-rcfile. * scripts/startup/module.mk: Update to match new names. (install-startup-files, uninstall-startup-files): Move rules here from scripts/module.mk. * site-rcfile, version-rcfile: Note environment variables that may be used to select site and version rcfiles to execute. * run-octave.in (OCTAVE_VERSION_INITFILE): Define to use version-rcfile from source tree. (OCTAVE_SITE_INITFILE): Update to use site-rcfile from source tree.
author John W. Eaton <jwe@octave.org>
date Fri, 04 Sep 2015 12:45:46 -0400
parents a63f9cb609a1
children b65888ec820e
comparison
equal deleted inserted replaced
20513:a9a1f021d96b 20514:ac0f7acdc3fd
92 OCTAVE_ARCHLIBDIR="$builddir/src"; export OCTAVE_ARCHLIBDIR 92 OCTAVE_ARCHLIBDIR="$builddir/src"; export OCTAVE_ARCHLIBDIR
93 OCTAVE_BINDIR="$builddir/src"; export OCTAVE_BINDIR 93 OCTAVE_BINDIR="$builddir/src"; export OCTAVE_BINDIR
94 OCTAVE_DEFAULT_QT_SETTINGS="$builddir/libgui/default-qt-settings"; export OCTAVE_DEFAULT_QT_SETTINGS 94 OCTAVE_DEFAULT_QT_SETTINGS="$builddir/libgui/default-qt-settings"; export OCTAVE_DEFAULT_QT_SETTINGS
95 OCTAVE_JAVA_DIR="$builddir/scripts/java"; export OCTAVE_JAVA_DIR 95 OCTAVE_JAVA_DIR="$builddir/scripts/java"; export OCTAVE_JAVA_DIR
96 OCTAVE_LOCALE_DIR="$builddir/libgui/languages"; export OCTAVE_LOCALE_DIR 96 OCTAVE_LOCALE_DIR="$builddir/libgui/languages"; export OCTAVE_LOCALE_DIR
97 OCTAVE_SITE_INITFILE="$top_srcdir/scripts/startup/main-rcfile"; export OCTAVE_SITE_INITFILE 97 OCTAVE_SITE_INITFILE="$top_srcdir/scripts/startup/site-rcfile"; export OCTAVE_SITE_INITFILE
98 OCTAVE_VERSION_INITFILE="$top_srcdir/scripts/startup/version-rcfile"; export OCTAVE_VERSION_INITFILE
98 99
99 exec $builddir/libtool --mode=execute $driver \ 100 exec $builddir/libtool --mode=execute $driver \
100 "$octave_executable" --no-init-path --path="$LOADPATH" \ 101 "$octave_executable" --no-init-path --path="$LOADPATH" \
101 --image-path="$IMAGEPATH" --doc-cache-file="$DOCFILE" \ 102 --image-path="$IMAGEPATH" --doc-cache-file="$DOCFILE" \
102 --built-in-docstrings-file="$BUILT_IN_DOCSTRINGS_FILE" \ 103 --built-in-docstrings-file="$BUILT_IN_DOCSTRINGS_FILE" \