Mercurial > mxe-octave
diff makeinst-script.sh @ 3817:6daa158a7018
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 |
line wrap: on
line diff
--- a/makeinst-script.sh Sun Mar 01 19:05:38 2015 -0800 +++ b/makeinst-script.sh Mon Mar 02 19:14:41 2015 -0500 @@ -41,7 +41,7 @@ !define DESCRIPTION "GNU Octave is a high-level programming language, primarily intended for numerical computations." !define INSTALLER_FILES "../installer-files" !define INSTALLER_NAME "octave-$OCTAVE_VERSION-installer.exe" -!define MAIN_APP_EXE "octave.bat" +!define MAIN_APP_EXE "octave.vbs" !define INSTALL_TYPE "SetShellVarContext current" !define PRODUCT_ROOT_KEY "HKLM" !define PRODUCT_KEY "Software\\Octave-$VERSION" @@ -219,6 +219,7 @@ ; include the octave.bat file SetOutPath "\$INSTDIR" File "$OCTAVE_SOURCE/octave.bat" + File "$OCTAVE_SOURCE/octave.vbs" ; distro files EOF @@ -262,8 +263,8 @@ CreateDirectory "\$SMPROGRAMS\\Octave-$VERSION" CreateShortCut "\$SMPROGRAMS\\Octave-$VERSION\\Uninstall.lnk" "\$INSTDIR\\uninstall.exe" "" "\$INSTDIR\\uninstall.exe" 0 SetOutPath "%USERPROFILE%" - CreateShortCut "\$SMPROGRAMS\\Octave-$VERSION\\Octave (CLI).lnk" "\$INSTDIR\\octave.bat" "--no-gui" "\$INSTDIR\\$ICON" 0 SW_SHOWMINIMIZED - CreateShortCut "\$SMPROGRAMS\\Octave-$VERSION\\Octave (GUI).lnk" "\$INSTDIR\\octave.bat" "--force-gui" "\$INSTDIR\\$ICON" 0 SW_SHOWMINIMIZED + CreateShortCut "\$SMPROGRAMS\\Octave-$VERSION\\Octave (CLI).lnk" "\$INSTDIR\\octave.vbs" "--no-gui" "\$INSTDIR\\$ICON" 0 SW_SHOWMINIMIZED + CreateShortCut "\$SMPROGRAMS\\Octave-$VERSION\\Octave (GUI).lnk" "\$INSTDIR\\octave.vbs" "--force-gui" "\$INSTDIR\\$ICON" 0 SW_SHOWMINIMIZED SetOutPath "\$INSTDIR" EOF # if we have documentation files, create shortcuts @@ -281,8 +282,8 @@ \${If} \$InstallShortcuts == \${BST_CHECKED} SetOutPath "%USERPROFILE%" - CreateShortCut "\$desktop\\Octave-$VERSION (CLI).lnk" "\$INSTDIR\\octave.bat" "--no-gui" "\$INSTDIR\\$ICON" 0 SW_SHOWMINIMIZED - CreateShortCut "\$desktop\\Octave-$VERSION (GUI).lnk" "\$INSTDIR\\octave.bat" "--force-gui" "\$INSTDIR\\$ICON" 0 SW_SHOWMINIMIZED + CreateShortCut "\$desktop\\Octave-$VERSION (CLI).lnk" "\$INSTDIR\\octave.vbs" "--no-gui" "\$INSTDIR\\$ICON" 0 SW_SHOWMINIMIZED + CreateShortCut "\$desktop\\Octave-$VERSION (GUI).lnk" "\$INSTDIR\\octave.vbs" "--force-gui" "\$INSTDIR\\$ICON" 0 SW_SHOWMINIMIZED \${Endif} ; BLAS set up