comparison makeinst-script.sh @ 4066:0962acdde3be

builld: allow out of source build * Makefile.in: add TOP_BUILD_DIR var and use TOP_DIR=srcdir, TOP_BUILD_DIR=builddir, modify paths to use TOP_DIR where needed * binary-dist-rules.mk: use TOP_DIR and TOP_BUILD_DIR where needed * makeinst-script.sh: use script path to determine TOPDIR, use TOPDIR where needed * src/default-octave.mk: install octave-version to builddir * src/stable-octave.mk: install octave-version to builddir * src/octave.mk: install octave-version to builddir * tools/set-mxe-env.sh.in: update fir builddir and srcdir use
author John Donoghue
date Wed, 23 Dec 2015 08:11:04 -0500
parents 8803dfa40236
children 423925d2c032
comparison
equal deleted inserted replaced
4065:aacf84e7af56 4066:0962acdde3be
5 echo "usage: makeinst-script.sh dist-dir output-script-name" 1>&2 5 echo "usage: makeinst-script.sh dist-dir output-script-name" 1>&2
6 exit 1 6 exit 1
7 fi 7 fi
8 8
9 OUTFILE="$2" 9 OUTFILE="$2"
10 TOPDIR=`dirname $1` 10 TOPDIR=`dirname $0`
11 OCTAVE_SOURCE=`basename $1` 11 OCTAVE_SOURCE=`basename $1`
12 12
13 cd $TOPDIR 13 cd `dirname $1`
14 MXEDIR=`cd ..; pwd` 14 MXEDIR=`cd ..; pwd`
15 15
16 if [ -e $OCTAVE_SOURCE/bin/libopenblas.dll ]; then 16 if [ -e $OCTAVE_SOURCE/bin/libopenblas.dll ]; then
17 DEFAULT_BLAS="OpenBLAS" 17 DEFAULT_BLAS="OpenBLAS"
18 else 18 else
40 !define WEB_SITE "http://www.octave.org" 40 !define WEB_SITE "http://www.octave.org"
41 !define VERSION "$VERSION.0" 41 !define VERSION "$VERSION.0"
42 !define OCTAVE_VERSION "$OCTAVE_VERSION" 42 !define OCTAVE_VERSION "$OCTAVE_VERSION"
43 !define COPYRIGHT "Copyright © 2013 John W. Eaton and others." 43 !define COPYRIGHT "Copyright © 2013 John W. Eaton and others."
44 !define DESCRIPTION "GNU Octave is a high-level programming language, primarily intended for numerical computations." 44 !define DESCRIPTION "GNU Octave is a high-level programming language, primarily intended for numerical computations."
45 !define INSTALLER_FILES "../installer-files" 45 !define INSTALLER_FILES "$TOPDIR/installer-files"
46 !define INSTALLER_NAME "octave-$OCTAVE_VERSION-installer.exe" 46 !define INSTALLER_NAME "octave-$OCTAVE_VERSION-installer.exe"
47 !define MAIN_APP_EXE "octave-firsttime.vbs" 47 !define MAIN_APP_EXE "octave-firsttime.vbs"
48 !define INSTALL_TYPE "SetShellVarContext current" 48 !define INSTALL_TYPE "SetShellVarContext current"
49 !define PRODUCT_ROOT_KEY "HKLM" 49 !define PRODUCT_ROOT_KEY "HKLM"
50 !define PRODUCT_KEY "Software\\Octave-$VERSION" 50 !define PRODUCT_KEY "Software\\Octave-$VERSION"