Mercurial > mxe-octave

comparison makeinst-script.sh @ 3384:0de28586712a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
3383:6dfbea9a9646 3384:0de28586712a
12 OCTAVE_SOURCE=`basename $ARG1` 12 OCTAVE_SOURCE=`basename $ARG1`
13 13
14 echo "Generating installer script ... " 14 echo "Generating installer script ... "
15 15
16 cd $TOPDIR 16 cd $TOPDIR
17 MXEDIR=`cd ..; pwd`
17 18
18 # find octave shortcut icon 19 # find octave shortcut icon
19 ICON=`find $OCTAVE_SOURCE -name octave-logo.ico -printf "%P" | head -1 | sed 's,/,\\\\,g'` 20 ICON=`find $OCTAVE_SOURCE -name octave-logo.ico -printf "%P" | head -1 | sed 's,/,\\\\,g'`
20 21
21 # extract version number 22 # extract version number
22 VERSION=`sed -n 's,.*id=\"octave-version\">\([0-9\.]*\).*,\1,p' < ../index.html` 23 OCTAVE_VERSION=`head -1 $MXEDIR/octave/octave-version`
23 OCTAVE_VERSION=`sed -n 's,.*id=\"octave-version\">\([^<]*\).*,\1,p' < ../index.html` 24 VERSION=`echo $OCTAVE_VERSION | sed -n 's,\([0-9\.]*\).*,\1,p'`
24 25
25 # create installer script 26 # create installer script
26 echo "; octave setup script $OCTAVE_SOURCE" > octave.nsi 27 echo "; octave setup script $OCTAVE_SOURCE" > octave.nsi
27 28
28 # installer settings 29 # installer settings
138 ; start menu (currently hardcoded) 139 ; start menu (currently hardcoded)
139 Section "Shortcuts" 140 Section "Shortcuts"
140 141
141 CreateDirectory "\$SMPROGRAMS\\Octave" 142 CreateDirectory "\$SMPROGRAMS\\Octave"
142 CreateShortCut "\$SMPROGRAMS\\Octave\\Uninstall.lnk" "\$INSTDIR\\uninstall.exe" "" "\$INSTDIR\\uninstall.exe" 0 143 CreateShortCut "\$SMPROGRAMS\\Octave\\Uninstall.lnk" "\$INSTDIR\\uninstall.exe" "" "\$INSTDIR\\uninstall.exe" 0
144 SetOutPath "\$INSTDIR\\bin"
143 CreateShortCut "\$SMPROGRAMS\\Octave\\Octave.lnk" "\$INSTDIR\\bin\\octave.exe" "" "\$INSTDIR\\$ICON" 0 145 CreateShortCut "\$SMPROGRAMS\\Octave\\Octave.lnk" "\$INSTDIR\\bin\\octave.exe" "" "\$INSTDIR\\$ICON" 0
144 CreateShortCut "\$SMPROGRAMS\\Octave\\Octave (Experimental GUI).lnk" "\$INSTDIR\\bin\\octave-gui.exe" "" "\$INSTDIR\\$ICON" 0 146 CreateShortCut "\$SMPROGRAMS\\Octave\\Octave (Experimental GUI).lnk" "\$INSTDIR\\libexec\\octave\\$OCTAVE_VERSION\\exec\\i686-pc-mingw32\\octave-gui.exe" "" "\$INSTDIR\\$ICON" 0
147 SetOutPath "\$INSTDIR"
145 EOF 148 EOF
146 # if we have documentation files, create shortcuts 149 # if we have documentation files, create shortcuts
147 if [ -d $OCTAVE_SOURCE/share/doc/octave ]; then 150 if [ -d $OCTAVE_SOURCE/share/doc/octave ]; then
148 cat >> octave.nsi << EOF 151 cat >> octave.nsi << EOF
149 CreateDirectory "\$SMPROGRAMS\\Octave\\Documentation" 152 CreateDirectory "\$SMPROGRAMS\\Octave\\Documentation"