Mercurial > mxe-octave

comparison makeinst-script.sh @ 3817:6daa158a7018

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nsis installer: use octave.vbs as laucher (Bug #41074) * installer-files/octave.vbs: new file * dist-files.mk: add octave.vbs * makeinst-script.sh: use octave.vbs as laucher
author John Donoghue <john.donoghue@ieee.org>
date Mon, 02 Mar 2015 19:14:41 -0500
parents 5796aeaa4df4
children 9b033c5323db
comparison
equal deleted inserted replaced
3816:fbc5d86517c9 3817:6daa158a7018
39 !define OCTAVE_VERSION "$OCTAVE_VERSION" 39 !define OCTAVE_VERSION "$OCTAVE_VERSION"
40 !define COPYRIGHT "Copyright © 2013 John W. Eaton and others." 40 !define COPYRIGHT "Copyright © 2013 John W. Eaton and others."
41 !define DESCRIPTION "GNU Octave is a high-level programming language, primarily intended for numerical computations." 41 !define DESCRIPTION "GNU Octave is a high-level programming language, primarily intended for numerical computations."
42 !define INSTALLER_FILES "../installer-files" 42 !define INSTALLER_FILES "../installer-files"
43 !define INSTALLER_NAME "octave-$OCTAVE_VERSION-installer.exe" 43 !define INSTALLER_NAME "octave-$OCTAVE_VERSION-installer.exe"
44 !define MAIN_APP_EXE "octave.bat" 44 !define MAIN_APP_EXE "octave.vbs"
45 !define INSTALL_TYPE "SetShellVarContext current" 45 !define INSTALL_TYPE "SetShellVarContext current"
46 !define PRODUCT_ROOT_KEY "HKLM" 46 !define PRODUCT_ROOT_KEY "HKLM"
47 !define PRODUCT_KEY "Software\\Octave-$VERSION" 47 !define PRODUCT_KEY "Software\\Octave-$VERSION"
48 48
49 ###################################################################### 49 ######################################################################
217 File "$OCTAVE_SOURCE/README.html" 217 File "$OCTAVE_SOURCE/README.html"
218 218
219 ; include the octave.bat file 219 ; include the octave.bat file
220 SetOutPath "\$INSTDIR" 220 SetOutPath "\$INSTDIR"
221 File "$OCTAVE_SOURCE/octave.bat" 221 File "$OCTAVE_SOURCE/octave.bat"
222 File "$OCTAVE_SOURCE/octave.vbs"
222 223
223 ; distro files 224 ; distro files
224 EOF 225 EOF
225 226
226 # insert the files 227 # insert the files
260 Section "Shortcuts" 261 Section "Shortcuts"
261 262
262 CreateDirectory "\$SMPROGRAMS\\Octave-$VERSION" 263 CreateDirectory "\$SMPROGRAMS\\Octave-$VERSION"
263 CreateShortCut "\$SMPROGRAMS\\Octave-$VERSION\\Uninstall.lnk" "\$INSTDIR\\uninstall.exe" "" "\$INSTDIR\\uninstall.exe" 0 264 CreateShortCut "\$SMPROGRAMS\\Octave-$VERSION\\Uninstall.lnk" "\$INSTDIR\\uninstall.exe" "" "\$INSTDIR\\uninstall.exe" 0
264 SetOutPath "%USERPROFILE%" 265 SetOutPath "%USERPROFILE%"
265 CreateShortCut "\$SMPROGRAMS\\Octave-$VERSION\\Octave (CLI).lnk" "\$INSTDIR\\octave.bat" "--no-gui" "\$INSTDIR\\$ICON" 0 SW_SHOWMINIMIZED 266 CreateShortCut "\$SMPROGRAMS\\Octave-$VERSION\\Octave (CLI).lnk" "\$INSTDIR\\octave.vbs" "--no-gui" "\$INSTDIR\\$ICON" 0 SW_SHOWMINIMIZED
266 CreateShortCut "\$SMPROGRAMS\\Octave-$VERSION\\Octave (GUI).lnk" "\$INSTDIR\\octave.bat" "--force-gui" "\$INSTDIR\\$ICON" 0 SW_SHOWMINIMIZED 267 CreateShortCut "\$SMPROGRAMS\\Octave-$VERSION\\Octave (GUI).lnk" "\$INSTDIR\\octave.vbs" "--force-gui" "\$INSTDIR\\$ICON" 0 SW_SHOWMINIMIZED
267 SetOutPath "\$INSTDIR" 268 SetOutPath "\$INSTDIR"
268 EOF 269 EOF
269 # if we have documentation files, create shortcuts 270 # if we have documentation files, create shortcuts
270 if [ -d $OCTAVE_SOURCE/share/doc/octave ]; then 271 if [ -d $OCTAVE_SOURCE/share/doc/octave ]; then
271 cat >> $OUTFILE << EOF 272 cat >> $OUTFILE << EOF
279 280
280 cat >> $OUTFILE << EOF 281 cat >> $OUTFILE << EOF
281 282
282 \${If} \$InstallShortcuts == \${BST_CHECKED} 283 \${If} \$InstallShortcuts == \${BST_CHECKED}
283 SetOutPath "%USERPROFILE%" 284 SetOutPath "%USERPROFILE%"
284 CreateShortCut "\$desktop\\Octave-$VERSION (CLI).lnk" "\$INSTDIR\\octave.bat" "--no-gui" "\$INSTDIR\\$ICON" 0 SW_SHOWMINIMIZED 285 CreateShortCut "\$desktop\\Octave-$VERSION (CLI).lnk" "\$INSTDIR\\octave.vbs" "--no-gui" "\$INSTDIR\\$ICON" 0 SW_SHOWMINIMIZED
285 CreateShortCut "\$desktop\\Octave-$VERSION (GUI).lnk" "\$INSTDIR\\octave.bat" "--force-gui" "\$INSTDIR\\$ICON" 0 SW_SHOWMINIMIZED 286 CreateShortCut "\$desktop\\Octave-$VERSION (GUI).lnk" "\$INSTDIR\\octave.vbs" "--force-gui" "\$INSTDIR\\$ICON" 0 SW_SHOWMINIMIZED
286 \${Endif} 287 \${Endif}
287 288
288 ; BLAS set up 289 ; BLAS set up
289 \${If} \$InstallBlasLib == 1 290 \${If} \$InstallBlasLib == 1
290 ; Reference BLAS 291 ; Reference BLAS