Mercurial > mxe-octave
diff makeinst-script.sh @ 3384:0de28586712a
installer: Change gui shortcut path to libexec installed path
* makeinst-script.sh: change shortcut path to libexec\\octave\\$OCTAVE_VERSION\\exec\\i686-pc-mingw32\\octave-gui.exe, get version from octave-version file.
* src/octave-2-libexec.patch: new file to install octave-gui.exe to libexec
* dist-files.mk: add octave-2-libexec.patch and octave-1-links.patch.
author | John Donoghue <john.donoghue@ieee.org> |
---|---|
date | Wed, 01 Jan 2014 17:45:54 -0500 |
parents | cfcbe03c9160 |
children | 0779856e1186 |
line wrap: on
line diff
--- a/makeinst-script.sh Wed Jan 01 17:42:10 2014 -0500 +++ b/makeinst-script.sh Wed Jan 01 17:45:54 2014 -0500 @@ -14,13 +14,14 @@ echo "Generating installer script ... " cd $TOPDIR +MXEDIR=`cd ..; pwd` # find octave shortcut icon ICON=`find $OCTAVE_SOURCE -name octave-logo.ico -printf "%P" | head -1 | sed 's,/,\\\\,g'` # extract version number -VERSION=`sed -n 's,.*id=\"octave-version\">\([0-9\.]*\).*,\1,p' < ../index.html` -OCTAVE_VERSION=`sed -n 's,.*id=\"octave-version\">\([^<]*\).*,\1,p' < ../index.html` +OCTAVE_VERSION=`head -1 $MXEDIR/octave/octave-version` +VERSION=`echo $OCTAVE_VERSION | sed -n 's,\([0-9\.]*\).*,\1,p'` # create installer script echo "; octave setup script $OCTAVE_SOURCE" > octave.nsi @@ -140,8 +141,10 @@ CreateDirectory "\$SMPROGRAMS\\Octave" CreateShortCut "\$SMPROGRAMS\\Octave\\Uninstall.lnk" "\$INSTDIR\\uninstall.exe" "" "\$INSTDIR\\uninstall.exe" 0 + SetOutPath "\$INSTDIR\\bin" CreateShortCut "\$SMPROGRAMS\\Octave\\Octave.lnk" "\$INSTDIR\\bin\\octave.exe" "" "\$INSTDIR\\$ICON" 0 - CreateShortCut "\$SMPROGRAMS\\Octave\\Octave (Experimental GUI).lnk" "\$INSTDIR\\bin\\octave-gui.exe" "" "\$INSTDIR\\$ICON" 0 + CreateShortCut "\$SMPROGRAMS\\Octave\\Octave (Experimental GUI).lnk" "\$INSTDIR\\libexec\\octave\\$OCTAVE_VERSION\\exec\\i686-pc-mingw32\\octave-gui.exe" "" "\$INSTDIR\\$ICON" 0 + SetOutPath "\$INSTDIR" EOF # if we have documentation files, create shortcuts if [ -d $OCTAVE_SOURCE/share/doc/octave ]; then