Mercurial > mxe-octave
annotate tools/makeinst-script.sh.in @ 5248:9899965a595b
* tools/makeinst-script.sh.in: use --gui not --force-gui
author | John Donoghue <john.donoghue@ieee.org> |
---|---|
date | Wed, 25 Dec 2019 09:14:51 -0500 |
parents | e640a2d2ede0 |
children | 225fc4d8f598 |
rev | line source |
---|---|
2992
4b450c162e39
Add ability to create simple NSIS installer
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
1 #! /bin/bash |
4b450c162e39
Add ability to create simple NSIS installer
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
2 set -e |
4b450c162e39
Add ability to create simple NSIS installer
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
3 |
4658 | 4 if [ $# != 3 ]; then |
5 echo "usage: makeinst-script.sh dist-dir installer-name output-script-name" 1>&2 | |
3431
a7c772aa106f
Move mk-dist script functionality into Makefile.
John W. Eaton <jwe@octave.org>
parents:
3430
diff
changeset
|
6 exit 1 |
2992
4b450c162e39
Add ability to create simple NSIS installer
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
7 fi |
4b450c162e39
Add ability to create simple NSIS installer
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
8 |
4658 | 9 INSTALLER_NAME="$2" |
10 OUTFILE="$3" | |
4124
5ae69991eaa1
installer: detect win64/win32 java depending on octave 32/64 (Bug #47606)
John Donoghue
parents:
4121
diff
changeset
|
11 TOPDIR=@abs_top_srcdir@ |
4173
1d86cb0348ff
nsis: install all files to BUILD_PREFIX (Bug #48530)
John Donoghue <john.donoghue@ieee.org>
parents:
4158
diff
changeset
|
12 TOP_BUILD_DIR=@abs_top_builddir@ |
1d86cb0348ff
nsis: install all files to BUILD_PREFIX (Bug #48530)
John Donoghue <john.donoghue@ieee.org>
parents:
4158
diff
changeset
|
13 |
3431
a7c772aa106f
Move mk-dist script functionality into Makefile.
John W. Eaton <jwe@octave.org>
parents:
3430
diff
changeset
|
14 OCTAVE_SOURCE=`basename $1` |
2992
4b450c162e39
Add ability to create simple NSIS installer
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
15 |
4066 | 16 cd `dirname $1` |
3384
0de28586712a
installer: Change gui shortcut path to libexec installed path
John Donoghue <john.donoghue@ieee.org>
parents:
3367
diff
changeset
|
17 MXEDIR=`cd ..; pwd` |
2992
4b450c162e39
Add ability to create simple NSIS installer
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
18 |
5134
0ff5f24c0862
* tools/makeinst-script.sh.in: update qt prefix and translations dir in installer qt.conf
John Donoghue
parents:
5125
diff
changeset
|
19 if [ "@ENABLE_QT5@" == "yes" ]; then |
0ff5f24c0862
* tools/makeinst-script.sh.in: update qt prefix and translations dir in installer qt.conf
John Donoghue
parents:
5125
diff
changeset
|
20 QT_SUBDIR=qt5/ |
0ff5f24c0862
* tools/makeinst-script.sh.in: update qt prefix and translations dir in installer qt.conf
John Donoghue
parents:
5125
diff
changeset
|
21 else |
0ff5f24c0862
* tools/makeinst-script.sh.in: update qt prefix and translations dir in installer qt.conf
John Donoghue
parents:
5125
diff
changeset
|
22 QT_SUBDIR= |
0ff5f24c0862
* tools/makeinst-script.sh.in: update qt prefix and translations dir in installer qt.conf
John Donoghue
parents:
5125
diff
changeset
|
23 fi |
0ff5f24c0862
* tools/makeinst-script.sh.in: update qt prefix and translations dir in installer qt.conf
John Donoghue
parents:
5125
diff
changeset
|
24 |
4793
202fa20cf559
add msys2 environment/tools option, use seprate post-install script to finalize install
John Donoghue
parents:
4787
diff
changeset
|
25 if [ "@USE_MSYS2@" == "yes" ]; then |
202fa20cf559
add msys2 environment/tools option, use seprate post-install script to finalize install
John Donoghue
parents:
4787
diff
changeset
|
26 if [ "@ENABLE_WINDOWS_64@" == "yes" ]; then |
202fa20cf559
add msys2 environment/tools option, use seprate post-install script to finalize install
John Donoghue
parents:
4787
diff
changeset
|
27 OCTAVE_SUBDIR=mingw64 |
202fa20cf559
add msys2 environment/tools option, use seprate post-install script to finalize install
John Donoghue
parents:
4787
diff
changeset
|
28 else |
202fa20cf559
add msys2 environment/tools option, use seprate post-install script to finalize install
John Donoghue
parents:
4787
diff
changeset
|
29 OCTAVE_SUBDIR=mingw32 |
202fa20cf559
add msys2 environment/tools option, use seprate post-install script to finalize install
John Donoghue
parents:
4787
diff
changeset
|
30 fi |
202fa20cf559
add msys2 environment/tools option, use seprate post-install script to finalize install
John Donoghue
parents:
4787
diff
changeset
|
31 else |
202fa20cf559
add msys2 environment/tools option, use seprate post-install script to finalize install
John Donoghue
parents:
4787
diff
changeset
|
32 OCTAVE_SUBDIR= |
202fa20cf559
add msys2 environment/tools option, use seprate post-install script to finalize install
John Donoghue
parents:
4787
diff
changeset
|
33 fi |
202fa20cf559
add msys2 environment/tools option, use seprate post-install script to finalize install
John Donoghue
parents:
4787
diff
changeset
|
34 |
202fa20cf559
add msys2 environment/tools option, use seprate post-install script to finalize install
John Donoghue
parents:
4787
diff
changeset
|
35 |
202fa20cf559
add msys2 environment/tools option, use seprate post-install script to finalize install
John Donoghue
parents:
4787
diff
changeset
|
36 if [ -e $OCTAVE_SOURCE/$OCTAVE_SUBDIR/bin/libopenblas.dll ]; then |
3570
c7725f722155
NSIS installer: use Open BLAS by default
John W. Eaton <jwe@octave.org>
parents:
3552
diff
changeset
|
37 DEFAULT_BLAS="OpenBLAS" |
c7725f722155
NSIS installer: use Open BLAS by default
John W. Eaton <jwe@octave.org>
parents:
3552
diff
changeset
|
38 else |
c7725f722155
NSIS installer: use Open BLAS by default
John W. Eaton <jwe@octave.org>
parents:
3552
diff
changeset
|
39 DEFAULT_BLAS="Reference BLAS" |
c7725f722155
NSIS installer: use Open BLAS by default
John W. Eaton <jwe@octave.org>
parents:
3552
diff
changeset
|
40 fi |
c7725f722155
NSIS installer: use Open BLAS by default
John W. Eaton <jwe@octave.org>
parents:
3552
diff
changeset
|
41 |
3367
cfcbe03c9160
installer: Enable documentation build and add to installer.
John Donoghue <john.donoghue@ieee.org>
parents:
3366
diff
changeset
|
42 # find octave shortcut icon |
3760
1f870f80ed71
makeinst-script: add \n to found icon file list (Bug #43909)
John Donoghue <john.donoghue@ieee.org>
parents:
3757
diff
changeset
|
43 ICON=`find $OCTAVE_SOURCE -name octave-logo.ico -printf "%P\n" | head -1 | sed 's,/,\\\\,g'` |
2992
4b450c162e39
Add ability to create simple NSIS installer
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
44 |
3366
ab6116aa1039
installer: update mk-dist to use make-installer installer file name and use octave-version
John Donoghue <john.donoghue@ieee.org>
parents:
3364
diff
changeset
|
45 # extract version number |
3384
0de28586712a
installer: Change gui shortcut path to libexec installed path
John Donoghue <john.donoghue@ieee.org>
parents:
3367
diff
changeset
|
46 OCTAVE_VERSION=`head -1 $MXEDIR/octave/octave-version` |
0de28586712a
installer: Change gui shortcut path to libexec installed path
John Donoghue <john.donoghue@ieee.org>
parents:
3367
diff
changeset
|
47 VERSION=`echo $OCTAVE_VERSION | sed -n 's,\([0-9\.]*\).*,\1,p'` |
4752
e839056b9a65
Allow building of unreleased stable branch (4.4.0x) (bug #54176).
Rik <rik@octave.org>
parents:
4725
diff
changeset
|
48 if [ `echo $VERSION | grep -o '\.' | wc -l` -le 2 ]; then |
e839056b9a65
Allow building of unreleased stable branch (4.4.0x) (bug #54176).
Rik <rik@octave.org>
parents:
4725
diff
changeset
|
49 INSTALLER_VERSION="$VERSION.0" |
e839056b9a65
Allow building of unreleased stable branch (4.4.0x) (bug #54176).
Rik <rik@octave.org>
parents:
4725
diff
changeset
|
50 else |
e839056b9a65
Allow building of unreleased stable branch (4.4.0x) (bug #54176).
Rik <rik@octave.org>
parents:
4725
diff
changeset
|
51 INSTALLER_VERSION=$VERSION |
e839056b9a65
Allow building of unreleased stable branch (4.4.0x) (bug #54176).
Rik <rik@octave.org>
parents:
4725
diff
changeset
|
52 fi |
3366
ab6116aa1039
installer: update mk-dist to use make-installer installer file name and use octave-version
John Donoghue <john.donoghue@ieee.org>
parents:
3364
diff
changeset
|
53 |
3818
9b033c5323db
nsis installer: expand uninstall information
John Donoghue
parents:
3817
diff
changeset
|
54 # estimated size of installed files |
9b033c5323db
nsis installer: expand uninstall information
John Donoghue
parents:
3817
diff
changeset
|
55 SIZE=`du -slk $OCTAVE_SOURCE | awk '{print \$1}'` |
9b033c5323db
nsis installer: expand uninstall information
John Donoghue
parents:
3817
diff
changeset
|
56 |
2992
4b450c162e39
Add ability to create simple NSIS installer
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
57 # create installer script |
3431
a7c772aa106f
Move mk-dist script functionality into Makefile.
John W. Eaton <jwe@octave.org>
parents:
3430
diff
changeset
|
58 echo "; octave setup script $OCTAVE_SOURCE" > $OUTFILE |
2992
4b450c162e39
Add ability to create simple NSIS installer
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
59 |
3355
bc7e18e12dcc
makeinst-script.sh: use MUI interface
Anirudha Bose <ani07nov@gmail.com>
parents:
3350
diff
changeset
|
60 # installer settings |
3431
a7c772aa106f
Move mk-dist script functionality into Makefile.
John W. Eaton <jwe@octave.org>
parents:
3430
diff
changeset
|
61 cat >> $OUTFILE << EOF |
3355
bc7e18e12dcc
makeinst-script.sh: use MUI interface
Anirudha Bose <ani07nov@gmail.com>
parents:
3350
diff
changeset
|
62 !define APP_NAME "GNU Octave" |
bc7e18e12dcc
makeinst-script.sh: use MUI interface
Anirudha Bose <ani07nov@gmail.com>
parents:
3350
diff
changeset
|
63 !define COMP_NAME "GNU Project" |
4650
1d9448607538
Use https in links whenever possible (Bug #53555).
Rik <rik@octave.org>
parents:
4648
diff
changeset
|
64 !define WEB_SITE "https://www.octave.org" |
4752
e839056b9a65
Allow building of unreleased stable branch (4.4.0x) (bug #54176).
Rik <rik@octave.org>
parents:
4725
diff
changeset
|
65 !define VERSION "$INSTALLER_VERSION" |
3366
ab6116aa1039
installer: update mk-dist to use make-installer installer file name and use octave-version
John Donoghue <john.donoghue@ieee.org>
parents:
3364
diff
changeset
|
66 !define OCTAVE_VERSION "$OCTAVE_VERSION" |
4652 | 67 !define COPYRIGHT "Copyright © 2013-2018 John W. Eaton and others." |
3355
bc7e18e12dcc
makeinst-script.sh: use MUI interface
Anirudha Bose <ani07nov@gmail.com>
parents:
3350
diff
changeset
|
68 !define DESCRIPTION "GNU Octave is a high-level programming language, primarily intended for numerical computations." |
4066 | 69 !define INSTALLER_FILES "$TOPDIR/installer-files" |
4658 | 70 !define INSTALLER_NAME "$INSTALLER_NAME" |
4028
8803dfa40236
nsis installer: set directory to userprofile on startof octave from installer (Bug #45899)
John Donoghue
parents:
3963
diff
changeset
|
71 !define MAIN_APP_EXE "octave-firsttime.vbs" |
3355
bc7e18e12dcc
makeinst-script.sh: use MUI interface
Anirudha Bose <ani07nov@gmail.com>
parents:
3350
diff
changeset
|
72 !define INSTALL_TYPE "SetShellVarContext current" |
3358
8708b7d07795
makeinst-script.sh: Added checking for previous installation of Octave
Anirudha Bose <ani07nov@gmail.com>
parents:
3357
diff
changeset
|
73 !define PRODUCT_ROOT_KEY "HKLM" |
3403
f79780bcc843
installer: check destination path later in install (Bug #41069)
John Donoghue <john.donoghue@ieee.org>
parents:
3391
diff
changeset
|
74 !define PRODUCT_KEY "Software\\Octave-$VERSION" |
3355
bc7e18e12dcc
makeinst-script.sh: use MUI interface
Anirudha Bose <ani07nov@gmail.com>
parents:
3350
diff
changeset
|
75 |
bc7e18e12dcc
makeinst-script.sh: use MUI interface
Anirudha Bose <ani07nov@gmail.com>
parents:
3350
diff
changeset
|
76 ###################################################################### |
2992
4b450c162e39
Add ability to create simple NSIS installer
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
77 |
3355
bc7e18e12dcc
makeinst-script.sh: use MUI interface
Anirudha Bose <ani07nov@gmail.com>
parents:
3350
diff
changeset
|
78 VIProductVersion "\${VERSION}" |
bc7e18e12dcc
makeinst-script.sh: use MUI interface
Anirudha Bose <ani07nov@gmail.com>
parents:
3350
diff
changeset
|
79 VIAddVersionKey "ProductName" "\${APP_NAME}" |
bc7e18e12dcc
makeinst-script.sh: use MUI interface
Anirudha Bose <ani07nov@gmail.com>
parents:
3350
diff
changeset
|
80 VIAddVersionKey "CompanyName" "\${COMP_NAME}" |
bc7e18e12dcc
makeinst-script.sh: use MUI interface
Anirudha Bose <ani07nov@gmail.com>
parents:
3350
diff
changeset
|
81 VIAddVersionKey "LegalCopyright" "\${COPYRIGHT}" |
bc7e18e12dcc
makeinst-script.sh: use MUI interface
Anirudha Bose <ani07nov@gmail.com>
parents:
3350
diff
changeset
|
82 VIAddVersionKey "FileDescription" "\${DESCRIPTION}" |
bc7e18e12dcc
makeinst-script.sh: use MUI interface
Anirudha Bose <ani07nov@gmail.com>
parents:
3350
diff
changeset
|
83 VIAddVersionKey "FileVersion" "\${VERSION}" |
bc7e18e12dcc
makeinst-script.sh: use MUI interface
Anirudha Bose <ani07nov@gmail.com>
parents:
3350
diff
changeset
|
84 |
bc7e18e12dcc
makeinst-script.sh: use MUI interface
Anirudha Bose <ani07nov@gmail.com>
parents:
3350
diff
changeset
|
85 ###################################################################### |
bc7e18e12dcc
makeinst-script.sh: use MUI interface
Anirudha Bose <ani07nov@gmail.com>
parents:
3350
diff
changeset
|
86 |
bc7e18e12dcc
makeinst-script.sh: use MUI interface
Anirudha Bose <ani07nov@gmail.com>
parents:
3350
diff
changeset
|
87 SetCompressor /SOLID Lzma |
bc7e18e12dcc
makeinst-script.sh: use MUI interface
Anirudha Bose <ani07nov@gmail.com>
parents:
3350
diff
changeset
|
88 Name "\${APP_NAME}" |
bc7e18e12dcc
makeinst-script.sh: use MUI interface
Anirudha Bose <ani07nov@gmail.com>
parents:
3350
diff
changeset
|
89 Caption "\${APP_NAME}" |
bc7e18e12dcc
makeinst-script.sh: use MUI interface
Anirudha Bose <ani07nov@gmail.com>
parents:
3350
diff
changeset
|
90 OutFile "\${INSTALLER_NAME}" |
bc7e18e12dcc
makeinst-script.sh: use MUI interface
Anirudha Bose <ani07nov@gmail.com>
parents:
3350
diff
changeset
|
91 BrandingText "\${APP_NAME}" |
bc7e18e12dcc
makeinst-script.sh: use MUI interface
Anirudha Bose <ani07nov@gmail.com>
parents:
3350
diff
changeset
|
92 XPStyle on |
3361
9781db518638
makeinst-script.sh: Remove whitespace from installation path and add version number in default installation directory
Anirudha Bose <ani07nov@gmail.com>
parents:
3360
diff
changeset
|
93 InstallDir "C:\\Octave\\Octave-\${OCTAVE_VERSION}" |
3367
cfcbe03c9160
installer: Enable documentation build and add to installer.
John Donoghue <john.donoghue@ieee.org>
parents:
3366
diff
changeset
|
94 Icon "\${INSTALLER_FILES}/octave-logo.ico" |
3355
bc7e18e12dcc
makeinst-script.sh: use MUI interface
Anirudha Bose <ani07nov@gmail.com>
parents:
3350
diff
changeset
|
95 |
bc7e18e12dcc
makeinst-script.sh: use MUI interface
Anirudha Bose <ani07nov@gmail.com>
parents:
3350
diff
changeset
|
96 ###################################################################### |
3409
5e77c5fc91ed
qt: build translations in cross build and install
John Donoghue <john.donoghue@ieee.org>
parents:
3406
diff
changeset
|
97 ; StrFunc usage |
5e77c5fc91ed
qt: build translations in cross build and install
John Donoghue <john.donoghue@ieee.org>
parents:
3406
diff
changeset
|
98 !include "StrFunc.nsh" |
5e77c5fc91ed
qt: build translations in cross build and install
John Donoghue <john.donoghue@ieee.org>
parents:
3406
diff
changeset
|
99 \${StrRep} |
5e77c5fc91ed
qt: build translations in cross build and install
John Donoghue <john.donoghue@ieee.org>
parents:
3406
diff
changeset
|
100 ###################################################################### |
3363
b89f15801606
Added Octave images in welcome page, headers, and finish page of installer.
Anirudha Bose <ani07nov@gmail.com>
parents:
3362
diff
changeset
|
101 ; MUI settings |
4608 | 102 !include "MUI2.nsh" |
3355
bc7e18e12dcc
makeinst-script.sh: use MUI interface
Anirudha Bose <ani07nov@gmail.com>
parents:
3350
diff
changeset
|
103 |
3453
70b110956a4e
nsis-installer: Use custom page for shortcuts and install for all users.
John Donoghue <john.donoghue@ieee.org>
parents:
3431
diff
changeset
|
104 ; custom dialogs |
70b110956a4e
nsis-installer: Use custom page for shortcuts and install for all users.
John Donoghue <john.donoghue@ieee.org>
parents:
3431
diff
changeset
|
105 !include nsDialogs.nsh |
3471
6a97f4d1dedb
installer: Add ref BLAS/OpenBLAS install option
John Donoghue <john.donoghue@ieee.org>
parents:
3458
diff
changeset
|
106 !macro __DropList_GetCurSel CONTROL VAR |
6a97f4d1dedb
installer: Add ref BLAS/OpenBLAS install option
John Donoghue <john.donoghue@ieee.org>
parents:
3458
diff
changeset
|
107 SendMessage \${CONTROL} \${CB_GETCURSEL} 0 0 \${VAR} |
6a97f4d1dedb
installer: Add ref BLAS/OpenBLAS install option
John Donoghue <john.donoghue@ieee.org>
parents:
3458
diff
changeset
|
108 !macroend |
6a97f4d1dedb
installer: Add ref BLAS/OpenBLAS install option
John Donoghue <john.donoghue@ieee.org>
parents:
3458
diff
changeset
|
109 |
6a97f4d1dedb
installer: Add ref BLAS/OpenBLAS install option
John Donoghue <john.donoghue@ieee.org>
parents:
3458
diff
changeset
|
110 !define DropList_GetCurSel \`!insertmacro __DropList_GetCurSel\` |
6a97f4d1dedb
installer: Add ref BLAS/OpenBLAS install option
John Donoghue <john.donoghue@ieee.org>
parents:
3458
diff
changeset
|
111 |
3453
70b110956a4e
nsis-installer: Use custom page for shortcuts and install for all users.
John Donoghue <john.donoghue@ieee.org>
parents:
3431
diff
changeset
|
112 ; additional logic |
70b110956a4e
nsis-installer: Use custom page for shortcuts and install for all users.
John Donoghue <john.donoghue@ieee.org>
parents:
3431
diff
changeset
|
113 !include LogicLib.nsh |
4471
1a3deda73484
nsis installer: include version links in startmenu (Bug #51878)
John D
parents:
4458
diff
changeset
|
114 ; File funcs |
1a3deda73484
nsis installer: include version links in startmenu (Bug #51878)
John D
parents:
4458
diff
changeset
|
115 !include FileFunc.nsh |
3453
70b110956a4e
nsis-installer: Use custom page for shortcuts and install for all users.
John Donoghue <john.donoghue@ieee.org>
parents:
3431
diff
changeset
|
116 |
3355
bc7e18e12dcc
makeinst-script.sh: use MUI interface
Anirudha Bose <ani07nov@gmail.com>
parents:
3350
diff
changeset
|
117 !define MUI_ABORTWARNING |
bc7e18e12dcc
makeinst-script.sh: use MUI interface
Anirudha Bose <ani07nov@gmail.com>
parents:
3350
diff
changeset
|
118 !define MUI_UNABORTWARNING |
3363
b89f15801606
Added Octave images in welcome page, headers, and finish page of installer.
Anirudha Bose <ani07nov@gmail.com>
parents:
3362
diff
changeset
|
119 !define MUI_HEADERIMAGE |
3355
bc7e18e12dcc
makeinst-script.sh: use MUI interface
Anirudha Bose <ani07nov@gmail.com>
parents:
3350
diff
changeset
|
120 |
3363
b89f15801606
Added Octave images in welcome page, headers, and finish page of installer.
Anirudha Bose <ani07nov@gmail.com>
parents:
3362
diff
changeset
|
121 ; Theme |
b89f15801606
Added Octave images in welcome page, headers, and finish page of installer.
Anirudha Bose <ani07nov@gmail.com>
parents:
3362
diff
changeset
|
122 !define MUI_ICON "\${INSTALLER_FILES}/octave-logo.ico" |
4173
1d86cb0348ff
nsis: install all files to BUILD_PREFIX (Bug #48530)
John Donoghue <john.donoghue@ieee.org>
parents:
4158
diff
changeset
|
123 !define MUI_UNICON "$TOP_BUILD_DIR/usr/share/nsis/Contrib/Graphics/Icons/orange-uninstall.ico" |
3363
b89f15801606
Added Octave images in welcome page, headers, and finish page of installer.
Anirudha Bose <ani07nov@gmail.com>
parents:
3362
diff
changeset
|
124 !define MUI_HEADERIMAGE_BITMAP "\${INSTALLER_FILES}/octave-hdr.bmp" |
b89f15801606
Added Octave images in welcome page, headers, and finish page of installer.
Anirudha Bose <ani07nov@gmail.com>
parents:
3362
diff
changeset
|
125 !define MUI_WELCOMEFINISHPAGE_BITMAP "\${INSTALLER_FILES}/octave.bmp" |
b89f15801606
Added Octave images in welcome page, headers, and finish page of installer.
Anirudha Bose <ani07nov@gmail.com>
parents:
3362
diff
changeset
|
126 |
3355
bc7e18e12dcc
makeinst-script.sh: use MUI interface
Anirudha Bose <ani07nov@gmail.com>
parents:
3350
diff
changeset
|
127 !insertmacro MUI_PAGE_WELCOME |
bc7e18e12dcc
makeinst-script.sh: use MUI interface
Anirudha Bose <ani07nov@gmail.com>
parents:
3350
diff
changeset
|
128 |
3360
cbaab92e1174
makeinst-script.sh: Removed 'I Agree' in GPL license page
Anirudha Bose <ani07nov@gmail.com>
parents:
3359
diff
changeset
|
129 !define MUI_LICENSEPAGE_TEXT_BOTTOM "The source code for Octave is freely redistributable under the terms of the GNU General Public License (GPL) as published by the Free Software Foundation." |
cbaab92e1174
makeinst-script.sh: Removed 'I Agree' in GPL license page
Anirudha Bose <ani07nov@gmail.com>
parents:
3359
diff
changeset
|
130 !define MUI_LICENSEPAGE_BUTTON "Next >" |
3363
b89f15801606
Added Octave images in welcome page, headers, and finish page of installer.
Anirudha Bose <ani07nov@gmail.com>
parents:
3362
diff
changeset
|
131 !insertmacro MUI_PAGE_LICENSE "\${INSTALLER_FILES}/gpl-3.0.txt" |
3356
2e44e8f86cd6
makeinst-script.sh: add license page with GPLv3
Anirudha Bose <ani07nov@gmail.com>
parents:
3355
diff
changeset
|
132 |
3453
70b110956a4e
nsis-installer: Use custom page for shortcuts and install for all users.
John Donoghue <john.donoghue@ieee.org>
parents:
3431
diff
changeset
|
133 Page custom octaveOptionsPage octaveOptionsLeave |
70b110956a4e
nsis-installer: Use custom page for shortcuts and install for all users.
John Donoghue <john.donoghue@ieee.org>
parents:
3431
diff
changeset
|
134 |
3728
8c11c5a1a939
Prevent octave install to path with spaces
John Donoghue <john.donoghue@ieee.org>
parents:
3717
diff
changeset
|
135 !define MUI_PAGE_CUSTOMFUNCTION_LEAVE CheckPrevInstallAndDest |
3355
bc7e18e12dcc
makeinst-script.sh: use MUI interface
Anirudha Bose <ani07nov@gmail.com>
parents:
3350
diff
changeset
|
136 !insertmacro MUI_PAGE_DIRECTORY |
bc7e18e12dcc
makeinst-script.sh: use MUI interface
Anirudha Bose <ani07nov@gmail.com>
parents:
3350
diff
changeset
|
137 |
bc7e18e12dcc
makeinst-script.sh: use MUI interface
Anirudha Bose <ani07nov@gmail.com>
parents:
3350
diff
changeset
|
138 !insertmacro MUI_PAGE_INSTFILES |
2992
4b450c162e39
Add ability to create simple NSIS installer
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
139 |
3757
7a6637aa3aae
installer: ran octave through explorer when running at end of install (Bug 43824)
John Donoghue
parents:
3728
diff
changeset
|
140 !define MUI_FINISHPAGE_RUN "\$WINDIR\\explorer.exe" |
7a6637aa3aae
installer: ran octave through explorer when running at end of install (Bug 43824)
John Donoghue
parents:
3728
diff
changeset
|
141 !define MUI_FINISHPAGE_RUN_PARAMETERS "\$INSTDIR\\\${MAIN_APP_EXE}" |
3453
70b110956a4e
nsis-installer: Use custom page for shortcuts and install for all users.
John Donoghue <john.donoghue@ieee.org>
parents:
3431
diff
changeset
|
142 !define MUI_FINISHPAGE_SHOWREADME "\$INSTDIR\\README.html" |
3355
bc7e18e12dcc
makeinst-script.sh: use MUI interface
Anirudha Bose <ani07nov@gmail.com>
parents:
3350
diff
changeset
|
143 !insertmacro MUI_PAGE_FINISH |
bc7e18e12dcc
makeinst-script.sh: use MUI interface
Anirudha Bose <ani07nov@gmail.com>
parents:
3350
diff
changeset
|
144 |
bc7e18e12dcc
makeinst-script.sh: use MUI interface
Anirudha Bose <ani07nov@gmail.com>
parents:
3350
diff
changeset
|
145 !insertmacro MUI_UNPAGE_CONFIRM |
bc7e18e12dcc
makeinst-script.sh: use MUI interface
Anirudha Bose <ani07nov@gmail.com>
parents:
3350
diff
changeset
|
146 |
bc7e18e12dcc
makeinst-script.sh: use MUI interface
Anirudha Bose <ani07nov@gmail.com>
parents:
3350
diff
changeset
|
147 !insertmacro MUI_UNPAGE_INSTFILES |
2992
4b450c162e39
Add ability to create simple NSIS installer
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
148 |
3355
bc7e18e12dcc
makeinst-script.sh: use MUI interface
Anirudha Bose <ani07nov@gmail.com>
parents:
3350
diff
changeset
|
149 !insertmacro MUI_UNPAGE_FINISH |
3331
71171ba8bebd
Update installer script for admin level and single icon file
John Donoghue <john.donoghue@ieee.org>
parents:
3010
diff
changeset
|
150 |
3355
bc7e18e12dcc
makeinst-script.sh: use MUI interface
Anirudha Bose <ani07nov@gmail.com>
parents:
3350
diff
changeset
|
151 !insertmacro MUI_LANGUAGE "English" |
bc7e18e12dcc
makeinst-script.sh: use MUI interface
Anirudha Bose <ani07nov@gmail.com>
parents:
3350
diff
changeset
|
152 |
bc7e18e12dcc
makeinst-script.sh: use MUI interface
Anirudha Bose <ani07nov@gmail.com>
parents:
3350
diff
changeset
|
153 ###################################################################### |
bc7e18e12dcc
makeinst-script.sh: use MUI interface
Anirudha Bose <ani07nov@gmail.com>
parents:
3350
diff
changeset
|
154 |
3331
71171ba8bebd
Update installer script for admin level and single icon file
John Donoghue <john.donoghue@ieee.org>
parents:
3010
diff
changeset
|
155 RequestExecutionLevel admin |
3357
456b6e533054
makeinst-script.sh: Added checking for Java Runtime Environment
Anirudha Bose <ani07nov@gmail.com>
parents:
3356
diff
changeset
|
156 |
3453
70b110956a4e
nsis-installer: Use custom page for shortcuts and install for all users.
John Donoghue <john.donoghue@ieee.org>
parents:
3431
diff
changeset
|
157 ###################################################################### |
3552
b82ff8ba6a8a
nsis-installer: check for win8 version and set -i --line-editing in shortcuts
John Donoghue <john.donoghue@ieee.org>
parents:
3545
diff
changeset
|
158 |
3453
70b110956a4e
nsis-installer: Use custom page for shortcuts and install for all users.
John Donoghue <john.donoghue@ieee.org>
parents:
3431
diff
changeset
|
159 ; custom options page functions |
70b110956a4e
nsis-installer: Use custom page for shortcuts and install for all users.
John Donoghue <john.donoghue@ieee.org>
parents:
3431
diff
changeset
|
160 |
70b110956a4e
nsis-installer: Use custom page for shortcuts and install for all users.
John Donoghue <john.donoghue@ieee.org>
parents:
3431
diff
changeset
|
161 Var InstallAllUsers |
70b110956a4e
nsis-installer: Use custom page for shortcuts and install for all users.
John Donoghue <john.donoghue@ieee.org>
parents:
3431
diff
changeset
|
162 Var InstallAllUsersCtrl |
70b110956a4e
nsis-installer: Use custom page for shortcuts and install for all users.
John Donoghue <john.donoghue@ieee.org>
parents:
3431
diff
changeset
|
163 Var InstallShortcuts |
70b110956a4e
nsis-installer: Use custom page for shortcuts and install for all users.
John Donoghue <john.donoghue@ieee.org>
parents:
3431
diff
changeset
|
164 Var InstallShortcutsCtrl |
3458
608931797a53
installer: Add .m association to Octave
John Donoghue <john.donoghue@ieee.org>
parents:
3453
diff
changeset
|
165 Var RegisterOctaveFileType |
608931797a53
installer: Add .m association to Octave
John Donoghue <john.donoghue@ieee.org>
parents:
3453
diff
changeset
|
166 Var RegisterOctaveFileTypeCtrl |
3471
6a97f4d1dedb
installer: Add ref BLAS/OpenBLAS install option
John Donoghue <john.donoghue@ieee.org>
parents:
3458
diff
changeset
|
167 Var InstallBlasLibCtrl |
6a97f4d1dedb
installer: Add ref BLAS/OpenBLAS install option
John Donoghue <john.donoghue@ieee.org>
parents:
3458
diff
changeset
|
168 Var InstallBlasLib |
3458
608931797a53
installer: Add .m association to Octave
John Donoghue <john.donoghue@ieee.org>
parents:
3453
diff
changeset
|
169 |
3453
70b110956a4e
nsis-installer: Use custom page for shortcuts and install for all users.
John Donoghue <john.donoghue@ieee.org>
parents:
3431
diff
changeset
|
170 Function octaveOptionsPage |
3458
608931797a53
installer: Add .m association to Octave
John Donoghue <john.donoghue@ieee.org>
parents:
3453
diff
changeset
|
171 Push \$0 |
608931797a53
installer: Add .m association to Octave
John Donoghue <john.donoghue@ieee.org>
parents:
3453
diff
changeset
|
172 nsDialogs::Create 1018 |
3453
70b110956a4e
nsis-installer: Use custom page for shortcuts and install for all users.
John Donoghue <john.donoghue@ieee.org>
parents:
3431
diff
changeset
|
173 Pop \$0 |
70b110956a4e
nsis-installer: Use custom page for shortcuts and install for all users.
John Donoghue <john.donoghue@ieee.org>
parents:
3431
diff
changeset
|
174 |
70b110956a4e
nsis-installer: Use custom page for shortcuts and install for all users.
John Donoghue <john.donoghue@ieee.org>
parents:
3431
diff
changeset
|
175 \${If} \$0 == error |
70b110956a4e
nsis-installer: Use custom page for shortcuts and install for all users.
John Donoghue <john.donoghue@ieee.org>
parents:
3431
diff
changeset
|
176 Abort |
70b110956a4e
nsis-installer: Use custom page for shortcuts and install for all users.
John Donoghue <john.donoghue@ieee.org>
parents:
3431
diff
changeset
|
177 \${EndIf} |
70b110956a4e
nsis-installer: Use custom page for shortcuts and install for all users.
John Donoghue <john.donoghue@ieee.org>
parents:
3431
diff
changeset
|
178 |
70b110956a4e
nsis-installer: Use custom page for shortcuts and install for all users.
John Donoghue <john.donoghue@ieee.org>
parents:
3431
diff
changeset
|
179 \${NSD_CreateCheckBox} 0 0 100% 12u "Install for all users" |
70b110956a4e
nsis-installer: Use custom page for shortcuts and install for all users.
John Donoghue <john.donoghue@ieee.org>
parents:
3431
diff
changeset
|
180 Pop \$InstallAllUsersCtrl |
4786
0c6d7d14a615
* tools/makeinst-script.sh.in: Set default option page values (Bug #54457)
John Donoghue
parents:
4767
diff
changeset
|
181 \${NSD_SetState} \$InstallAllUsersCtrl \$InstallAllUsers |
3453
70b110956a4e
nsis-installer: Use custom page for shortcuts and install for all users.
John Donoghue <john.donoghue@ieee.org>
parents:
3431
diff
changeset
|
182 |
70b110956a4e
nsis-installer: Use custom page for shortcuts and install for all users.
John Donoghue <john.donoghue@ieee.org>
parents:
3431
diff
changeset
|
183 \${NSD_CreateCheckBox} 0 20 100% 12u "Create desktop shortcuts" |
70b110956a4e
nsis-installer: Use custom page for shortcuts and install for all users.
John Donoghue <john.donoghue@ieee.org>
parents:
3431
diff
changeset
|
184 Pop \$InstallShortcutsCtrl |
4786
0c6d7d14a615
* tools/makeinst-script.sh.in: Set default option page values (Bug #54457)
John Donoghue
parents:
4767
diff
changeset
|
185 \${NSD_SetState} \$InstallShortcutsCtrl \$InstallShortcuts |
3453
70b110956a4e
nsis-installer: Use custom page for shortcuts and install for all users.
John Donoghue <john.donoghue@ieee.org>
parents:
3431
diff
changeset
|
186 |
3458
608931797a53
installer: Add .m association to Octave
John Donoghue <john.donoghue@ieee.org>
parents:
3453
diff
changeset
|
187 \${NSD_CreateCheckBox} 0 40 100% 12u "Register .m file type with Octave" |
608931797a53
installer: Add .m association to Octave
John Donoghue <john.donoghue@ieee.org>
parents:
3453
diff
changeset
|
188 Pop \$RegisterOctaveFileTypeCtrl |
4786
0c6d7d14a615
* tools/makeinst-script.sh.in: Set default option page values (Bug #54457)
John Donoghue
parents:
4767
diff
changeset
|
189 \${NSD_SetState} \$RegisterOctaveFileTypeCtrl \$RegisterOctaveFileType |
3458
608931797a53
installer: Add .m association to Octave
John Donoghue <john.donoghue@ieee.org>
parents:
3453
diff
changeset
|
190 |
3471
6a97f4d1dedb
installer: Add ref BLAS/OpenBLAS install option
John Donoghue <john.donoghue@ieee.org>
parents:
3458
diff
changeset
|
191 \${NSD_CreateLabel} 0 70 110u 12u "BLAS library implementation:" |
6a97f4d1dedb
installer: Add ref BLAS/OpenBLAS install option
John Donoghue <john.donoghue@ieee.org>
parents:
3458
diff
changeset
|
192 Pop \$0 |
6a97f4d1dedb
installer: Add ref BLAS/OpenBLAS install option
John Donoghue <john.donoghue@ieee.org>
parents:
3458
diff
changeset
|
193 |
6a97f4d1dedb
installer: Add ref BLAS/OpenBLAS install option
John Donoghue <john.donoghue@ieee.org>
parents:
3458
diff
changeset
|
194 \${NSD_CreateDropList} 120u 70 100u 80u "" |
6a97f4d1dedb
installer: Add ref BLAS/OpenBLAS install option
John Donoghue <john.donoghue@ieee.org>
parents:
3458
diff
changeset
|
195 Pop \$InstallBlasLibCtrl |
3545
c21ca79d7980
Remove ENABLE_OPEN_BLAS from .mk files and use just to add openblass to the distribution
John Donoghue
parents:
3471
diff
changeset
|
196 EOF |
c21ca79d7980
Remove ENABLE_OPEN_BLAS from .mk files and use just to add openblass to the distribution
John Donoghue
parents:
3471
diff
changeset
|
197 # add option to install libopenblas if we have the dll present |
4793
202fa20cf559
add msys2 environment/tools option, use seprate post-install script to finalize install
John Donoghue
parents:
4787
diff
changeset
|
198 if [ -e $OCTAVE_SOURCE/$OCTAVE_SUBDIR/bin/libopenblas.dll ]; then |
3545
c21ca79d7980
Remove ENABLE_OPEN_BLAS from .mk files and use just to add openblass to the distribution
John Donoghue
parents:
3471
diff
changeset
|
199 cat >> $OUTFILE << EOF |
3471
6a97f4d1dedb
installer: Add ref BLAS/OpenBLAS install option
John Donoghue <john.donoghue@ieee.org>
parents:
3458
diff
changeset
|
200 \${NSD_CB_AddString} \$InstallBlasLibCtrl "OpenBLAS" |
3545
c21ca79d7980
Remove ENABLE_OPEN_BLAS from .mk files and use just to add openblass to the distribution
John Donoghue
parents:
3471
diff
changeset
|
201 EOF |
c21ca79d7980
Remove ENABLE_OPEN_BLAS from .mk files and use just to add openblass to the distribution
John Donoghue
parents:
3471
diff
changeset
|
202 fi |
c21ca79d7980
Remove ENABLE_OPEN_BLAS from .mk files and use just to add openblass to the distribution
John Donoghue
parents:
3471
diff
changeset
|
203 cat >> $OUTFILE << EOF |
3570
c7725f722155
NSIS installer: use Open BLAS by default
John W. Eaton <jwe@octave.org>
parents:
3552
diff
changeset
|
204 \${NSD_CB_AddString} \$InstallBlasLibCtrl "Reference BLAS" |
c7725f722155
NSIS installer: use Open BLAS by default
John W. Eaton <jwe@octave.org>
parents:
3552
diff
changeset
|
205 EOF |
c7725f722155
NSIS installer: use Open BLAS by default
John W. Eaton <jwe@octave.org>
parents:
3552
diff
changeset
|
206 |
c7725f722155
NSIS installer: use Open BLAS by default
John W. Eaton <jwe@octave.org>
parents:
3552
diff
changeset
|
207 cat >> $OUTFILE << EOF |
c7725f722155
NSIS installer: use Open BLAS by default
John W. Eaton <jwe@octave.org>
parents:
3552
diff
changeset
|
208 \${NSD_CB_SelectString} \$InstallBlasLibCtrl "$DEFAULT_BLAS" |
3471
6a97f4d1dedb
installer: Add ref BLAS/OpenBLAS install option
John Donoghue <john.donoghue@ieee.org>
parents:
3458
diff
changeset
|
209 |
3453
70b110956a4e
nsis-installer: Use custom page for shortcuts and install for all users.
John Donoghue <john.donoghue@ieee.org>
parents:
3431
diff
changeset
|
210 !insertmacro MUI_HEADER_TEXT "Install Options" "Choose options for installing" |
70b110956a4e
nsis-installer: Use custom page for shortcuts and install for all users.
John Donoghue <john.donoghue@ieee.org>
parents:
3431
diff
changeset
|
211 nsDialogs::Show |
3458
608931797a53
installer: Add .m association to Octave
John Donoghue <john.donoghue@ieee.org>
parents:
3453
diff
changeset
|
212 Pop \$0 |
3453
70b110956a4e
nsis-installer: Use custom page for shortcuts and install for all users.
John Donoghue <john.donoghue@ieee.org>
parents:
3431
diff
changeset
|
213 FunctionEnd |
70b110956a4e
nsis-installer: Use custom page for shortcuts and install for all users.
John Donoghue <john.donoghue@ieee.org>
parents:
3431
diff
changeset
|
214 |
70b110956a4e
nsis-installer: Use custom page for shortcuts and install for all users.
John Donoghue <john.donoghue@ieee.org>
parents:
3431
diff
changeset
|
215 Function octaveOptionsLeave |
70b110956a4e
nsis-installer: Use custom page for shortcuts and install for all users.
John Donoghue <john.donoghue@ieee.org>
parents:
3431
diff
changeset
|
216 \${NSD_GetState} \$InstallAllUsersCtrl \$InstallAllUsers |
70b110956a4e
nsis-installer: Use custom page for shortcuts and install for all users.
John Donoghue <john.donoghue@ieee.org>
parents:
3431
diff
changeset
|
217 \${NSD_GetState} \$InstallShortcutsCtrl \$InstallShortcuts |
3458
608931797a53
installer: Add .m association to Octave
John Donoghue <john.donoghue@ieee.org>
parents:
3453
diff
changeset
|
218 \${NSD_GetState} \$RegisterOctaveFileTypeCtrl \$RegisterOctaveFileType |
3471
6a97f4d1dedb
installer: Add ref BLAS/OpenBLAS install option
John Donoghue <john.donoghue@ieee.org>
parents:
3458
diff
changeset
|
219 \${DropList_GetCurSel} \$InstallBlasLibCtrl \$InstallBlasLib |
3453
70b110956a4e
nsis-installer: Use custom page for shortcuts and install for all users.
John Donoghue <john.donoghue@ieee.org>
parents:
3431
diff
changeset
|
220 FunctionEnd |
70b110956a4e
nsis-installer: Use custom page for shortcuts and install for all users.
John Donoghue <john.donoghue@ieee.org>
parents:
3431
diff
changeset
|
221 |
70b110956a4e
nsis-installer: Use custom page for shortcuts and install for all users.
John Donoghue <john.donoghue@ieee.org>
parents:
3431
diff
changeset
|
222 ###################################################################### |
70b110956a4e
nsis-installer: Use custom page for shortcuts and install for all users.
John Donoghue <john.donoghue@ieee.org>
parents:
3431
diff
changeset
|
223 |
3358
8708b7d07795
makeinst-script.sh: Added checking for previous installation of Octave
Anirudha Bose <ani07nov@gmail.com>
parents:
3357
diff
changeset
|
224 Function .onInit |
4786
0c6d7d14a615
* tools/makeinst-script.sh.in: Set default option page values (Bug #54457)
John Donoghue
parents:
4767
diff
changeset
|
225 ; set default options |
0c6d7d14a615
* tools/makeinst-script.sh.in: Set default option page values (Bug #54457)
John Donoghue
parents:
4767
diff
changeset
|
226 StrCpy \$InstallAllUsers \${BST_CHECKED} |
0c6d7d14a615
* tools/makeinst-script.sh.in: Set default option page values (Bug #54457)
John Donoghue
parents:
4767
diff
changeset
|
227 StrCpy \$InstallShortcuts \${BST_CHECKED} |
0c6d7d14a615
* tools/makeinst-script.sh.in: Set default option page values (Bug #54457)
John Donoghue
parents:
4767
diff
changeset
|
228 StrCpy \$RegisterOctaveFileType \${BST_CHECKED} |
0c6d7d14a615
* tools/makeinst-script.sh.in: Set default option page values (Bug #54457)
John Donoghue
parents:
4767
diff
changeset
|
229 StrCpy \$InstallBlasLib 0 |
0c6d7d14a615
* tools/makeinst-script.sh.in: Set default option page values (Bug #54457)
John Donoghue
parents:
4767
diff
changeset
|
230 |
4845
4b11bbe7c8ff
nsis-installer: provide command line opyions for options page (Bug #54766)
John Donoghue
parents:
4808
diff
changeset
|
231 ; process cmand line options |
4b11bbe7c8ff
nsis-installer: provide command line opyions for options page (Bug #54766)
John Donoghue
parents:
4808
diff
changeset
|
232 \${GetParameters} \$R0 |
4b11bbe7c8ff
nsis-installer: provide command line opyions for options page (Bug #54766)
John Donoghue
parents:
4808
diff
changeset
|
233 ClearErrors |
4b11bbe7c8ff
nsis-installer: provide command line opyions for options page (Bug #54766)
John Donoghue
parents:
4808
diff
changeset
|
234 \${GetOptions} "\$R0" "/REGISTER_FILE_TYPES=" \$0 |
4b11bbe7c8ff
nsis-installer: provide command line opyions for options page (Bug #54766)
John Donoghue
parents:
4808
diff
changeset
|
235 IfErrors no_register_opt |
4b11bbe7c8ff
nsis-installer: provide command line opyions for options page (Bug #54766)
John Donoghue
parents:
4808
diff
changeset
|
236 \${If} \$0 == 0 |
4b11bbe7c8ff
nsis-installer: provide command line opyions for options page (Bug #54766)
John Donoghue
parents:
4808
diff
changeset
|
237 StrCpy \$RegisterOctaveFileType \${BST_UNCHECKED} |
4b11bbe7c8ff
nsis-installer: provide command line opyions for options page (Bug #54766)
John Donoghue
parents:
4808
diff
changeset
|
238 \${EndIf} |
4b11bbe7c8ff
nsis-installer: provide command line opyions for options page (Bug #54766)
John Donoghue
parents:
4808
diff
changeset
|
239 no_register_opt: |
4b11bbe7c8ff
nsis-installer: provide command line opyions for options page (Bug #54766)
John Donoghue
parents:
4808
diff
changeset
|
240 ClearErrors |
4b11bbe7c8ff
nsis-installer: provide command line opyions for options page (Bug #54766)
John Donoghue
parents:
4808
diff
changeset
|
241 \${GetOptions} "\$R0" "/INSTALL_SHORTCUTS=" \$0 |
4b11bbe7c8ff
nsis-installer: provide command line opyions for options page (Bug #54766)
John Donoghue
parents:
4808
diff
changeset
|
242 IfErrors no_shortcuts_opt |
4b11bbe7c8ff
nsis-installer: provide command line opyions for options page (Bug #54766)
John Donoghue
parents:
4808
diff
changeset
|
243 \${If} \$0 == 0 |
4b11bbe7c8ff
nsis-installer: provide command line opyions for options page (Bug #54766)
John Donoghue
parents:
4808
diff
changeset
|
244 StrCpy \$InstallShortcuts \${BST_UNCHECKED} |
4b11bbe7c8ff
nsis-installer: provide command line opyions for options page (Bug #54766)
John Donoghue
parents:
4808
diff
changeset
|
245 \${EndIf} |
4b11bbe7c8ff
nsis-installer: provide command line opyions for options page (Bug #54766)
John Donoghue
parents:
4808
diff
changeset
|
246 no_shortcuts_opt: |
4b11bbe7c8ff
nsis-installer: provide command line opyions for options page (Bug #54766)
John Donoghue
parents:
4808
diff
changeset
|
247 ClearErrors |
4b11bbe7c8ff
nsis-installer: provide command line opyions for options page (Bug #54766)
John Donoghue
parents:
4808
diff
changeset
|
248 \${GetOptions} "\$R0" "/INSTALL_ALL_USERS=" \$0 |
4b11bbe7c8ff
nsis-installer: provide command line opyions for options page (Bug #54766)
John Donoghue
parents:
4808
diff
changeset
|
249 IfErrors no_all_users_opt |
4b11bbe7c8ff
nsis-installer: provide command line opyions for options page (Bug #54766)
John Donoghue
parents:
4808
diff
changeset
|
250 \${If} \$0 == 0 |
4b11bbe7c8ff
nsis-installer: provide command line opyions for options page (Bug #54766)
John Donoghue
parents:
4808
diff
changeset
|
251 StrCpy \$InstallAllUsers \${BST_UNCHECKED} |
4b11bbe7c8ff
nsis-installer: provide command line opyions for options page (Bug #54766)
John Donoghue
parents:
4808
diff
changeset
|
252 \${EndIf} |
4b11bbe7c8ff
nsis-installer: provide command line opyions for options page (Bug #54766)
John Donoghue
parents:
4808
diff
changeset
|
253 no_all_users_opt: |
4b11bbe7c8ff
nsis-installer: provide command line opyions for options page (Bug #54766)
John Donoghue
parents:
4808
diff
changeset
|
254 ClearErrors |
4b11bbe7c8ff
nsis-installer: provide command line opyions for options page (Bug #54766)
John Donoghue
parents:
4808
diff
changeset
|
255 |
4120
f2d7bb7777da
installer: dont warn on experimental for win10 (Bug #47576)
John Donoghue
parents:
4075
diff
changeset
|
256 Call CheckWinVer |
3403
f79780bcc843
installer: check destination path later in install (Bug #41069)
John Donoghue <john.donoghue@ieee.org>
parents:
3391
diff
changeset
|
257 Call CheckCurrVersion |
4759
e76d54c038ef
Don't run JRE check during install if Octave was built with --disable-java (bug #54427).
Rik <rik@octave.org>
parents:
4752
diff
changeset
|
258 \${If} @ENABLE_JAVA@ == yes |
e76d54c038ef
Don't run JRE check during install if Octave was built with --disable-java (bug #54427).
Rik <rik@octave.org>
parents:
4752
diff
changeset
|
259 Call CheckJRE |
e76d54c038ef
Don't run JRE check during install if Octave was built with --disable-java (bug #54427).
Rik <rik@octave.org>
parents:
4752
diff
changeset
|
260 \${EndIf} |
3358
8708b7d07795
makeinst-script.sh: Added checking for previous installation of Octave
Anirudha Bose <ani07nov@gmail.com>
parents:
3357
diff
changeset
|
261 InitPluginsDir |
8708b7d07795
makeinst-script.sh: Added checking for previous installation of Octave
Anirudha Bose <ani07nov@gmail.com>
parents:
3357
diff
changeset
|
262 FunctionEnd |
3357
456b6e533054
makeinst-script.sh: Added checking for Java Runtime Environment
Anirudha Bose <ani07nov@gmail.com>
parents:
3356
diff
changeset
|
263 |
2992
4b450c162e39
Add ability to create simple NSIS installer
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
264 ; file section |
4b450c162e39
Add ability to create simple NSIS installer
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
265 Section "MainFiles" |
3453
70b110956a4e
nsis-installer: Use custom page for shortcuts and install for all users.
John Donoghue <john.donoghue@ieee.org>
parents:
3431
diff
changeset
|
266 ; set context based on whether installing for user or all |
70b110956a4e
nsis-installer: Use custom page for shortcuts and install for all users.
John Donoghue <john.donoghue@ieee.org>
parents:
3431
diff
changeset
|
267 \${If} \$InstallAllUsers == \${BST_CHECKED} |
70b110956a4e
nsis-installer: Use custom page for shortcuts and install for all users.
John Donoghue <john.donoghue@ieee.org>
parents:
3431
diff
changeset
|
268 SetShellVarContext all |
70b110956a4e
nsis-installer: Use custom page for shortcuts and install for all users.
John Donoghue <john.donoghue@ieee.org>
parents:
3431
diff
changeset
|
269 \${Else} |
70b110956a4e
nsis-installer: Use custom page for shortcuts and install for all users.
John Donoghue <john.donoghue@ieee.org>
parents:
3431
diff
changeset
|
270 SetShellVarContext current |
70b110956a4e
nsis-installer: Use custom page for shortcuts and install for all users.
John Donoghue <john.donoghue@ieee.org>
parents:
3431
diff
changeset
|
271 \${Endif} |
70b110956a4e
nsis-installer: Use custom page for shortcuts and install for all users.
John Donoghue <john.donoghue@ieee.org>
parents:
3431
diff
changeset
|
272 |
70b110956a4e
nsis-installer: Use custom page for shortcuts and install for all users.
John Donoghue <john.donoghue@ieee.org>
parents:
3431
diff
changeset
|
273 ; include the README |
70b110956a4e
nsis-installer: Use custom page for shortcuts and install for all users.
John Donoghue <john.donoghue@ieee.org>
parents:
3431
diff
changeset
|
274 SetOutPath "\$INSTDIR" |
70b110956a4e
nsis-installer: Use custom page for shortcuts and install for all users.
John Donoghue <john.donoghue@ieee.org>
parents:
3431
diff
changeset
|
275 File "$OCTAVE_SOURCE/README.html" |
70b110956a4e
nsis-installer: Use custom page for shortcuts and install for all users.
John Donoghue <john.donoghue@ieee.org>
parents:
3431
diff
changeset
|
276 |
4767
a800e350d88b
use .bat file for octave.exe/octave-version.exe (Bug #53938)
John Donoghue
parents:
4759
diff
changeset
|
277 ; include octave.vbs and other scripts |
3717
70480095b6ed
Use a bat file to run octave in windows (Bug #43164)
John Donoghue
parents:
3686
diff
changeset
|
278 SetOutPath "\$INSTDIR" |
3817
6daa158a7018
nsis installer: use octave.vbs as laucher (Bug #41074)
John Donoghue <john.donoghue@ieee.org>
parents:
3784
diff
changeset
|
279 File "$OCTAVE_SOURCE/octave.vbs" |
4028
8803dfa40236
nsis installer: set directory to userprofile on startof octave from installer (Bug #45899)
John Donoghue
parents:
3963
diff
changeset
|
280 File "$OCTAVE_SOURCE/octave-firsttime.vbs" |
4254
7f2d5c8c4491
installer: update fc cache during install (Bug #45458)
John D
parents:
4186
diff
changeset
|
281 File "$OCTAVE_SOURCE/fc_update.bat" |
4793
202fa20cf559
add msys2 environment/tools option, use seprate post-install script to finalize install
John Donoghue
parents:
4787
diff
changeset
|
282 File "$OCTAVE_SOURCE/post-install.bat" |
4254
7f2d5c8c4491
installer: update fc cache during install (Bug #45458)
John D
parents:
4186
diff
changeset
|
283 |
4602
a487b12dc08f
* tools/makeinst-script.sh.in: include HG-ID in installed files
John Donoghue
parents:
4471
diff
changeset
|
284 File "$OCTAVE_SOURCE/HG-ID" |
a487b12dc08f
* tools/makeinst-script.sh.in: include HG-ID in installed files
John Donoghue
parents:
4471
diff
changeset
|
285 |
3453
70b110956a4e
nsis-installer: Use custom page for shortcuts and install for all users.
John Donoghue <john.donoghue@ieee.org>
parents:
3431
diff
changeset
|
286 ; distro files |
2992
4b450c162e39
Add ability to create simple NSIS installer
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
287 EOF |
3963
9d402d735dd1
nsis-installer: add bash window menu if devel tools enabled
John Donoghue
parents:
3956
diff
changeset
|
288 if [ -f $OCTAVE_SOURCE/cmdshell.bat ]; then |
9d402d735dd1
nsis-installer: add bash window menu if devel tools enabled
John Donoghue
parents:
3956
diff
changeset
|
289 echo "File '$OCTAVE_SOURCE/cmdshell.bat'" >> $OUTFILE |
9d402d735dd1
nsis-installer: add bash window menu if devel tools enabled
John Donoghue
parents:
3956
diff
changeset
|
290 fi |
2992
4b450c162e39
Add ability to create simple NSIS installer
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
291 |
4254
7f2d5c8c4491
installer: update fc cache during install (Bug #45458)
John D
parents:
4186
diff
changeset
|
292 |
2992
4b450c162e39
Add ability to create simple NSIS installer
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
293 # insert the files |
4b450c162e39
Add ability to create simple NSIS installer
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
294 IFS=$'\n' |
4b450c162e39
Add ability to create simple NSIS installer
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
295 for f in $(find $OCTAVE_SOURCE -type d -printf "%P\n"); do |
4b450c162e39
Add ability to create simple NSIS installer
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
296 winf=`echo $f | sed 's,/,\\\\,g'` |
3431
a7c772aa106f
Move mk-dist script functionality into Makefile.
John W. Eaton <jwe@octave.org>
parents:
3430
diff
changeset
|
297 echo " CreateDirectory \"\$INSTDIR\\$winf\"" >> $OUTFILE |
a7c772aa106f
Move mk-dist script functionality into Makefile.
John W. Eaton <jwe@octave.org>
parents:
3430
diff
changeset
|
298 echo " SetOutPath \"\$INSTDIR\\$winf\"" >> $OUTFILE |
a7c772aa106f
Move mk-dist script functionality into Makefile.
John W. Eaton <jwe@octave.org>
parents:
3430
diff
changeset
|
299 find "$OCTAVE_SOURCE/$f" -maxdepth 1 -type f -printf " File \"%p\"\n" >> $OUTFILE |
2992
4b450c162e39
Add ability to create simple NSIS installer
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
300 done |
4b450c162e39
Add ability to create simple NSIS installer
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
301 |
3431
a7c772aa106f
Move mk-dist script functionality into Makefile.
John W. Eaton <jwe@octave.org>
parents:
3430
diff
changeset
|
302 cat >> $OUTFILE << EOF |
2992
4b450c162e39
Add ability to create simple NSIS installer
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
303 |
3409
5e77c5fc91ed
qt: build translations in cross build and install
John Donoghue <john.donoghue@ieee.org>
parents:
3406
diff
changeset
|
304 ; add qt.conf |
5e77c5fc91ed
qt: build translations in cross build and install
John Donoghue <john.donoghue@ieee.org>
parents:
3406
diff
changeset
|
305 Push \$0 |
5e77c5fc91ed
qt: build translations in cross build and install
John Donoghue <john.donoghue@ieee.org>
parents:
3406
diff
changeset
|
306 \${StrRep} '\$0' '\$INSTDIR' '\\' '/' |
5134
0ff5f24c0862
* tools/makeinst-script.sh.in: update qt prefix and translations dir in installer qt.conf
John Donoghue
parents:
5125
diff
changeset
|
307 WriteINIStr "\$INSTDIR\\$OCTAVE_SUBDIR\\bin\\qt.conf" "Paths" "Prefix" "\$0/$OCTAVE_SUBDIR" |
5135
6836b2f08479
* tools/makeinst-script.sh.in: expand qt.conf to include all installed qt dirs
John Donoghue
parents:
5134
diff
changeset
|
308 WriteINIStr "\$INSTDIR\\$OCTAVE_SUBDIR\\bin\\qt.conf" "Paths" "Documentation" "${QT_SUBDIR}doc" |
6836b2f08479
* tools/makeinst-script.sh.in: expand qt.conf to include all installed qt dirs
John Donoghue
parents:
5134
diff
changeset
|
309 WriteINIStr "\$INSTDIR\\$OCTAVE_SUBDIR\\bin\\qt.conf" "Paths" "Headers" "${QT_SUBDIR}include" |
6836b2f08479
* tools/makeinst-script.sh.in: expand qt.conf to include all installed qt dirs
John Donoghue
parents:
5134
diff
changeset
|
310 WriteINIStr "\$INSTDIR\\$OCTAVE_SUBDIR\\bin\\qt.conf" "Paths" "Libraries" "${QT_SUBDIR}lib" |
6836b2f08479
* tools/makeinst-script.sh.in: expand qt.conf to include all installed qt dirs
John Donoghue
parents:
5134
diff
changeset
|
311 WriteINIStr "\$INSTDIR\\$OCTAVE_SUBDIR\\bin\\qt.conf" "Paths" "Plugins" "${QT_SUBDIR}plugins" |
5134
0ff5f24c0862
* tools/makeinst-script.sh.in: update qt prefix and translations dir in installer qt.conf
John Donoghue
parents:
5125
diff
changeset
|
312 WriteINIStr "\$INSTDIR\\$OCTAVE_SUBDIR\\bin\\qt.conf" "Paths" "Translations" "${QT_SUBDIR}translations" |
3409
5e77c5fc91ed
qt: build translations in cross build and install
John Donoghue <john.donoghue@ieee.org>
parents:
3406
diff
changeset
|
313 Pop \$0 |
4254
7f2d5c8c4491
installer: update fc cache during install (Bug #45458)
John D
parents:
4186
diff
changeset
|
314 |
4793
202fa20cf559
add msys2 environment/tools option, use seprate post-install script to finalize install
John Donoghue
parents:
4787
diff
changeset
|
315 ; run post-install script |
4258 | 316 GetFullPathName /SHORT \$1 \$INSTDIR |
4793
202fa20cf559
add msys2 environment/tools option, use seprate post-install script to finalize install
John Donoghue
parents:
4787
diff
changeset
|
317 DetailPrint "Running post install script (May take a while) ..." |
202fa20cf559
add msys2 environment/tools option, use seprate post-install script to finalize install
John Donoghue
parents:
4787
diff
changeset
|
318 ;ExecWait "\$1\\post-install.bat" |
202fa20cf559
add msys2 environment/tools option, use seprate post-install script to finalize install
John Donoghue
parents:
4787
diff
changeset
|
319 ; run in hidden console window |
5125
cd7689f3fcd8
* tools/makeinst-script.sh.in: increate posi install script wait time to 1min
John Donoghue
parents:
4949
diff
changeset
|
320 nsExec::Exec /TIMEOUT=60000 '"\$1\\post-install.bat"' |
4793
202fa20cf559
add msys2 environment/tools option, use seprate post-install script to finalize install
John Donoghue
parents:
4787
diff
changeset
|
321 Pop \$0 |
2992
4b450c162e39
Add ability to create simple NSIS installer
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
322 SectionEnd |
4b450c162e39
Add ability to create simple NSIS installer
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
323 |
4b450c162e39
Add ability to create simple NSIS installer
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
324 Section make_uninstaller |
4b450c162e39
Add ability to create simple NSIS installer
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
325 ; Write the uninstall keys for Windows |
4b450c162e39
Add ability to create simple NSIS installer
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
326 SetOutPath "\$INSTDIR" |
3818
9b033c5323db
nsis installer: expand uninstall information
John Donoghue
parents:
3817
diff
changeset
|
327 WriteRegStr HKLM "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Octave-$VERSION" "DisplayName" "Octave $VERSION" |
3403
f79780bcc843
installer: check destination path later in install (Bug #41069)
John Donoghue <john.donoghue@ieee.org>
parents:
3391
diff
changeset
|
328 WriteRegStr HKLM "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Octave-$VERSION" "DisplayVersion" "$VERSION" |
3818
9b033c5323db
nsis installer: expand uninstall information
John Donoghue
parents:
3817
diff
changeset
|
329 WriteRegStr HKLM "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Octave-$VERSION" "DisplayIcon" "\$INSTDIR\\$ICON" |
3403
f79780bcc843
installer: check destination path later in install (Bug #41069)
John Donoghue <john.donoghue@ieee.org>
parents:
3391
diff
changeset
|
330 WriteRegStr HKLM "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Octave-$VERSION" "UninstallString" "\$INSTDIR\\uninstall.exe" |
f79780bcc843
installer: check destination path later in install (Bug #41069)
John Donoghue <john.donoghue@ieee.org>
parents:
3391
diff
changeset
|
331 WriteRegDWORD HKLM "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Octave-$VERSION" "NoModify" 1 |
f79780bcc843
installer: check destination path later in install (Bug #41069)
John Donoghue <john.donoghue@ieee.org>
parents:
3391
diff
changeset
|
332 WriteRegDWORD HKLM "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Octave-$VERSION" "NoRepair" 1 |
3818
9b033c5323db
nsis installer: expand uninstall information
John Donoghue
parents:
3817
diff
changeset
|
333 WriteRegStr HKLM "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Octave-$VERSION" "Publisher" "\${APP_NAME}" |
9b033c5323db
nsis installer: expand uninstall information
John Donoghue
parents:
3817
diff
changeset
|
334 WriteRegDWORD HKLM "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Octave-$VERSION" "EstimatedSize" $SIZE |
3453
70b110956a4e
nsis-installer: Use custom page for shortcuts and install for all users.
John Donoghue <john.donoghue@ieee.org>
parents:
3431
diff
changeset
|
335 \${If} \$InstallAllUsers == \${BST_CHECKED} |
70b110956a4e
nsis-installer: Use custom page for shortcuts and install for all users.
John Donoghue <john.donoghue@ieee.org>
parents:
3431
diff
changeset
|
336 WriteRegDWORD HKLM "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Octave-$VERSION" "AllUsers" 1 |
70b110956a4e
nsis-installer: Use custom page for shortcuts and install for all users.
John Donoghue <john.donoghue@ieee.org>
parents:
3431
diff
changeset
|
337 \${EndIf} |
2992
4b450c162e39
Add ability to create simple NSIS installer
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
338 WriteUninstaller "uninstall.exe" |
4b450c162e39
Add ability to create simple NSIS installer
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
339 SectionEnd |
4b450c162e39
Add ability to create simple NSIS installer
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
340 |
4b450c162e39
Add ability to create simple NSIS installer
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
341 ; start menu (currently hardcoded) |
4b450c162e39
Add ability to create simple NSIS installer
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
342 Section "Shortcuts" |
4b450c162e39
Add ability to create simple NSIS installer
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
343 |
4471
1a3deda73484
nsis installer: include version links in startmenu (Bug #51878)
John D
parents:
4458
diff
changeset
|
344 CreateDirectory "\$SMPROGRAMS\\GNU Octave $VERSION" |
1a3deda73484
nsis installer: include version links in startmenu (Bug #51878)
John D
parents:
4458
diff
changeset
|
345 CreateShortCut "\$SMPROGRAMS\\GNU Octave $VERSION\\Uninstall.lnk" "\$INSTDIR\\uninstall.exe" "" "\$INSTDIR\\uninstall.exe" 0 |
3423
c8e055d83b9f
Set start directory to user home (Bug #41220)
John D <john.donoghue@ieee.org>
parents:
3422
diff
changeset
|
346 SetOutPath "%USERPROFILE%" |
4949
1c251625c3cf
* tools/makeinst-script.sh.in: call .vbs files via wscript call (Bug #55635)
John Donoghue
parents:
4845
diff
changeset
|
347 CreateShortCut "\$SMPROGRAMS\\GNU Octave $VERSION\\Octave-$VERSION (CLI).lnk" "%SYSTEMROOT%\\system32\\wscript.exe" "\$\\"\$INSTDIR\\octave.vbs\$\\" --no-gui" "\$INSTDIR\\$ICON" 0 SW_SHOWMINIMIZED |
5248
9899965a595b
* tools/makeinst-script.sh.in: use --gui not --force-gui
John Donoghue <john.donoghue@ieee.org>
parents:
5168
diff
changeset
|
348 CreateShortCut "\$SMPROGRAMS\\GNU Octave $VERSION\\Octave-$VERSION (GUI).lnk" "%SYSTEMROOT%\\system32\\wscript.exe" "\$\\"\$INSTDIR\\octave.vbs\$\\" --gui" "\$INSTDIR\\$ICON" 0 SW_SHOWMINIMIZED |
3384
0de28586712a
installer: Change gui shortcut path to libexec installed path
John Donoghue <john.donoghue@ieee.org>
parents:
3367
diff
changeset
|
349 SetOutPath "\$INSTDIR" |
4176
a543952ed731
set usermodelappid for octave-gui shortcut (Bug #47527)
John Donoghue
parents:
4173
diff
changeset
|
350 |
a543952ed731
set usermodelappid for octave-gui shortcut (Bug #47527)
John Donoghue
parents:
4173
diff
changeset
|
351 ; fix the shortcuts for appid |
4793
202fa20cf559
add msys2 environment/tools option, use seprate post-install script to finalize install
John Donoghue
parents:
4787
diff
changeset
|
352 ; run in hidden console window |
202fa20cf559
add msys2 environment/tools option, use seprate post-install script to finalize install
John Donoghue
parents:
4787
diff
changeset
|
353 nsExec::Exec /TIMEOUT=30000 '"\$INSTDIR\\$OCTAVE_SUBDIR\\bin\\win7appid.exe" "\$SMPROGRAMS\\GNU Octave $VERSION\\Octave-$VERSION (GUI).lnk" "gnu.octave.$VERSION"' |
202fa20cf559
add msys2 environment/tools option, use seprate post-install script to finalize install
John Donoghue
parents:
4787
diff
changeset
|
354 Pop \$0 |
3367
cfcbe03c9160
installer: Enable documentation build and add to installer.
John Donoghue <john.donoghue@ieee.org>
parents:
3366
diff
changeset
|
355 EOF |
3963
9d402d735dd1
nsis-installer: add bash window menu if devel tools enabled
John Donoghue
parents:
3956
diff
changeset
|
356 # shortcut for cmd win |
9d402d735dd1
nsis-installer: add bash window menu if devel tools enabled
John Donoghue
parents:
3956
diff
changeset
|
357 if [ -f $OCTAVE_SOURCE/cmdshell.bat ]; then |
4471
1a3deda73484
nsis installer: include version links in startmenu (Bug #51878)
John D
parents:
4458
diff
changeset
|
358 echo "CreateShortCut '\$SMPROGRAMS\\GNU Octave $VERSION\\Bash Shell.lnk' '\$INSTDIR\\cmdshell.bat' '' '' 0" >> $OUTFILE |
3963
9d402d735dd1
nsis-installer: add bash window menu if devel tools enabled
John Donoghue
parents:
3956
diff
changeset
|
359 fi |
3367
cfcbe03c9160
installer: Enable documentation build and add to installer.
John Donoghue <john.donoghue@ieee.org>
parents:
3366
diff
changeset
|
360 # if we have documentation files, create shortcuts |
4808
adc0217b36c0
* tools/makeinst-script.sh.in: update doc paths for msys2 /mingwXX
John Donoghue
parents:
4793
diff
changeset
|
361 if [ -d $OCTAVE_SOURCE/$OCTAVE_SUBDIR/share/doc/octave ]; then |
3431
a7c772aa106f
Move mk-dist script functionality into Makefile.
John W. Eaton <jwe@octave.org>
parents:
3430
diff
changeset
|
362 cat >> $OUTFILE << EOF |
4471
1a3deda73484
nsis installer: include version links in startmenu (Bug #51878)
John D
parents:
4458
diff
changeset
|
363 CreateDirectory "\$SMPROGRAMS\\GNU Octave $VERSION\\Documentation" |
4808
adc0217b36c0
* tools/makeinst-script.sh.in: update doc paths for msys2 /mingwXX
John Donoghue
parents:
4793
diff
changeset
|
364 CreateShortCut "\$SMPROGRAMS\\GNU Octave $VERSION\\Documentation\\Octave C++ Classes (PDF).lnk" "\$INSTDIR\\$OCTAVE_SUBDIR\\share\\doc\\octave\\liboctave.pdf" "" "" 0 |
adc0217b36c0
* tools/makeinst-script.sh.in: update doc paths for msys2 /mingwXX
John Donoghue
parents:
4793
diff
changeset
|
365 CreateShortCut "\$SMPROGRAMS\\GNU Octave $VERSION\\Documentation\\Octave C++ Classes (HTML).lnk" "\$INSTDIR\\$OCTAVE_SUBDIR\\share\\doc\\octave\\liboctave.html\\index.html" "" "" 0 |
adc0217b36c0
* tools/makeinst-script.sh.in: update doc paths for msys2 /mingwXX
John Donoghue
parents:
4793
diff
changeset
|
366 CreateShortCut "\$SMPROGRAMS\\GNU Octave $VERSION\\Documentation\\Octave (PDF).lnk" "\$INSTDIR\\$OCTAVE_SUBDIR\\share\\doc\\octave\\octave.pdf" "" "" 0 |
adc0217b36c0
* tools/makeinst-script.sh.in: update doc paths for msys2 /mingwXX
John Donoghue
parents:
4793
diff
changeset
|
367 CreateShortCut "\$SMPROGRAMS\\GNU Octave $VERSION\\Documentation\\Octave (HTML).lnk" "\$INSTDIR\\$OCTAVE_SUBDIR\\share\\doc\\octave\\octave.html\\index.html" "" "" 0 |
3367
cfcbe03c9160
installer: Enable documentation build and add to installer.
John Donoghue <john.donoghue@ieee.org>
parents:
3366
diff
changeset
|
368 EOF |
cfcbe03c9160
installer: Enable documentation build and add to installer.
John Donoghue <john.donoghue@ieee.org>
parents:
3366
diff
changeset
|
369 fi |
cfcbe03c9160
installer: Enable documentation build and add to installer.
John Donoghue <john.donoghue@ieee.org>
parents:
3366
diff
changeset
|
370 |
3431
a7c772aa106f
Move mk-dist script functionality into Makefile.
John W. Eaton <jwe@octave.org>
parents:
3430
diff
changeset
|
371 cat >> $OUTFILE << EOF |
3453
70b110956a4e
nsis-installer: Use custom page for shortcuts and install for all users.
John Donoghue <john.donoghue@ieee.org>
parents:
3431
diff
changeset
|
372 |
70b110956a4e
nsis-installer: Use custom page for shortcuts and install for all users.
John Donoghue <john.donoghue@ieee.org>
parents:
3431
diff
changeset
|
373 \${If} \$InstallShortcuts == \${BST_CHECKED} |
4471
1a3deda73484
nsis installer: include version links in startmenu (Bug #51878)
John D
parents:
4458
diff
changeset
|
374 |
1a3deda73484
nsis installer: include version links in startmenu (Bug #51878)
John D
parents:
4458
diff
changeset
|
375 ; get latest octave and create shortcuts to it |
1a3deda73484
nsis installer: include version links in startmenu (Bug #51878)
John D
parents:
4458
diff
changeset
|
376 Push \$R0 |
1a3deda73484
nsis installer: include version links in startmenu (Bug #51878)
John D
parents:
4458
diff
changeset
|
377 Push \$R1 |
1a3deda73484
nsis installer: include version links in startmenu (Bug #51878)
John D
parents:
4458
diff
changeset
|
378 Push \$R2 |
1a3deda73484
nsis installer: include version links in startmenu (Bug #51878)
John D
parents:
4458
diff
changeset
|
379 |
1a3deda73484
nsis installer: include version links in startmenu (Bug #51878)
John D
parents:
4458
diff
changeset
|
380 Call GetLatestOctave |
1a3deda73484
nsis installer: include version links in startmenu (Bug #51878)
John D
parents:
4458
diff
changeset
|
381 Pop \$R1 ; Ver |
1a3deda73484
nsis installer: include version links in startmenu (Bug #51878)
John D
parents:
4458
diff
changeset
|
382 |
1a3deda73484
nsis installer: include version links in startmenu (Bug #51878)
John D
parents:
4458
diff
changeset
|
383 ; if no version found - need set INST DIR and VER will use |
1a3deda73484
nsis installer: include version links in startmenu (Bug #51878)
John D
parents:
4458
diff
changeset
|
384 StrCmp \$R1 "" set_ver_str |
1a3deda73484
nsis installer: include version links in startmenu (Bug #51878)
John D
parents:
4458
diff
changeset
|
385 |
1a3deda73484
nsis installer: include version links in startmenu (Bug #51878)
John D
parents:
4458
diff
changeset
|
386 ; valid install found - get info from registry |
1a3deda73484
nsis installer: include version links in startmenu (Bug #51878)
John D
parents:
4458
diff
changeset
|
387 ReadRegStr \$R0 HKLM "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Octave-\$R1" "UninstallString" |
1a3deda73484
nsis installer: include version links in startmenu (Bug #51878)
John D
parents:
4458
diff
changeset
|
388 \${GetParent} \$R0 \$R0 |
1a3deda73484
nsis installer: include version links in startmenu (Bug #51878)
John D
parents:
4458
diff
changeset
|
389 ReadRegStr \$R2 HKLM "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Octave-\$R1" "DisplayIcon" |
1a3deda73484
nsis installer: include version links in startmenu (Bug #51878)
John D
parents:
4458
diff
changeset
|
390 GoTo have_ver_str |
1a3deda73484
nsis installer: include version links in startmenu (Bug #51878)
John D
parents:
4458
diff
changeset
|
391 set_ver_str: |
1a3deda73484
nsis installer: include version links in startmenu (Bug #51878)
John D
parents:
4458
diff
changeset
|
392 StrCpy \$R1 "$VERSION" |
1a3deda73484
nsis installer: include version links in startmenu (Bug #51878)
John D
parents:
4458
diff
changeset
|
393 StrCpy \$R0 "\$INSTDIR" |
1a3deda73484
nsis installer: include version links in startmenu (Bug #51878)
John D
parents:
4458
diff
changeset
|
394 StrCpy \$R2 "\$INSTDIR\\$ICON" |
1a3deda73484
nsis installer: include version links in startmenu (Bug #51878)
John D
parents:
4458
diff
changeset
|
395 |
1a3deda73484
nsis installer: include version links in startmenu (Bug #51878)
John D
parents:
4458
diff
changeset
|
396 have_ver_str: |
3453
70b110956a4e
nsis-installer: Use custom page for shortcuts and install for all users.
John Donoghue <john.donoghue@ieee.org>
parents:
3431
diff
changeset
|
397 SetOutPath "%USERPROFILE%" |
4949
1c251625c3cf
* tools/makeinst-script.sh.in: call .vbs files via wscript call (Bug #55635)
John Donoghue
parents:
4845
diff
changeset
|
398 CreateShortCut "\$desktop\\GNU Octave (CLI).lnk" "%SYSTEMROOT%\\system32\\wscript.exe" "\$\\"\$R0\\octave.vbs\$\\" --no-gui" "\$R2" 0 SW_SHOWMINIMIZED |
5248
9899965a595b
* tools/makeinst-script.sh.in: use --gui not --force-gui
John Donoghue <john.donoghue@ieee.org>
parents:
5168
diff
changeset
|
399 CreateShortCut "\$desktop\\GNU Octave (GUI).lnk" "%SYSTEMROOT%\\system32\\wscript.exe" "\$\\"\$R0\\octave.vbs\$\\" --gui" "\$R2" 0 SW_SHOWMINIMIZED |
4186
393571034f24
* tools/makeinst-script.sh.in: set appid of desktop (GUI).lnk
John D
parents:
4176
diff
changeset
|
400 |
4793
202fa20cf559
add msys2 environment/tools option, use seprate post-install script to finalize install
John Donoghue
parents:
4787
diff
changeset
|
401 nsExec::Exec /TIMEOUT=30000 '"\$INSTDIR\\$OCTAVE_SUBDIR\\bin\\win7appid.exe" "\$desktop\\GNU Octave (GUI).lnk" "gnu.octave.\$R1"' |
202fa20cf559
add msys2 environment/tools option, use seprate post-install script to finalize install
John Donoghue
parents:
4787
diff
changeset
|
402 Pop \$0 |
4471
1a3deda73484
nsis installer: include version links in startmenu (Bug #51878)
John D
parents:
4458
diff
changeset
|
403 |
1a3deda73484
nsis installer: include version links in startmenu (Bug #51878)
John D
parents:
4458
diff
changeset
|
404 Pop \$R2 |
1a3deda73484
nsis installer: include version links in startmenu (Bug #51878)
John D
parents:
4458
diff
changeset
|
405 Pop \$R1 |
1a3deda73484
nsis installer: include version links in startmenu (Bug #51878)
John D
parents:
4458
diff
changeset
|
406 Pop \$R0 |
3453
70b110956a4e
nsis-installer: Use custom page for shortcuts and install for all users.
John Donoghue <john.donoghue@ieee.org>
parents:
3431
diff
changeset
|
407 \${Endif} |
70b110956a4e
nsis-installer: Use custom page for shortcuts and install for all users.
John Donoghue <john.donoghue@ieee.org>
parents:
3431
diff
changeset
|
408 |
3471
6a97f4d1dedb
installer: Add ref BLAS/OpenBLAS install option
John Donoghue <john.donoghue@ieee.org>
parents:
3458
diff
changeset
|
409 ; BLAS set up |
6a97f4d1dedb
installer: Add ref BLAS/OpenBLAS install option
John Donoghue <john.donoghue@ieee.org>
parents:
3458
diff
changeset
|
410 \${If} \$InstallBlasLib == 1 |
3570
c7725f722155
NSIS installer: use Open BLAS by default
John W. Eaton <jwe@octave.org>
parents:
3552
diff
changeset
|
411 ; Reference BLAS |
4793
202fa20cf559
add msys2 environment/tools option, use seprate post-install script to finalize install
John Donoghue
parents:
4787
diff
changeset
|
412 CopyFiles /SILENT "\$INSTDIR\\$OCTAVE_SUBDIR\\bin\\librefblas.dll" "\$INSTDIR\\$OCTAVE_SUBDIR\\bin\\libblas.dll" |
3570
c7725f722155
NSIS installer: use Open BLAS by default
John W. Eaton <jwe@octave.org>
parents:
3552
diff
changeset
|
413 \${Else} |
3471
6a97f4d1dedb
installer: Add ref BLAS/OpenBLAS install option
John Donoghue <john.donoghue@ieee.org>
parents:
3458
diff
changeset
|
414 ; OpenBLAS |
4793
202fa20cf559
add msys2 environment/tools option, use seprate post-install script to finalize install
John Donoghue
parents:
4787
diff
changeset
|
415 CopyFiles /SILENT "\$INSTDIR\\$OCTAVE_SUBDIR\\bin\\libopenblas.dll" "\$INSTDIR\\$OCTAVE_SUBDIR\\bin\\libblas.dll" |
3471
6a97f4d1dedb
installer: Add ref BLAS/OpenBLAS install option
John Donoghue <john.donoghue@ieee.org>
parents:
3458
diff
changeset
|
416 \${EndIf} |
6a97f4d1dedb
installer: Add ref BLAS/OpenBLAS install option
John Donoghue <john.donoghue@ieee.org>
parents:
3458
diff
changeset
|
417 |
2992
4b450c162e39
Add ability to create simple NSIS installer
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
418 SectionEnd |
4b450c162e39
Add ability to create simple NSIS installer
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
419 |
3458
608931797a53
installer: Add .m association to Octave
John Donoghue <john.donoghue@ieee.org>
parents:
3453
diff
changeset
|
420 Section "FileTypeRego" |
608931797a53
installer: Add .m association to Octave
John Donoghue <john.donoghue@ieee.org>
parents:
3453
diff
changeset
|
421 ; Octave document |
608931797a53
installer: Add .m association to Octave
John Donoghue <john.donoghue@ieee.org>
parents:
3453
diff
changeset
|
422 WriteRegStr HKCR "Octave.Document.$VERSION" "" "GNU Octave Script" |
608931797a53
installer: Add .m association to Octave
John Donoghue <john.donoghue@ieee.org>
parents:
3453
diff
changeset
|
423 WriteRegStr HKCR "Octave.Document.$VERSION\\DefaultIcon" "" "\$INSTDIR\\$ICON" |
608931797a53
installer: Add .m association to Octave
John Donoghue <john.donoghue@ieee.org>
parents:
3453
diff
changeset
|
424 ; document actions |
5248
9899965a595b
* tools/makeinst-script.sh.in: use --gui not --force-gui
John Donoghue <john.donoghue@ieee.org>
parents:
5168
diff
changeset
|
425 WriteRegStr HKCR "Octave.Document.$VERSION\\shell\\open\\command" "" "wscript \$\\"\$INSTDIR\\octave.vbs\$\\" --gui --persist --eval \$\\"edit '%1'\$\\"" |
3458
608931797a53
installer: Add .m association to Octave
John Donoghue <john.donoghue@ieee.org>
parents:
3453
diff
changeset
|
426 |
608931797a53
installer: Add .m association to Octave
John Donoghue <john.donoghue@ieee.org>
parents:
3453
diff
changeset
|
427 \${If} \$RegisterOctaveFileType == \${BST_CHECKED} |
608931797a53
installer: Add .m association to Octave
John Donoghue <john.donoghue@ieee.org>
parents:
3453
diff
changeset
|
428 ReadRegStr \$0 HKCR ".m" "" |
608931797a53
installer: Add .m association to Octave
John Donoghue <john.donoghue@ieee.org>
parents:
3453
diff
changeset
|
429 StrCmp "\$0" "" no_back_type |
608931797a53
installer: Add .m association to Octave
John Donoghue <john.donoghue@ieee.org>
parents:
3453
diff
changeset
|
430 WriteRegStr HKCR ".m" "backup_val" "\$0" |
608931797a53
installer: Add .m association to Octave
John Donoghue <john.donoghue@ieee.org>
parents:
3453
diff
changeset
|
431 no_back_type: |
608931797a53
installer: Add .m association to Octave
John Donoghue <john.donoghue@ieee.org>
parents:
3453
diff
changeset
|
432 WriteRegStr HKCR ".m" "" "Octave.Document.$VERSION" |
608931797a53
installer: Add .m association to Octave
John Donoghue <john.donoghue@ieee.org>
parents:
3453
diff
changeset
|
433 WriteRegDWORD HKLM "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Octave-$VERSION" "RegisteredFileType" 1 |
608931797a53
installer: Add .m association to Octave
John Donoghue <john.donoghue@ieee.org>
parents:
3453
diff
changeset
|
434 \${EndIf} |
608931797a53
installer: Add .m association to Octave
John Donoghue <john.donoghue@ieee.org>
parents:
3453
diff
changeset
|
435 SectionEnd |
608931797a53
installer: Add .m association to Octave
John Donoghue <john.donoghue@ieee.org>
parents:
3453
diff
changeset
|
436 |
2992
4b450c162e39
Add ability to create simple NSIS installer
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
437 Section "Uninstall" |
4b450c162e39
Add ability to create simple NSIS installer
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
438 |
3453
70b110956a4e
nsis-installer: Use custom page for shortcuts and install for all users.
John Donoghue <john.donoghue@ieee.org>
parents:
3431
diff
changeset
|
439 ReadRegDWORD \$0 HKLM "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Octave-$VERSION" "AllUsers" |
70b110956a4e
nsis-installer: Use custom page for shortcuts and install for all users.
John Donoghue <john.donoghue@ieee.org>
parents:
3431
diff
changeset
|
440 IfErrors not_all_users |
70b110956a4e
nsis-installer: Use custom page for shortcuts and install for all users.
John Donoghue <john.donoghue@ieee.org>
parents:
3431
diff
changeset
|
441 |
70b110956a4e
nsis-installer: Use custom page for shortcuts and install for all users.
John Donoghue <john.donoghue@ieee.org>
parents:
3431
diff
changeset
|
442 SetShellVarContext all |
70b110956a4e
nsis-installer: Use custom page for shortcuts and install for all users.
John Donoghue <john.donoghue@ieee.org>
parents:
3431
diff
changeset
|
443 |
70b110956a4e
nsis-installer: Use custom page for shortcuts and install for all users.
John Donoghue <john.donoghue@ieee.org>
parents:
3431
diff
changeset
|
444 not_all_users: |
3458
608931797a53
installer: Add .m association to Octave
John Donoghue <john.donoghue@ieee.org>
parents:
3453
diff
changeset
|
445 ReadRegDWORD \$0 HKLM "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Octave-$VERSION" "RegisteredFileType" |
608931797a53
installer: Add .m association to Octave
John Donoghue <john.donoghue@ieee.org>
parents:
3453
diff
changeset
|
446 IfErrors not_registered_file |
608931797a53
installer: Add .m association to Octave
John Donoghue <john.donoghue@ieee.org>
parents:
3453
diff
changeset
|
447 |
4255
ee1ae5d1fd88
installer: dont remove file association if is not for installed octave
John D
parents:
4254
diff
changeset
|
448 ; only try remove if is set to our version of octave |
ee1ae5d1fd88
installer: dont remove file association if is not for installed octave
John D
parents:
4254
diff
changeset
|
449 ReadRegStr \$0 HKCR ".m" "" |
ee1ae5d1fd88
installer: dont remove file association if is not for installed octave
John D
parents:
4254
diff
changeset
|
450 StrCmp \$0 "Octave.Document.$VERSION" 0 not_registered_file |
ee1ae5d1fd88
installer: dont remove file association if is not for installed octave
John D
parents:
4254
diff
changeset
|
451 |
3458
608931797a53
installer: Add .m association to Octave
John Donoghue <john.donoghue@ieee.org>
parents:
3453
diff
changeset
|
452 ReadRegStr \$0 HKCR ".m" "backup_val" |
608931797a53
installer: Add .m association to Octave
John Donoghue <john.donoghue@ieee.org>
parents:
3453
diff
changeset
|
453 IfErrors not_backup_file |
608931797a53
installer: Add .m association to Octave
John Donoghue <john.donoghue@ieee.org>
parents:
3453
diff
changeset
|
454 |
608931797a53
installer: Add .m association to Octave
John Donoghue <john.donoghue@ieee.org>
parents:
3453
diff
changeset
|
455 # retore backup |
608931797a53
installer: Add .m association to Octave
John Donoghue <john.donoghue@ieee.org>
parents:
3453
diff
changeset
|
456 WriteRegStr HKCR ".m" "" "\$0" |
608931797a53
installer: Add .m association to Octave
John Donoghue <john.donoghue@ieee.org>
parents:
3453
diff
changeset
|
457 |
608931797a53
installer: Add .m association to Octave
John Donoghue <john.donoghue@ieee.org>
parents:
3453
diff
changeset
|
458 DeleteRegValue HKCR ".m" "backup_val" |
608931797a53
installer: Add .m association to Octave
John Donoghue <john.donoghue@ieee.org>
parents:
3453
diff
changeset
|
459 |
608931797a53
installer: Add .m association to Octave
John Donoghue <john.donoghue@ieee.org>
parents:
3453
diff
changeset
|
460 ; dont delete .m if just restored backup |
608931797a53
installer: Add .m association to Octave
John Donoghue <john.donoghue@ieee.org>
parents:
3453
diff
changeset
|
461 Goto not_registered_file |
608931797a53
installer: Add .m association to Octave
John Donoghue <john.donoghue@ieee.org>
parents:
3453
diff
changeset
|
462 not_backup_file: |
608931797a53
installer: Add .m association to Octave
John Donoghue <john.donoghue@ieee.org>
parents:
3453
diff
changeset
|
463 DeleteRegKey HKCR ".m" |
608931797a53
installer: Add .m association to Octave
John Donoghue <john.donoghue@ieee.org>
parents:
3453
diff
changeset
|
464 |
608931797a53
installer: Add .m association to Octave
John Donoghue <john.donoghue@ieee.org>
parents:
3453
diff
changeset
|
465 not_registered_file: |
608931797a53
installer: Add .m association to Octave
John Donoghue <john.donoghue@ieee.org>
parents:
3453
diff
changeset
|
466 ; delete file type |
608931797a53
installer: Add .m association to Octave
John Donoghue <john.donoghue@ieee.org>
parents:
3453
diff
changeset
|
467 DeleteRegKey HKCR "Octave.Document.$VERSION" |
608931797a53
installer: Add .m association to Octave
John Donoghue <john.donoghue@ieee.org>
parents:
3453
diff
changeset
|
468 |
3403
f79780bcc843
installer: check destination path later in install (Bug #41069)
John Donoghue <john.donoghue@ieee.org>
parents:
3391
diff
changeset
|
469 DeleteRegKey HKLM "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Octave-$VERSION" |
f79780bcc843
installer: check destination path later in install (Bug #41069)
John Donoghue <john.donoghue@ieee.org>
parents:
3391
diff
changeset
|
470 DeleteRegKey HKLM "Software\\Octave-$VERSION" |
2992
4b450c162e39
Add ability to create simple NSIS installer
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
471 |
4b450c162e39
Add ability to create simple NSIS installer
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
472 ; Remove shortcuts |
4471
1a3deda73484
nsis installer: include version links in startmenu (Bug #51878)
John D
parents:
4458
diff
changeset
|
473 Delete "\$SMPROGRAMS\\GNU Octave $VERSION\\Documentation\\*.*" |
1a3deda73484
nsis installer: include version links in startmenu (Bug #51878)
John D
parents:
4458
diff
changeset
|
474 RMDir "\$SMPROGRAMS\\GNU Octave $VERSION\\Documentation" |
1a3deda73484
nsis installer: include version links in startmenu (Bug #51878)
John D
parents:
4458
diff
changeset
|
475 |
1a3deda73484
nsis installer: include version links in startmenu (Bug #51878)
John D
parents:
4458
diff
changeset
|
476 Delete "\$SMPROGRAMS\\GNU Octave $VERSION\\*.*" |
1a3deda73484
nsis installer: include version links in startmenu (Bug #51878)
John D
parents:
4458
diff
changeset
|
477 RMDir "\$SMPROGRAMS\\GNU Octave $VERSION" |
1a3deda73484
nsis installer: include version links in startmenu (Bug #51878)
John D
parents:
4458
diff
changeset
|
478 |
1a3deda73484
nsis installer: include version links in startmenu (Bug #51878)
John D
parents:
4458
diff
changeset
|
479 ; TODO: only delete if no other version of octave available |
1a3deda73484
nsis installer: include version links in startmenu (Bug #51878)
John D
parents:
4458
diff
changeset
|
480 |
1a3deda73484
nsis installer: include version links in startmenu (Bug #51878)
John D
parents:
4458
diff
changeset
|
481 Push \$R0 |
1a3deda73484
nsis installer: include version links in startmenu (Bug #51878)
John D
parents:
4458
diff
changeset
|
482 Push \$R1 |
1a3deda73484
nsis installer: include version links in startmenu (Bug #51878)
John D
parents:
4458
diff
changeset
|
483 Push \$R2 |
1a3deda73484
nsis installer: include version links in startmenu (Bug #51878)
John D
parents:
4458
diff
changeset
|
484 |
1a3deda73484
nsis installer: include version links in startmenu (Bug #51878)
John D
parents:
4458
diff
changeset
|
485 Call un.GetLatestOctave |
1a3deda73484
nsis installer: include version links in startmenu (Bug #51878)
John D
parents:
4458
diff
changeset
|
486 Pop \$R1 ; Ver |
1a3deda73484
nsis installer: include version links in startmenu (Bug #51878)
John D
parents:
4458
diff
changeset
|
487 |
1a3deda73484
nsis installer: include version links in startmenu (Bug #51878)
John D
parents:
4458
diff
changeset
|
488 ; no installs detected - remove shortcuts |
1a3deda73484
nsis installer: include version links in startmenu (Bug #51878)
John D
parents:
4458
diff
changeset
|
489 StrCmp \$R1 "" remove_desktop_shortcuts |
3367
cfcbe03c9160
installer: Enable documentation build and add to installer.
John Donoghue <john.donoghue@ieee.org>
parents:
3366
diff
changeset
|
490 |
4471
1a3deda73484
nsis installer: include version links in startmenu (Bug #51878)
John D
parents:
4458
diff
changeset
|
491 ; if install detected, get the path and icon |
1a3deda73484
nsis installer: include version links in startmenu (Bug #51878)
John D
parents:
4458
diff
changeset
|
492 ReadRegStr \$R0 HKLM "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Octave-\$R1" "UninstallString" |
1a3deda73484
nsis installer: include version links in startmenu (Bug #51878)
John D
parents:
4458
diff
changeset
|
493 \${GetParent} \$R0 \$R0 |
1a3deda73484
nsis installer: include version links in startmenu (Bug #51878)
John D
parents:
4458
diff
changeset
|
494 |
1a3deda73484
nsis installer: include version links in startmenu (Bug #51878)
John D
parents:
4458
diff
changeset
|
495 ReadRegStr \$R2 HKLM "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Octave-\$R1" "DisplayIcon" |
1a3deda73484
nsis installer: include version links in startmenu (Bug #51878)
John D
parents:
4458
diff
changeset
|
496 |
1a3deda73484
nsis installer: include version links in startmenu (Bug #51878)
John D
parents:
4458
diff
changeset
|
497 IfFileExists "\$desktop\\GNU Octave (CLI).lnk" 0 check_gui_shortcut |
1a3deda73484
nsis installer: include version links in startmenu (Bug #51878)
John D
parents:
4458
diff
changeset
|
498 SetOutPath "%USERPROFILE%" |
4949
1c251625c3cf
* tools/makeinst-script.sh.in: call .vbs files via wscript call (Bug #55635)
John Donoghue
parents:
4845
diff
changeset
|
499 CreateShortCut "\$desktop\\GNU Octave (CLI).lnk" "%SYSTEMROOT%\system32\wscript.exe" "\$\\"\$R0\\octave.vbs\$\\" --no-gui" "\$R2" 0 SW_SHOWMINIMIZED |
2992
4b450c162e39
Add ability to create simple NSIS installer
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
500 |
4471
1a3deda73484
nsis installer: include version links in startmenu (Bug #51878)
John D
parents:
4458
diff
changeset
|
501 check_gui_shortcut: |
1a3deda73484
nsis installer: include version links in startmenu (Bug #51878)
John D
parents:
4458
diff
changeset
|
502 IfFileExists "\$desktop\\GNU Octave (GUI).lnk" 0 done_remove_desktop_shortcuts |
1a3deda73484
nsis installer: include version links in startmenu (Bug #51878)
John D
parents:
4458
diff
changeset
|
503 SetOutPath "%USERPROFILE%" |
5248
9899965a595b
* tools/makeinst-script.sh.in: use --gui not --force-gui
John Donoghue <john.donoghue@ieee.org>
parents:
5168
diff
changeset
|
504 CreateShortCut "\$desktop\\GNU Octave (GUI).lnk" "%SYSTEMROOT%\system32\wscript.exe" "\$\\"\$R0\\octave.vbs\$\\" --gui" "\$R2" 0 SW_SHOWMINIMIZED |
4793
202fa20cf559
add msys2 environment/tools option, use seprate post-install script to finalize install
John Donoghue
parents:
4787
diff
changeset
|
505 nsExec::Exec /TIMEOUT=30000 '"\$INSTDIR\\$OCTAVE_SUBDIR\\bin\\win7appid.exe" "\$desktop\\GNU Octave (GUI).lnk" "gnu.octave.\$R1"' |
202fa20cf559
add msys2 environment/tools option, use seprate post-install script to finalize install
John Donoghue
parents:
4787
diff
changeset
|
506 Pop \$0 |
4471
1a3deda73484
nsis installer: include version links in startmenu (Bug #51878)
John D
parents:
4458
diff
changeset
|
507 |
1a3deda73484
nsis installer: include version links in startmenu (Bug #51878)
John D
parents:
4458
diff
changeset
|
508 GoTo done_remove_desktop_shortcuts |
1a3deda73484
nsis installer: include version links in startmenu (Bug #51878)
John D
parents:
4458
diff
changeset
|
509 |
1a3deda73484
nsis installer: include version links in startmenu (Bug #51878)
John D
parents:
4458
diff
changeset
|
510 remove_desktop_shortcuts: |
1a3deda73484
nsis installer: include version links in startmenu (Bug #51878)
John D
parents:
4458
diff
changeset
|
511 Delete "\$desktop\\GNU Octave (CLI).lnk" |
1a3deda73484
nsis installer: include version links in startmenu (Bug #51878)
John D
parents:
4458
diff
changeset
|
512 Delete "\$desktop\\GNU Octave (GUI).lnk" |
1a3deda73484
nsis installer: include version links in startmenu (Bug #51878)
John D
parents:
4458
diff
changeset
|
513 |
1a3deda73484
nsis installer: include version links in startmenu (Bug #51878)
John D
parents:
4458
diff
changeset
|
514 done_remove_desktop_shortcuts: |
1a3deda73484
nsis installer: include version links in startmenu (Bug #51878)
John D
parents:
4458
diff
changeset
|
515 Pop \$R2 |
1a3deda73484
nsis installer: include version links in startmenu (Bug #51878)
John D
parents:
4458
diff
changeset
|
516 Pop \$R1 |
1a3deda73484
nsis installer: include version links in startmenu (Bug #51878)
John D
parents:
4458
diff
changeset
|
517 Pop \$R0 |
3409
5e77c5fc91ed
qt: build translations in cross build and install
John Donoghue <john.donoghue@ieee.org>
parents:
3406
diff
changeset
|
518 |
5e77c5fc91ed
qt: build translations in cross build and install
John Donoghue <john.donoghue@ieee.org>
parents:
3406
diff
changeset
|
519 ; delete generated qt.conf file |
4793
202fa20cf559
add msys2 environment/tools option, use seprate post-install script to finalize install
John Donoghue
parents:
4787
diff
changeset
|
520 Delete "\$INSTDIR\\$OCTAVE_SUBDIR\\bin\\qt.conf" |
2992
4b450c162e39
Add ability to create simple NSIS installer
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
521 EOF |
4b450c162e39
Add ability to create simple NSIS installer
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
522 |
4b450c162e39
Add ability to create simple NSIS installer
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
523 # insert dir list (backwards order) for uninstall files |
4b450c162e39
Add ability to create simple NSIS installer
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
524 for f in $(find $OCTAVE_SOURCE -depth -type d -printf "%P\n"); do |
4b450c162e39
Add ability to create simple NSIS installer
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
525 winf=`echo $f | sed 's,/,\\\\,g'` |
3431
a7c772aa106f
Move mk-dist script functionality into Makefile.
John W. Eaton <jwe@octave.org>
parents:
3430
diff
changeset
|
526 echo " Delete \"\$INSTDIR\\$winf\\*.*\"" >> $OUTFILE |
a7c772aa106f
Move mk-dist script functionality into Makefile.
John W. Eaton <jwe@octave.org>
parents:
3430
diff
changeset
|
527 echo " RmDir \"\$INSTDIR\\$winf\"" >> $OUTFILE |
2992
4b450c162e39
Add ability to create simple NSIS installer
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
528 done |
4b450c162e39
Add ability to create simple NSIS installer
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
529 |
4b450c162e39
Add ability to create simple NSIS installer
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
530 # last bit of the uninstaller |
3431
a7c772aa106f
Move mk-dist script functionality into Makefile.
John W. Eaton <jwe@octave.org>
parents:
3430
diff
changeset
|
531 cat >> $OUTFILE << EOF |
3409
5e77c5fc91ed
qt: build translations in cross build and install
John Donoghue <john.donoghue@ieee.org>
parents:
3406
diff
changeset
|
532 Delete "\$INSTDIR\\*.*" |
4725
12bfaba26c8d
* tools/makeinst-script.sh.in: clear erros before doing RMDir INSTDIR
John Donoghue
parents:
4658
diff
changeset
|
533 ClearErrors |
2992
4b450c162e39
Add ability to create simple NSIS installer
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
534 RmDir "\$INSTDIR" |
3954
14ad478dc07b
Installer: prompt to unstill additional files (Bug #45188)
John D
parents:
3831
diff
changeset
|
535 |
14ad478dc07b
Installer: prompt to unstill additional files (Bug #45188)
John D
parents:
3831
diff
changeset
|
536 ; didnt remove directory ? most likely from not all files removed |
14ad478dc07b
Installer: prompt to unstill additional files (Bug #45188)
John D
parents:
3831
diff
changeset
|
537 IfErrors 0 uninstall_done |
4385 | 538 MessageBox MB_YESNO "One or more folders were not uninstalled because they contain extra files. Try to delete them?" /SD IDYES IDNO uninstall_done |
3954
14ad478dc07b
Installer: prompt to unstill additional files (Bug #45188)
John D
parents:
3831
diff
changeset
|
539 RMDir /r "\$INSTDIR" |
3956 | 540 |
541 IfErrors 0 uninstall_done | |
4385 | 542 MessageBox MB_YESNO "One of more files were still not uninstalled. Do you want to delete them on the next reboot?" /SD IDYES IDNO uninstall_done |
3956 | 543 RMDir /r /REBOOTOK "\$INSTDIR" |
3954
14ad478dc07b
Installer: prompt to unstill additional files (Bug #45188)
John D
parents:
3831
diff
changeset
|
544 uninstall_done: |
14ad478dc07b
Installer: prompt to unstill additional files (Bug #45188)
John D
parents:
3831
diff
changeset
|
545 |
2992
4b450c162e39
Add ability to create simple NSIS installer
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
546 SectionEnd |
3357
456b6e533054
makeinst-script.sh: Added checking for Java Runtime Environment
Anirudha Bose <ani07nov@gmail.com>
parents:
3356
diff
changeset
|
547 |
4471
1a3deda73484
nsis installer: include version links in startmenu (Bug #51878)
John D
parents:
4458
diff
changeset
|
548 ; function to get latest version of octave installed |
1a3deda73484
nsis installer: include version links in startmenu (Bug #51878)
John D
parents:
4458
diff
changeset
|
549 !macro GET_LATEST_OCTAVE un |
1a3deda73484
nsis installer: include version links in startmenu (Bug #51878)
John D
parents:
4458
diff
changeset
|
550 Function \${un}GetLatestOctave |
1a3deda73484
nsis installer: include version links in startmenu (Bug #51878)
John D
parents:
4458
diff
changeset
|
551 Push \$R0 |
1a3deda73484
nsis installer: include version links in startmenu (Bug #51878)
John D
parents:
4458
diff
changeset
|
552 Push \$R1 |
1a3deda73484
nsis installer: include version links in startmenu (Bug #51878)
John D
parents:
4458
diff
changeset
|
553 Push \$R2 |
1a3deda73484
nsis installer: include version links in startmenu (Bug #51878)
John D
parents:
4458
diff
changeset
|
554 Push \$R3 |
1a3deda73484
nsis installer: include version links in startmenu (Bug #51878)
John D
parents:
4458
diff
changeset
|
555 |
1a3deda73484
nsis installer: include version links in startmenu (Bug #51878)
John D
parents:
4458
diff
changeset
|
556 StrCpy \$R0 "" |
1a3deda73484
nsis installer: include version links in startmenu (Bug #51878)
John D
parents:
4458
diff
changeset
|
557 StrCpy \$R1 0 |
1a3deda73484
nsis installer: include version links in startmenu (Bug #51878)
John D
parents:
4458
diff
changeset
|
558 |
1a3deda73484
nsis installer: include version links in startmenu (Bug #51878)
John D
parents:
4458
diff
changeset
|
559 ; loop through installed programs to find octave installs |
1a3deda73484
nsis installer: include version links in startmenu (Bug #51878)
John D
parents:
4458
diff
changeset
|
560 octave_ver_loop: |
1a3deda73484
nsis installer: include version links in startmenu (Bug #51878)
John D
parents:
4458
diff
changeset
|
561 EnumRegKey \$R2 HKLM "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\" \$R1 |
1a3deda73484
nsis installer: include version links in startmenu (Bug #51878)
John D
parents:
4458
diff
changeset
|
562 StrCmp \$R2 "" latest_octave_done |
1a3deda73484
nsis installer: include version links in startmenu (Bug #51878)
John D
parents:
4458
diff
changeset
|
563 |
1a3deda73484
nsis installer: include version links in startmenu (Bug #51878)
John D
parents:
4458
diff
changeset
|
564 ; len(octave) = 6 |
1a3deda73484
nsis installer: include version links in startmenu (Bug #51878)
John D
parents:
4458
diff
changeset
|
565 StrCpy \$R3 \$R2 6 |
1a3deda73484
nsis installer: include version links in startmenu (Bug #51878)
John D
parents:
4458
diff
changeset
|
566 StrCmp \$R3 "Octave" +1 next_ver_loop |
1a3deda73484
nsis installer: include version links in startmenu (Bug #51878)
John D
parents:
4458
diff
changeset
|
567 |
1a3deda73484
nsis installer: include version links in startmenu (Bug #51878)
John D
parents:
4458
diff
changeset
|
568 ; to verify the install check with the installer exists have uninstaller |
1a3deda73484
nsis installer: include version links in startmenu (Bug #51878)
John D
parents:
4458
diff
changeset
|
569 ReadRegStr \$R3 HKLM "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\\$R2" "UninstallString" |
1a3deda73484
nsis installer: include version links in startmenu (Bug #51878)
John D
parents:
4458
diff
changeset
|
570 ifFileExists \$R3 0 next_ver_loop |
1a3deda73484
nsis installer: include version links in startmenu (Bug #51878)
John D
parents:
4458
diff
changeset
|
571 |
1a3deda73484
nsis installer: include version links in startmenu (Bug #51878)
John D
parents:
4458
diff
changeset
|
572 ; grab version part of octave |
1a3deda73484
nsis installer: include version links in startmenu (Bug #51878)
John D
parents:
4458
diff
changeset
|
573 StrCpy \$R0 \$R2 "" 7 |
1a3deda73484
nsis installer: include version links in startmenu (Bug #51878)
John D
parents:
4458
diff
changeset
|
574 |
1a3deda73484
nsis installer: include version links in startmenu (Bug #51878)
John D
parents:
4458
diff
changeset
|
575 next_ver_loop: |
1a3deda73484
nsis installer: include version links in startmenu (Bug #51878)
John D
parents:
4458
diff
changeset
|
576 IntOp \$R1 \$R1 + 1 |
1a3deda73484
nsis installer: include version links in startmenu (Bug #51878)
John D
parents:
4458
diff
changeset
|
577 GoTo octave_ver_loop |
1a3deda73484
nsis installer: include version links in startmenu (Bug #51878)
John D
parents:
4458
diff
changeset
|
578 |
1a3deda73484
nsis installer: include version links in startmenu (Bug #51878)
John D
parents:
4458
diff
changeset
|
579 latest_octave_done: |
1a3deda73484
nsis installer: include version links in startmenu (Bug #51878)
John D
parents:
4458
diff
changeset
|
580 Pop \$R3 |
1a3deda73484
nsis installer: include version links in startmenu (Bug #51878)
John D
parents:
4458
diff
changeset
|
581 Pop \$R2 |
1a3deda73484
nsis installer: include version links in startmenu (Bug #51878)
John D
parents:
4458
diff
changeset
|
582 Pop \$R1 |
1a3deda73484
nsis installer: include version links in startmenu (Bug #51878)
John D
parents:
4458
diff
changeset
|
583 Exch \$R0 |
1a3deda73484
nsis installer: include version links in startmenu (Bug #51878)
John D
parents:
4458
diff
changeset
|
584 ; stack now has octave version on top |
1a3deda73484
nsis installer: include version links in startmenu (Bug #51878)
John D
parents:
4458
diff
changeset
|
585 FunctionEnd |
1a3deda73484
nsis installer: include version links in startmenu (Bug #51878)
John D
parents:
4458
diff
changeset
|
586 !macroend |
1a3deda73484
nsis installer: include version links in startmenu (Bug #51878)
John D
parents:
4458
diff
changeset
|
587 |
1a3deda73484
nsis installer: include version links in startmenu (Bug #51878)
John D
parents:
4458
diff
changeset
|
588 !insertmacro GET_LATEST_OCTAVE "" |
1a3deda73484
nsis installer: include version links in startmenu (Bug #51878)
John D
parents:
4458
diff
changeset
|
589 !insertmacro GET_LATEST_OCTAVE "un." |
1a3deda73484
nsis installer: include version links in startmenu (Bug #51878)
John D
parents:
4458
diff
changeset
|
590 |
3362
0f2a5e218359
makeinst-script.sh: Added checking of Windows version
Anirudha Bose <ani07nov@gmail.com>
parents:
3361
diff
changeset
|
591 ; Function to detect Windows version and abort if Octave is unsupported in the current platform |
4120
f2d7bb7777da
installer: dont warn on experimental for win10 (Bug #47576)
John Donoghue
parents:
4075
diff
changeset
|
592 Function CheckWinVer |
3362
0f2a5e218359
makeinst-script.sh: Added checking of Windows version
Anirudha Bose <ani07nov@gmail.com>
parents:
3361
diff
changeset
|
593 Push \$0 |
0f2a5e218359
makeinst-script.sh: Added checking of Windows version
Anirudha Bose <ani07nov@gmail.com>
parents:
3361
diff
changeset
|
594 Push \$1 |
3552
b82ff8ba6a8a
nsis-installer: check for win8 version and set -i --line-editing in shortcuts
John Donoghue <john.donoghue@ieee.org>
parents:
3545
diff
changeset
|
595 |
4387
05b44661c970
nsis-installer: Check new reg values for Win10 (Bug #50552)
John D
parents:
4385
diff
changeset
|
596 ; try read new way of getting version |
05b44661c970
nsis-installer: Check new reg values for Win10 (Bug #50552)
John D
parents:
4385
diff
changeset
|
597 ReadRegStr \$0 HKLM "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion" CurrentMajorVersionNumber |
05b44661c970
nsis-installer: Check new reg values for Win10 (Bug #50552)
John D
parents:
4385
diff
changeset
|
598 ; since is DWORD reg value, error will be set, however will be "" if no value read |
05b44661c970
nsis-installer: Check new reg values for Win10 (Bug #50552)
John D
parents:
4385
diff
changeset
|
599 StrCmp \$0 "" is_less_than_win10 |
05b44661c970
nsis-installer: Check new reg values for Win10 (Bug #50552)
John D
parents:
4385
diff
changeset
|
600 ReadRegStr \$1 HKLM "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion" CurrentMinorVersionNumber |
05b44661c970
nsis-installer: Check new reg values for Win10 (Bug #50552)
John D
parents:
4385
diff
changeset
|
601 StrCmp \$1 "" is_less_than_win10 |
05b44661c970
nsis-installer: Check new reg values for Win10 (Bug #50552)
John D
parents:
4385
diff
changeset
|
602 |
05b44661c970
nsis-installer: Check new reg values for Win10 (Bug #50552)
John D
parents:
4385
diff
changeset
|
603 StrCpy \$0 "\$0.\$1" |
05b44661c970
nsis-installer: Check new reg values for Win10 (Bug #50552)
John D
parents:
4385
diff
changeset
|
604 Goto is_winnt |
05b44661c970
nsis-installer: Check new reg values for Win10 (Bug #50552)
John D
parents:
4385
diff
changeset
|
605 |
05b44661c970
nsis-installer: Check new reg values for Win10 (Bug #50552)
John D
parents:
4385
diff
changeset
|
606 is_less_than_win10: |
05b44661c970
nsis-installer: Check new reg values for Win10 (Bug #50552)
John D
parents:
4385
diff
changeset
|
607 ClearErrors |
3403
f79780bcc843
installer: check destination path later in install (Bug #41069)
John Donoghue <john.donoghue@ieee.org>
parents:
3391
diff
changeset
|
608 ReadRegStr \$0 HKLM "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion" CurrentVersion |
3362
0f2a5e218359
makeinst-script.sh: Added checking of Windows version
Anirudha Bose <ani07nov@gmail.com>
parents:
3361
diff
changeset
|
609 IfErrors is_error is_winnt |
4387
05b44661c970
nsis-installer: Check new reg values for Win10 (Bug #50552)
John D
parents:
4385
diff
changeset
|
610 |
3362
0f2a5e218359
makeinst-script.sh: Added checking of Windows version
Anirudha Bose <ani07nov@gmail.com>
parents:
3361
diff
changeset
|
611 is_winnt: |
0f2a5e218359
makeinst-script.sh: Added checking of Windows version
Anirudha Bose <ani07nov@gmail.com>
parents:
3361
diff
changeset
|
612 StrCpy \$1 \$0 1 |
0f2a5e218359
makeinst-script.sh: Added checking of Windows version
Anirudha Bose <ani07nov@gmail.com>
parents:
3361
diff
changeset
|
613 StrCmp \$1 4 is_error ; Aborting installation for Windows versions older than Windows 2000 |
3364
4812bade5c85
makeinst-script.sh: Remove Windows 2000 as supported Windows version
Anirudha Bose <ani07nov@gmail.com>
parents:
3363
diff
changeset
|
614 StrCmp \$0 "5.0" is_error ; Removing Windows 2000 as supported Windows version |
3362
0f2a5e218359
makeinst-script.sh: Added checking of Windows version
Anirudha Bose <ani07nov@gmail.com>
parents:
3361
diff
changeset
|
615 StrCmp \$0 "5.1" is_winnt_XP |
0f2a5e218359
makeinst-script.sh: Added checking of Windows version
Anirudha Bose <ani07nov@gmail.com>
parents:
3361
diff
changeset
|
616 StrCmp \$0 "5.2" is_winnt_2003 |
0f2a5e218359
makeinst-script.sh: Added checking of Windows version
Anirudha Bose <ani07nov@gmail.com>
parents:
3361
diff
changeset
|
617 StrCmp \$0 "6.0" is_winnt_vista |
0f2a5e218359
makeinst-script.sh: Added checking of Windows version
Anirudha Bose <ani07nov@gmail.com>
parents:
3361
diff
changeset
|
618 StrCmp \$0 "6.1" is_winnt_7 |
0f2a5e218359
makeinst-script.sh: Added checking of Windows version
Anirudha Bose <ani07nov@gmail.com>
parents:
3361
diff
changeset
|
619 StrCmp \$0 "6.2" is_winnt_8 |
4387
05b44661c970
nsis-installer: Check new reg values for Win10 (Bug #50552)
John D
parents:
4385
diff
changeset
|
620 StrCmp \$0 "6.3" is_winnt_8 ; win 8.1 |
05b44661c970
nsis-installer: Check new reg values for Win10 (Bug #50552)
John D
parents:
4385
diff
changeset
|
621 StrCmp \$0 "10.0" is_winnt_10 |
4120
f2d7bb7777da
installer: dont warn on experimental for win10 (Bug #47576)
John Donoghue
parents:
4075
diff
changeset
|
622 StrCmp \$1 6 is_winnt_10 ; Checking for future versions of Windows 10+ |
4387
05b44661c970
nsis-installer: Check new reg values for Win10 (Bug #50552)
John D
parents:
4385
diff
changeset
|
623 StrCmp \$1 1 is_winnt_10 ; Checking for future versions of Windows 10+ |
3362
0f2a5e218359
makeinst-script.sh: Added checking of Windows version
Anirudha Bose <ani07nov@gmail.com>
parents:
3361
diff
changeset
|
624 Goto is_error |
0f2a5e218359
makeinst-script.sh: Added checking of Windows version
Anirudha Bose <ani07nov@gmail.com>
parents:
3361
diff
changeset
|
625 |
0f2a5e218359
makeinst-script.sh: Added checking of Windows version
Anirudha Bose <ani07nov@gmail.com>
parents:
3361
diff
changeset
|
626 is_winnt_XP: |
0f2a5e218359
makeinst-script.sh: Added checking of Windows version
Anirudha Bose <ani07nov@gmail.com>
parents:
3361
diff
changeset
|
627 is_winnt_2003: |
0f2a5e218359
makeinst-script.sh: Added checking of Windows version
Anirudha Bose <ani07nov@gmail.com>
parents:
3361
diff
changeset
|
628 is_winnt_vista: |
0f2a5e218359
makeinst-script.sh: Added checking of Windows version
Anirudha Bose <ani07nov@gmail.com>
parents:
3361
diff
changeset
|
629 is_winnt_7: |
4120
f2d7bb7777da
installer: dont warn on experimental for win10 (Bug #47576)
John Donoghue
parents:
4075
diff
changeset
|
630 is_winnt_8: |
4787
68deb4d4d928
nsis-installer: eliminate windows 10 warning
John W. Eaton <jwe@octave.org>
parents:
4786
diff
changeset
|
631 is_winnt_10: |
3362
0f2a5e218359
makeinst-script.sh: Added checking of Windows version
Anirudha Bose <ani07nov@gmail.com>
parents:
3361
diff
changeset
|
632 Goto done |
0f2a5e218359
makeinst-script.sh: Added checking of Windows version
Anirudha Bose <ani07nov@gmail.com>
parents:
3361
diff
changeset
|
633 is_error: |
0f2a5e218359
makeinst-script.sh: Added checking of Windows version
Anirudha Bose <ani07nov@gmail.com>
parents:
3361
diff
changeset
|
634 StrCpy \$1 \$0 |
4387
05b44661c970
nsis-installer: Check new reg values for Win10 (Bug #50552)
John D
parents:
4385
diff
changeset
|
635 ClearErrors |
3367
cfcbe03c9160
installer: Enable documentation build and add to installer.
John Donoghue <john.donoghue@ieee.org>
parents:
3366
diff
changeset
|
636 ReadRegStr \$0 HKLM "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion" ProductName |
3362
0f2a5e218359
makeinst-script.sh: Added checking of Windows version
Anirudha Bose <ani07nov@gmail.com>
parents:
3361
diff
changeset
|
637 IfErrors 0 +4 |
3367
cfcbe03c9160
installer: Enable documentation build and add to installer.
John Donoghue <john.donoghue@ieee.org>
parents:
3366
diff
changeset
|
638 ReadRegStr \$0 HKLM "SOFTWARE\\Microsoft\\Windows\\CurrentVersion" Version |
3362
0f2a5e218359
makeinst-script.sh: Added checking of Windows version
Anirudha Bose <ani07nov@gmail.com>
parents:
3361
diff
changeset
|
639 IfErrors 0 +2 |
0f2a5e218359
makeinst-script.sh: Added checking of Windows version
Anirudha Bose <ani07nov@gmail.com>
parents:
3361
diff
changeset
|
640 StrCpy \$0 "Unknown" |
0f2a5e218359
makeinst-script.sh: Added checking of Windows version
Anirudha Bose <ani07nov@gmail.com>
parents:
3361
diff
changeset
|
641 MessageBox MB_ICONSTOP|MB_OK "This version of Octave cannot be installed on this system. Octave is supported only on Windows NT systems. Current system: \$0 (version: \$1)" |
0f2a5e218359
makeinst-script.sh: Added checking of Windows version
Anirudha Bose <ani07nov@gmail.com>
parents:
3361
diff
changeset
|
642 Abort |
0f2a5e218359
makeinst-script.sh: Added checking of Windows version
Anirudha Bose <ani07nov@gmail.com>
parents:
3361
diff
changeset
|
643 done: |
0f2a5e218359
makeinst-script.sh: Added checking of Windows version
Anirudha Bose <ani07nov@gmail.com>
parents:
3361
diff
changeset
|
644 Pop \$1 |
0f2a5e218359
makeinst-script.sh: Added checking of Windows version
Anirudha Bose <ani07nov@gmail.com>
parents:
3361
diff
changeset
|
645 Pop \$0 |
0f2a5e218359
makeinst-script.sh: Added checking of Windows version
Anirudha Bose <ani07nov@gmail.com>
parents:
3361
diff
changeset
|
646 FunctionEnd |
0f2a5e218359
makeinst-script.sh: Added checking of Windows version
Anirudha Bose <ani07nov@gmail.com>
parents:
3361
diff
changeset
|
647 |
3403
f79780bcc843
installer: check destination path later in install (Bug #41069)
John Donoghue <john.donoghue@ieee.org>
parents:
3391
diff
changeset
|
648 ; Function to check whether already installed this version |
f79780bcc843
installer: check destination path later in install (Bug #41069)
John Donoghue <john.donoghue@ieee.org>
parents:
3391
diff
changeset
|
649 Function CheckCurrVersion |
3358
8708b7d07795
makeinst-script.sh: Added checking for previous installation of Octave
Anirudha Bose <ani07nov@gmail.com>
parents:
3357
diff
changeset
|
650 Push \$0 |
3403
f79780bcc843
installer: check destination path later in install (Bug #41069)
John Donoghue <john.donoghue@ieee.org>
parents:
3391
diff
changeset
|
651 ClearErrors |
f79780bcc843
installer: check destination path later in install (Bug #41069)
John Donoghue <john.donoghue@ieee.org>
parents:
3391
diff
changeset
|
652 ReadRegStr \$0 HKLM "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Octave-$VERSION" "DisplayName" |
f79780bcc843
installer: check destination path later in install (Bug #41069)
John Donoghue <john.donoghue@ieee.org>
parents:
3391
diff
changeset
|
653 IfErrors curr_check_ok |
3358
8708b7d07795
makeinst-script.sh: Added checking for previous installation of Octave
Anirudha Bose <ani07nov@gmail.com>
parents:
3357
diff
changeset
|
654 MessageBox MB_OK|MB_ICONSTOP "Another Octave installation (with the same version) has been detected. Please uninstall it first." |
8708b7d07795
makeinst-script.sh: Added checking for previous installation of Octave
Anirudha Bose <ani07nov@gmail.com>
parents:
3357
diff
changeset
|
655 Abort |
3403
f79780bcc843
installer: check destination path later in install (Bug #41069)
John Donoghue <john.donoghue@ieee.org>
parents:
3391
diff
changeset
|
656 curr_check_ok: |
4124
5ae69991eaa1
installer: detect win64/win32 java depending on octave 32/64 (Bug #47606)
John Donoghue
parents:
4121
diff
changeset
|
657 pop \$0 |
3358
8708b7d07795
makeinst-script.sh: Added checking for previous installation of Octave
Anirudha Bose <ani07nov@gmail.com>
parents:
3357
diff
changeset
|
658 FunctionEnd |
8708b7d07795
makeinst-script.sh: Added checking for previous installation of Octave
Anirudha Bose <ani07nov@gmail.com>
parents:
3357
diff
changeset
|
659 |
5168
e640a2d2ede0
* tools/makeinst-script.sh.in: update dest folder check to include check of characters that cause issues (Bug #49718)
John Donoghue
parents:
5135
diff
changeset
|
660 ; Check whether prev install is here and no spaces or special chars in dest name |
3728
8c11c5a1a939
Prevent octave install to path with spaces
John Donoghue <john.donoghue@ieee.org>
parents:
3717
diff
changeset
|
661 Function CheckPrevInstallAndDest |
4793
202fa20cf559
add msys2 environment/tools option, use seprate post-install script to finalize install
John Donoghue
parents:
4787
diff
changeset
|
662 IfFileExists "\$INSTDIR\\bin\\octave-cli.exe" inst_exists 0 |
202fa20cf559
add msys2 environment/tools option, use seprate post-install script to finalize install
John Donoghue
parents:
4787
diff
changeset
|
663 IfFileExists "\$INSTDIR\\$OCTAVE_SUBDIR\\bin\\octave-cli.exe" inst_exists inst_none |
3403
f79780bcc843
installer: check destination path later in install (Bug #41069)
John Donoghue <john.donoghue@ieee.org>
parents:
3391
diff
changeset
|
664 inst_exists: |
4385 | 665 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 |
3403
f79780bcc843
installer: check destination path later in install (Bug #41069)
John Donoghue <john.donoghue@ieee.org>
parents:
3391
diff
changeset
|
666 Abort |
3728
8c11c5a1a939
Prevent octave install to path with spaces
John Donoghue <john.donoghue@ieee.org>
parents:
3717
diff
changeset
|
667 GoTo inst_end |
3403
f79780bcc843
installer: check destination path later in install (Bug #41069)
John Donoghue <john.donoghue@ieee.org>
parents:
3391
diff
changeset
|
668 inst_none: |
3728
8c11c5a1a939
Prevent octave install to path with spaces
John Donoghue <john.donoghue@ieee.org>
parents:
3717
diff
changeset
|
669 |
5168
e640a2d2ede0
* tools/makeinst-script.sh.in: update dest folder check to include check of characters that cause issues (Bug #49718)
John Donoghue
parents:
5135
diff
changeset
|
670 ; check for spaces or spcial chars in dest filename |
3728
8c11c5a1a939
Prevent octave install to path with spaces
John Donoghue <john.donoghue@ieee.org>
parents:
3717
diff
changeset
|
671 Push \$R0 |
8c11c5a1a939
Prevent octave install to path with spaces
John Donoghue <john.donoghue@ieee.org>
parents:
3717
diff
changeset
|
672 Push \$R1 |
8c11c5a1a939
Prevent octave install to path with spaces
John Donoghue <john.donoghue@ieee.org>
parents:
3717
diff
changeset
|
673 |
8c11c5a1a939
Prevent octave install to path with spaces
John Donoghue <john.donoghue@ieee.org>
parents:
3717
diff
changeset
|
674 StrCpy \$R1 0 # r1 = counter |
8c11c5a1a939
Prevent octave install to path with spaces
John Donoghue <john.donoghue@ieee.org>
parents:
3717
diff
changeset
|
675 space_loop: |
8c11c5a1a939
Prevent octave install to path with spaces
John Donoghue <john.donoghue@ieee.org>
parents:
3717
diff
changeset
|
676 StrCpy \$R0 \$INSTDIR 1 \$R1 # R0 = character in string to check |
8c11c5a1a939
Prevent octave install to path with spaces
John Donoghue <john.donoghue@ieee.org>
parents:
3717
diff
changeset
|
677 StrCmp \$R0 "" space_end # end of string |
8c11c5a1a939
Prevent octave install to path with spaces
John Donoghue <john.donoghue@ieee.org>
parents:
3717
diff
changeset
|
678 StrCmp \$R0 " " space_found |
5168
e640a2d2ede0
* tools/makeinst-script.sh.in: update dest folder check to include check of characters that cause issues (Bug #49718)
John Donoghue
parents:
5135
diff
changeset
|
679 StrCmp \$R0 "(" space_found |
e640a2d2ede0
* tools/makeinst-script.sh.in: update dest folder check to include check of characters that cause issues (Bug #49718)
John Donoghue
parents:
5135
diff
changeset
|
680 StrCmp \$R0 ")" space_found |
e640a2d2ede0
* tools/makeinst-script.sh.in: update dest folder check to include check of characters that cause issues (Bug #49718)
John Donoghue
parents:
5135
diff
changeset
|
681 StrCmp \$R0 "&" space_found |
e640a2d2ede0
* tools/makeinst-script.sh.in: update dest folder check to include check of characters that cause issues (Bug #49718)
John Donoghue
parents:
5135
diff
changeset
|
682 StrCmp \$R0 "%" space_found |
e640a2d2ede0
* tools/makeinst-script.sh.in: update dest folder check to include check of characters that cause issues (Bug #49718)
John Donoghue
parents:
5135
diff
changeset
|
683 StrCmp \$R0 "^" space_found |
3728
8c11c5a1a939
Prevent octave install to path with spaces
John Donoghue <john.donoghue@ieee.org>
parents:
3717
diff
changeset
|
684 IntOp \$R1 \$R1 + 1 |
8c11c5a1a939
Prevent octave install to path with spaces
John Donoghue <john.donoghue@ieee.org>
parents:
3717
diff
changeset
|
685 GoTo space_loop |
8c11c5a1a939
Prevent octave install to path with spaces
John Donoghue <john.donoghue@ieee.org>
parents:
3717
diff
changeset
|
686 space_found: |
5168
e640a2d2ede0
* tools/makeinst-script.sh.in: update dest folder check to include check of characters that cause issues (Bug #49718)
John Donoghue
parents:
5135
diff
changeset
|
687 MessageBox MB_OK|MB_ICONEXCLAMATION "Octave should not be installed to a destination folder containing &%()^ or spaces. Please select another destination." |
3728
8c11c5a1a939
Prevent octave install to path with spaces
John Donoghue <john.donoghue@ieee.org>
parents:
3717
diff
changeset
|
688 Abort |
8c11c5a1a939
Prevent octave install to path with spaces
John Donoghue <john.donoghue@ieee.org>
parents:
3717
diff
changeset
|
689 space_end: |
8c11c5a1a939
Prevent octave install to path with spaces
John Donoghue <john.donoghue@ieee.org>
parents:
3717
diff
changeset
|
690 Pop \$R1 |
8c11c5a1a939
Prevent octave install to path with spaces
John Donoghue <john.donoghue@ieee.org>
parents:
3717
diff
changeset
|
691 Pop \$R0 |
8c11c5a1a939
Prevent octave install to path with spaces
John Donoghue <john.donoghue@ieee.org>
parents:
3717
diff
changeset
|
692 |
8c11c5a1a939
Prevent octave install to path with spaces
John Donoghue <john.donoghue@ieee.org>
parents:
3717
diff
changeset
|
693 inst_end: |
8c11c5a1a939
Prevent octave install to path with spaces
John Donoghue <john.donoghue@ieee.org>
parents:
3717
diff
changeset
|
694 |
3403
f79780bcc843
installer: check destination path later in install (Bug #41069)
John Donoghue <john.donoghue@ieee.org>
parents:
3391
diff
changeset
|
695 FunctionEnd |
f79780bcc843
installer: check destination path later in install (Bug #41069)
John Donoghue <john.donoghue@ieee.org>
parents:
3391
diff
changeset
|
696 |
3357
456b6e533054
makeinst-script.sh: Added checking for Java Runtime Environment
Anirudha Bose <ani07nov@gmail.com>
parents:
3356
diff
changeset
|
697 ; Function to check Java Runtime Environment |
3358
8708b7d07795
makeinst-script.sh: Added checking for previous installation of Octave
Anirudha Bose <ani07nov@gmail.com>
parents:
3357
diff
changeset
|
698 Function CheckJRE |
3357
456b6e533054
makeinst-script.sh: Added checking for Java Runtime Environment
Anirudha Bose <ani07nov@gmail.com>
parents:
3356
diff
changeset
|
699 ; looks in: |
3359
40ae138b38a6
Removed checking of JRE locally
Anirudha Bose <ani07nov@gmail.com>
parents:
3358
diff
changeset
|
700 ; 1 - JAVA_HOME environment variable |
40ae138b38a6
Removed checking of JRE locally
Anirudha Bose <ani07nov@gmail.com>
parents:
3358
diff
changeset
|
701 ; 2 - the registry |
4124
5ae69991eaa1
installer: detect win64/win32 java depending on octave 32/64 (Bug #47606)
John Donoghue
parents:
4121
diff
changeset
|
702 EOF |
5ae69991eaa1
installer: detect win64/win32 java depending on octave 32/64 (Bug #47606)
John Donoghue
parents:
4121
diff
changeset
|
703 cat >> $OUTFILE << EOF |
3357
456b6e533054
makeinst-script.sh: Added checking for Java Runtime Environment
Anirudha Bose <ani07nov@gmail.com>
parents:
3356
diff
changeset
|
704 |
456b6e533054
makeinst-script.sh: Added checking for Java Runtime Environment
Anirudha Bose <ani07nov@gmail.com>
parents:
3356
diff
changeset
|
705 Push \$R0 |
456b6e533054
makeinst-script.sh: Added checking for Java Runtime Environment
Anirudha Bose <ani07nov@gmail.com>
parents:
3356
diff
changeset
|
706 Push \$R1 |
456b6e533054
makeinst-script.sh: Added checking for Java Runtime Environment
Anirudha Bose <ani07nov@gmail.com>
parents:
3356
diff
changeset
|
707 |
4648
982484a78b75
nsis-installer: check for java using same tests of octave uses (Bug #53572)
John Donoghue
parents:
4613
diff
changeset
|
708 # get the version |
982484a78b75
nsis-installer: check for java using same tests of octave uses (Bug #53572)
John Donoghue
parents:
4613
diff
changeset
|
709 ClearErrors |
982484a78b75
nsis-installer: check for java using same tests of octave uses (Bug #53572)
John Donoghue
parents:
4613
diff
changeset
|
710 ReadEnvStr \$R1 "JAVA_VERSION" |
982484a78b75
nsis-installer: check for java using same tests of octave uses (Bug #53572)
John Donoghue
parents:
4613
diff
changeset
|
711 StrCmp \$R1 "" 0 have_java_version |
3357
456b6e533054
makeinst-script.sh: Added checking for Java Runtime Environment
Anirudha Bose <ani07nov@gmail.com>
parents:
3356
diff
changeset
|
712 ClearErrors |
4648
982484a78b75
nsis-installer: check for java using same tests of octave uses (Bug #53572)
John Donoghue
parents:
4613
diff
changeset
|
713 ReadRegStr \$R1 HKLM "SOFTWARE\\JavaSoft\\JRE" "CurrentVersion" |
982484a78b75
nsis-installer: check for java using same tests of octave uses (Bug #53572)
John Donoghue
parents:
4613
diff
changeset
|
714 IfErrors 0 have_java_version |
3367
cfcbe03c9160
installer: Enable documentation build and add to installer.
John Donoghue <john.donoghue@ieee.org>
parents:
3366
diff
changeset
|
715 ReadRegStr \$R1 HKLM "SOFTWARE\\JavaSoft\\Java Runtime Environment" "CurrentVersion" |
4648
982484a78b75
nsis-installer: check for java using same tests of octave uses (Bug #53572)
John Donoghue
parents:
4613
diff
changeset
|
716 IfErrors JRE_Error have_java_version |
3357
456b6e533054
makeinst-script.sh: Added checking for Java Runtime Environment
Anirudha Bose <ani07nov@gmail.com>
parents:
3356
diff
changeset
|
717 |
4648
982484a78b75
nsis-installer: check for java using same tests of octave uses (Bug #53572)
John Donoghue
parents:
4613
diff
changeset
|
718 have_java_version: |
982484a78b75
nsis-installer: check for java using same tests of octave uses (Bug #53572)
John Donoghue
parents:
4613
diff
changeset
|
719 ClearErrors |
982484a78b75
nsis-installer: check for java using same tests of octave uses (Bug #53572)
John Donoghue
parents:
4613
diff
changeset
|
720 ReadRegStr \$R0 HKLM "SOFTWARE\\JavaSoft\\JRE\\\$R1" "RuntimeLib" |
982484a78b75
nsis-installer: check for java using same tests of octave uses (Bug #53572)
John Donoghue
parents:
4613
diff
changeset
|
721 IfErrors 0 have_java_runtime |
982484a78b75
nsis-installer: check for java using same tests of octave uses (Bug #53572)
John Donoghue
parents:
4613
diff
changeset
|
722 ReadRegStr \$R0 HKLM "SOFTWARE\\JavaSoft\\Java Runtime Environment\\\$R1" "RuntimeLib" |
982484a78b75
nsis-installer: check for java using same tests of octave uses (Bug #53572)
John Donoghue
parents:
4613
diff
changeset
|
723 IfErrors JRE_Error have_java_runtime |
982484a78b75
nsis-installer: check for java using same tests of octave uses (Bug #53572)
John Donoghue
parents:
4613
diff
changeset
|
724 |
982484a78b75
nsis-installer: check for java using same tests of octave uses (Bug #53572)
John Donoghue
parents:
4613
diff
changeset
|
725 have_java_runtime: |
982484a78b75
nsis-installer: check for java using same tests of octave uses (Bug #53572)
John Donoghue
parents:
4613
diff
changeset
|
726 # have runtime in R0 - check actual file is there |
982484a78b75
nsis-installer: check for java using same tests of octave uses (Bug #53572)
John Donoghue
parents:
4613
diff
changeset
|
727 StrCmp \$R0 "" JRE_Error 0 |
982484a78b75
nsis-installer: check for java using same tests of octave uses (Bug #53572)
John Donoghue
parents:
4613
diff
changeset
|
728 ClearErrors |
982484a78b75
nsis-installer: check for java using same tests of octave uses (Bug #53572)
John Donoghue
parents:
4613
diff
changeset
|
729 IfFileExists \$R0 continue JRE_Error |
3357
456b6e533054
makeinst-script.sh: Added checking for Java Runtime Environment
Anirudha Bose <ani07nov@gmail.com>
parents:
3356
diff
changeset
|
730 |
456b6e533054
makeinst-script.sh: Added checking for Java Runtime Environment
Anirudha Bose <ani07nov@gmail.com>
parents:
3356
diff
changeset
|
731 JRE_Error: |
4385 | 732 MessageBox MB_ICONEXCLAMATION|MB_YESNO "Octave has the capability to call Java libraries, but the installer was unable to find a Java Runtime Environment (JRE) on this system. Octave will still function without a JRE, only certain specific functions will be disabled. If a JRE is installed later, Octave should be able to detect and use it automatically. Continue with installation?" /SD IDYES IDYES continue |
3357
456b6e533054
makeinst-script.sh: Added checking for Java Runtime Environment
Anirudha Bose <ani07nov@gmail.com>
parents:
3356
diff
changeset
|
733 Abort |
456b6e533054
makeinst-script.sh: Added checking for Java Runtime Environment
Anirudha Bose <ani07nov@gmail.com>
parents:
3356
diff
changeset
|
734 continue: |
3403
f79780bcc843
installer: check destination path later in install (Bug #41069)
John Donoghue <john.donoghue@ieee.org>
parents:
3391
diff
changeset
|
735 Pop \$R1 |
f79780bcc843
installer: check destination path later in install (Bug #41069)
John Donoghue <john.donoghue@ieee.org>
parents:
3391
diff
changeset
|
736 Pop \$R0 |
4124
5ae69991eaa1
installer: detect win64/win32 java depending on octave 32/64 (Bug #47606)
John Donoghue
parents:
4121
diff
changeset
|
737 EOF |
5ae69991eaa1
installer: detect win64/win32 java depending on octave 32/64 (Bug #47606)
John Donoghue
parents:
4121
diff
changeset
|
738 cat >> $OUTFILE << EOF |
5ae69991eaa1
installer: detect win64/win32 java depending on octave 32/64 (Bug #47606)
John Donoghue
parents:
4121
diff
changeset
|
739 |
3357
456b6e533054
makeinst-script.sh: Added checking for Java Runtime Environment
Anirudha Bose <ani07nov@gmail.com>
parents:
3356
diff
changeset
|
740 FunctionEnd |
2992
4b450c162e39
Add ability to create simple NSIS installer
John Donoghue <john.donoghue@ieee.org>
parents:
diff
changeset
|
741 EOF |