Mercurial > mxe-octave
annotate installer-files/octave.vbs @ 4222:44b1a9b2193e
qt5: add initial qt5 to mxe-octave, based on mxe.cc
* src/qt5.mk: new file
* src/qtbase-1-fixes.patch: new file
* src/qtbase.mk: new file
* src/qtimageformats-1.patch: new file
* src/qtimageformats.mk: new file
* src/qtsvg.mk: new file
* src/qttools-1.patch: new file
* added src/qttools.mk: new file
* changed Makefile.in: added ENABLE_QT5 option
* configure.ac: added enable-qt5 option
* index.html: added new files to packages
* installer-files/octave-firsttime.vbs: added setup of qt5 bin, plugin path
* installer-files/octave.vbs: added setup of qt5 bin, plugin path
* installer-files/octave.bat: added setup of qt5 bin path
* src/default-octave.mk: added settig fot qt5 usage
* src/qscintilla.mk: added qt5 path
author | John D |
---|---|
date | Thu, 29 Sep 2016 11:22:51 -0400 |
parents | cc549d1865cb |
children | a45374f7d9a3 |
rev | line source |
---|---|
3817
6daa158a7018
nsis installer: use octave.vbs as laucher (Bug #41074)
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
1 ' script to run octave in gui/command mode |
6daa158a7018
nsis installer: use octave.vbs as laucher (Bug #41074)
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
2 |
6daa158a7018
nsis installer: use octave.vbs as laucher (Bug #41074)
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
3 Set wshShell = CreateObject( "WScript.Shell" ) |
6daa158a7018
nsis installer: use octave.vbs as laucher (Bug #41074)
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
4 |
6daa158a7018
nsis installer: use octave.vbs as laucher (Bug #41074)
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
5 ' get the directory that script resides in |
6daa158a7018
nsis installer: use octave.vbs as laucher (Bug #41074)
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
6 Set fso = CreateObject("Scripting.FileSystemObject") |
6daa158a7018
nsis installer: use octave.vbs as laucher (Bug #41074)
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
7 OctavePath = fso.GetParentFolderName(WScript.ScriptFullName) |
6daa158a7018
nsis installer: use octave.vbs as laucher (Bug #41074)
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
8 Set fso = Nothing |
6daa158a7018
nsis installer: use octave.vbs as laucher (Bug #41074)
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
9 |
6daa158a7018
nsis installer: use octave.vbs as laucher (Bug #41074)
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
10 ' set up path to ensure octave bin comes first |
6daa158a7018
nsis installer: use octave.vbs as laucher (Bug #41074)
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
11 Set wshSystemEnv = wshShell.Environment( "PROCESS" ) |
3831
1191cff7f132
nsis installer: change file registrations to use octave.vbs
John D
parents:
3817
diff
changeset
|
12 wshSystemEnv("PATH") = OctavePath & "\bin;" & wshSystemEnv("PATH") |
3817
6daa158a7018
nsis installer: use octave.vbs as laucher (Bug #41074)
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
13 |
6daa158a7018
nsis installer: use octave.vbs as laucher (Bug #41074)
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
14 ' set terminal type |
6daa158a7018
nsis installer: use octave.vbs as laucher (Bug #41074)
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
15 wshSystemEnv("TERM") = "cygwin" |
4153
908a2a0cf6d6
octave.vbs: set GNUTERM env variable (Bug #47994)
John Donoghue
parents:
3909
diff
changeset
|
16 wshSystemEnv("GNUTERM") = "windows" |
3817
6daa158a7018
nsis installer: use octave.vbs as laucher (Bug #41074)
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
17 |
4183 | 18 wshSystemEnv("GS") = "gs.exe" |
19 | |
4222
44b1a9b2193e
qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
4183
diff
changeset
|
20 ' set Qt plugin directory and path |
44b1a9b2193e
qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
4183
diff
changeset
|
21 Set objFSO = CreateObject("Scripting.FileSystemObject") |
44b1a9b2193e
qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
4183
diff
changeset
|
22 If objFSO.FolderExists(OctavePath & "\qt5\bin") Then |
44b1a9b2193e
qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
4183
diff
changeset
|
23 wshSystemEnv("PATH") = OctavePath & "\qt5\bin;" & wshSystemEnv("PATH") |
44b1a9b2193e
qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
4183
diff
changeset
|
24 wshSystemEnv("QT_PLUGIN_PATH") = OctavePath & "\qt5\plugins" |
44b1a9b2193e
qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
4183
diff
changeset
|
25 Else |
44b1a9b2193e
qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
4183
diff
changeset
|
26 wshSystemEnv("QT_PLUGIN_PATH") = OctavePath & "\plugins" |
44b1a9b2193e
qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
4183
diff
changeset
|
27 End If |
3909
586b26b09042
set QT_PLUGIN_PATH in octave.vbs
John W. Eaton <jwe@octave.org>
parents:
3859
diff
changeset
|
28 |
3817
6daa158a7018
nsis installer: use octave.vbs as laucher (Bug #41074)
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
29 ' check args to see if told to run gui or command line |
6daa158a7018
nsis installer: use octave.vbs as laucher (Bug #41074)
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
30 ' and build other args to use |
6daa158a7018
nsis installer: use octave.vbs as laucher (Bug #41074)
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
31 GUI_MODE=1 |
6daa158a7018
nsis installer: use octave.vbs as laucher (Bug #41074)
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
32 AllArgs = "" |
6daa158a7018
nsis installer: use octave.vbs as laucher (Bug #41074)
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
33 Set wshArgs = WScript.Arguments |
6daa158a7018
nsis installer: use octave.vbs as laucher (Bug #41074)
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
34 For I = 0 to wshArgs.Count - 1 |
6daa158a7018
nsis installer: use octave.vbs as laucher (Bug #41074)
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
35 if wshArgs(I) = "--no-gui" then GUI_MODE=0 |
6daa158a7018
nsis installer: use octave.vbs as laucher (Bug #41074)
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
36 AllArgs = AllArgs & " " & chr(34) & wshArgs(I) & chr(34) |
6daa158a7018
nsis installer: use octave.vbs as laucher (Bug #41074)
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
37 Next |
6daa158a7018
nsis installer: use octave.vbs as laucher (Bug #41074)
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
38 |
3859
74f53761f74d
GUI: run octave-gui for both gui and non gui options
John Donoghue <john.donoghue@ieee.org>
parents:
3831
diff
changeset
|
39 ' start octave-gui, either with console shown or hidden |
3817
6daa158a7018
nsis installer: use octave.vbs as laucher (Bug #41074)
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
40 If GUI_MODE = 1 then |
6daa158a7018
nsis installer: use octave.vbs as laucher (Bug #41074)
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
41 wshShell.Run chr(34) & OctavePath & "\bin\octave-gui.exe" & Chr(34) & AllArgs, 0 |
6daa158a7018
nsis installer: use octave.vbs as laucher (Bug #41074)
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
42 Else |
3859
74f53761f74d
GUI: run octave-gui for both gui and non gui options
John Donoghue <john.donoghue@ieee.org>
parents:
3831
diff
changeset
|
43 wshShell.Run chr(34) & OctavePath & "\bin\octave-gui.exe" & Chr(34) & AllArgs, 1 |
3817
6daa158a7018
nsis installer: use octave.vbs as laucher (Bug #41074)
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
44 End If |
6daa158a7018
nsis installer: use octave.vbs as laucher (Bug #41074)
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
45 |
6daa158a7018
nsis installer: use octave.vbs as laucher (Bug #41074)
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
46 ' free our objects |
6daa158a7018
nsis installer: use octave.vbs as laucher (Bug #41074)
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
47 Set wshShell = Nothing |
6daa158a7018
nsis installer: use octave.vbs as laucher (Bug #41074)
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
48 Set wshSystemEnv = Nothing |
6daa158a7018
nsis installer: use octave.vbs as laucher (Bug #41074)
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
49 Set wshArgs = Nothing |
6daa158a7018
nsis installer: use octave.vbs as laucher (Bug #41074)
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
50 |