Mercurial > mxe-octave
diff tools/makeinst-script.sh.in @ 4767:a800e350d88b
use .bat file for octave.exe/octave-version.exe (Bug #53938)
* binary-dist-rules.mk: in windows, remove octave.exe and octave-version.exe
and replace with octave.bat, copied to bin dir
* installer-files/octave.bat: update path finding with .bat file in /bin instead of /,
stub beginning of file to recall with cmd.exe if run from bash
* tools/makeinst-script.sh.in: remove octave.bat from toplevel of installer,
look for octave-cli.exe not octave.exe in prev installed check
| author | John Donoghue |
|---|---|
| date | Mon, 09 Jul 2018 14:38:21 -0400 |
| parents | e76d54c038ef |
| children | 0c6d7d14a615 |
line wrap: on
line diff
--- a/tools/makeinst-script.sh.in Fri Jul 06 14:16:31 2018 -0400 +++ b/tools/makeinst-script.sh.in Mon Jul 09 14:38:21 2018 -0400 @@ -229,12 +229,10 @@ SetOutPath "\$INSTDIR" File "$OCTAVE_SOURCE/README.html" - ; include the octave.bat file + ; include octave.vbs and other scripts SetOutPath "\$INSTDIR" - File "$OCTAVE_SOURCE/octave.bat" File "$OCTAVE_SOURCE/octave.vbs" File "$OCTAVE_SOURCE/octave-firsttime.vbs" - File "$OCTAVE_SOURCE/fc_update.bat" File "$OCTAVE_SOURCE/HG-ID" @@ -614,7 +612,7 @@ ; Check whether prev install is here and no spaces in dest name Function CheckPrevInstallAndDest - IfFileExists "\$INSTDIR\\bin\\octave.exe" inst_exists inst_none + IfFileExists "\$INSTDIR\\bin\\octave-cli.exe" inst_exists inst_none inst_exists: MessageBox MB_YESNO|MB_ICONEXCLAMATION "Another Octave installation has been detected at that destination. It is recommended to uninstall it if you intend to use the same installation directory. Do you want to proceed with the installation anyway?" /SD IDYES IDYES inst_none IDNO 0 Abort