annotate installer-files/cmdshell.bat @ 5301:3c10ce089d7c

Add pthon path to launch script files * installer-files/cmdshell.bat, installer-files/octave-firsttime.vbs, installer-files/octave.bat, installer-files/octave.vbs: add python dir path
author John Donoghue
date Mon, 10 Feb 2020 15:40:22 -0500
parents cbf69a7357d9
children f146714a73c3
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
3963
9d402d735dd1 nsis-installer: add bash window menu if devel tools enabled
John Donoghue
parents:
diff changeset
1 @echo off
9d402d735dd1 nsis-installer: add bash window menu if devel tools enabled
John Donoghue
parents:
diff changeset
2
4062
57bc5d4ff660 cmdshell: use OCTAVE_HOME variable instead of OCT_HOME
John D
parents: 3963
diff changeset
3 set OCTAVE_HOME=%~dp0
4257
8f71549f53b9 cmdshell: set HOME and OCTAVE_HOME without spaces (Bug #49765)
John D
parents: 4232
diff changeset
4 Rem convert to 8.3 format
8f71549f53b9 cmdshell: set HOME and OCTAVE_HOME without spaces (Bug #49765)
John D
parents: 4232
diff changeset
5 for %%I in ("%OCTAVE_HOME%") do set OCTAVE_HOME=%%~sI
3963
9d402d735dd1 nsis-installer: add bash window menu if devel tools enabled
John Donoghue
parents:
diff changeset
6
4257
8f71549f53b9 cmdshell: set HOME and OCTAVE_HOME without spaces (Bug #49765)
John D
parents: 4232
diff changeset
7 Rem set home if not already set
8f71549f53b9 cmdshell: set HOME and OCTAVE_HOME without spaces (Bug #49765)
John D
parents: 4232
diff changeset
8 if "%HOME%"=="" set HOME=%USERPROFILE%
8f71549f53b9 cmdshell: set HOME and OCTAVE_HOME without spaces (Bug #49765)
John D
parents: 4232
diff changeset
9 if "%HOME%"=="" set HOME=%HOMEDRIVE%%HOMEPATH%
3963
9d402d735dd1 nsis-installer: add bash window menu if devel tools enabled
John Donoghue
parents:
diff changeset
10
4257
8f71549f53b9 cmdshell: set HOME and OCTAVE_HOME without spaces (Bug #49765)
John D
parents: 4232
diff changeset
11 Rem set HOME to 8.3 format
8f71549f53b9 cmdshell: set HOME and OCTAVE_HOME without spaces (Bug #49765)
John D
parents: 4232
diff changeset
12 for %%I in ("%HOME%") do set HOME=%%~sI
3963
9d402d735dd1 nsis-installer: add bash window menu if devel tools enabled
John Donoghue
parents:
diff changeset
13
4793
202fa20cf559 add msys2 environment/tools option, use seprate post-install script to finalize install
John Donoghue
parents: 4472
diff changeset
14 set MSYSDIR=%OCTAVE_HOME%
202fa20cf559 add msys2 environment/tools option, use seprate post-install script to finalize install
John Donoghue
parents: 4472
diff changeset
15 set MSYSTEM=MSYS
202fa20cf559 add msys2 environment/tools option, use seprate post-install script to finalize install
John Donoghue
parents: 4472
diff changeset
16
202fa20cf559 add msys2 environment/tools option, use seprate post-install script to finalize install
John Donoghue
parents: 4472
diff changeset
17 Rem if no msys-1.0, must be msys2
202fa20cf559 add msys2 environment/tools option, use seprate post-install script to finalize install
John Donoghue
parents: 4472
diff changeset
18 if NOT EXIST %OCTAVE_HOME%\bin\msys-1.0.dll set MSYSDIR=%OCTAVE_HOME%\usr
4257
8f71549f53b9 cmdshell: set HOME and OCTAVE_HOME without spaces (Bug #49765)
John D
parents: 4232
diff changeset
19
4793
202fa20cf559 add msys2 environment/tools option, use seprate post-install script to finalize install
John Donoghue
parents: 4472
diff changeset
20 Rem 32 or 64 bit
202fa20cf559 add msys2 environment/tools option, use seprate post-install script to finalize install
John Donoghue
parents: 4472
diff changeset
21 if EXIST %OCTAVE_HOME%\mingw32\bin\octave-cli.exe set MSYSTEM=MINGW32
202fa20cf559 add msys2 environment/tools option, use seprate post-install script to finalize install
John Donoghue
parents: 4472
diff changeset
22 if EXIST %OCTAVE_HOME%\mingw64\bin\octave-cli.exe set MSYSTEM=MINGW64
202fa20cf559 add msys2 environment/tools option, use seprate post-install script to finalize install
John Donoghue
parents: 4472
diff changeset
23
4953
cbf69a7357d9 * installer-files/cmdshell.bat: fix OCTAVE_HOME and PATH when is using msys2 mingw32 or mingw64
John Donoghue
parents: 4793
diff changeset
24 if EXIST %OCTAVE_HOME%\mingw32\bin\octave-cli.exe set OCTAVE_HOME=%OCTAVE_HOME%\mingw32
cbf69a7357d9 * installer-files/cmdshell.bat: fix OCTAVE_HOME and PATH when is using msys2 mingw32 or mingw64
John Donoghue
parents: 4793
diff changeset
25 if EXIST %OCTAVE_HOME%\mingw64\bin\octave-cli.exe set OCTAVE_HOME=%OCTAVE_HOME%\mingw64
cbf69a7357d9 * installer-files/cmdshell.bat: fix OCTAVE_HOME and PATH when is using msys2 mingw32 or mingw64
John Donoghue
parents: 4793
diff changeset
26
cbf69a7357d9 * installer-files/cmdshell.bat: fix OCTAVE_HOME and PATH when is using msys2 mingw32 or mingw64
John Donoghue
parents: 4793
diff changeset
27 Rem Set up PATH. Make sure the octave bin dir
cbf69a7357d9 * installer-files/cmdshell.bat: fix OCTAVE_HOME and PATH when is using msys2 mingw32 or mingw64
John Donoghue
parents: 4793
diff changeset
28 Rem comes first.
5301
3c10ce089d7c Add pthon path to launch script files
John Donoghue
parents: 4953
diff changeset
29 set PATH=%OCTAVE_HOME%qt5\bin;%OCTAVE_HOME%bin;%OCTAVE_HOME%python;%PATH%
4953
cbf69a7357d9 * installer-files/cmdshell.bat: fix OCTAVE_HOME and PATH when is using msys2 mingw32 or mingw64
John Donoghue
parents: 4793
diff changeset
30 set TERM=cygwin
cbf69a7357d9 * installer-files/cmdshell.bat: fix OCTAVE_HOME and PATH when is using msys2 mingw32 or mingw64
John Donoghue
parents: 4793
diff changeset
31 set GS=gs.exe
cbf69a7357d9 * installer-files/cmdshell.bat: fix OCTAVE_HOME and PATH when is using msys2 mingw32 or mingw64
John Donoghue
parents: 4793
diff changeset
32 set GNUTERM=wxt
cbf69a7357d9 * installer-files/cmdshell.bat: fix OCTAVE_HOME and PATH when is using msys2 mingw32 or mingw64
John Donoghue
parents: 4793
diff changeset
33
4793
202fa20cf559 add msys2 environment/tools option, use seprate post-install script to finalize install
John Donoghue
parents: 4472
diff changeset
34 %MSYSDIR%\bin\bash.exe --login -i
202fa20cf559 add msys2 environment/tools option, use seprate post-install script to finalize install
John Donoghue
parents: 4472
diff changeset
35