Mercurial > mxe-octave
diff mk-dist @ 3387:0779856e1186
Add desktop shortcut and octave-versionxxxxx-installer.exe naming.
* makeinst-script.mk: change installer name to octave-VERSION.exe,
add checkbox option to create deskyop shortcuts.
* mk-dist: when in stable mode use folder name of octave-VERSION.
author | John Donoghue <john.donoghue@ieee.org> |
---|---|
date | Fri, 03 Jan 2014 02:14:54 -0500 |
parents | 7b62537d0f8a |
children | 58b5ed5a0247 |
line wrap: on
line diff
--- a/mk-dist Wed Jan 01 19:34:01 2014 -0500 +++ b/mk-dist Fri Jan 03 02:14:54 2014 -0500 @@ -6,6 +6,16 @@ jobs=0 OCTAVE_TARGET=octave +TOPDIR=$(pwd) +PATH=$TOPDIR/usr/bin:$PATH +TARGET=i686-pc-mingw32 +PREFIX=/usr/$TARGET +STRIP=$TARGET-strip +DATE=$(date +%Y-%m-%d-%H-%M) +OCTAVE_DIST_DIR=$TOPDIR/dist/octave-$DATE +INSTALLER_PKG= + +OCTAVE_VERSION=`head -1 $TOPDIR/octave/octave-version` strip=yes installer=no @@ -22,7 +32,9 @@ fi ;; --stable) + # for stable, use octave-version as the folder OCTAVE_TARGET=stable-octave + OCTAVE_DIST_DIR=$TOPDIR/dist/octave-$OCTAVE_VERSION shift ;; --no-strip) @@ -41,15 +53,6 @@ esac done -TOPDIR=$(pwd) -PATH=$TOPDIR/usr/bin:$PATH -TARGET=i686-pc-mingw32 -PREFIX=/usr/$TARGET -STRIP=$TARGET-strip -DATE=$(date +%Y-%m-%d-%H-%M) -OCTAVE_DIST_DIR=$TOPDIR/dist/$OCTAVE_TARGET-$DATE -INSTALLER_PKG= - if [ $installer = "yes" ]; then echo "Adding installer to build dependancies" INSTALLER_PKG="nsis" @@ -129,18 +132,18 @@ cd $TOPDIR/dist if [ $installer = "yes" ]; then - ../makeinst-script.sh $OCTAVE_TARGET-$DATE + ../makeinst-script.sh $OCTAVE_DIST_DIR echo "Generating installer ..." $TOPDIR/usr/bin/$TARGET-makensis octave.nsi > /dev/null - if [ -e octave-installer.exe ]; then + if [ -e octave-$OCTAVE_VERSION-installer.exe ]; then echo "Installer created" rm octave.nsi fi else echo "creating zip file..." - zip -q -9 -r $OCTAVE_TARGET-$DATE.zip $OCTAVE_TARGET-$DATE + zip -q -9 -r $OCTAVE_DIST_DIR.zip $OCTAVE_DIST_DIR fi