Mercurial > mxe-octave

comparison makeinst-script.sh @ 3423:c8e055d83b9f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Set start directory to user home (Bug #41220) * makeinst-script.sh: set outpath to USERPROFILE, use octave-gui and octave-cli for shortcuts, install qt.conf to bin folder. * src/octave.mk: copy libexec/octave-gui.exe to bin folder. * src/stable-octave.mk: copy libexec/octave-gui.exe to bin folder.
author John D <john.donoghue@ieee.org>
date Tue, 14 Jan 2014 21:30:29 +0000
parents 2a0e9378056c
children 2183ac663bcb
comparison
equal deleted inserted replaced
3422:2a0e9378056c 3423:c8e055d83b9f
91 91
92 !insertmacro MUI_PAGE_INSTFILES 92 !insertmacro MUI_PAGE_INSTFILES
93 93
94 ; set up checkbox to create desktop icon 94 ; set up checkbox to create desktop icon
95 Function finishpage_desktopshortcut 95 Function finishpage_desktopshortcut
96 SetOutPath "\$INSTDIR\\bin" 96 SetOutPath "%USERPROFILE%"
97 CreateShortCut "\$desktop\\Octave-$VERSION (Command Line).lnk" "\$INSTDIR\\bin\\octave.exe" "" "\$INSTDIR\\$ICON" 0 97 CreateShortCut "\$desktop\\Octave-$VERSION (Command Line).lnk" "\$INSTDIR\\bin\\octave-cli.exe" "" "\$INSTDIR\\$ICON" 0
98 CreateShortCut "\$desktop\\Octave-$VERSION (Experimental GUI).lnk" "\$INSTDIR\\libexec\\octave\\$OCTAVE_VERSION\\exec\\i686-pc-mingw32\\octave-gui.exe" "" "\$INSTDIR\\$ICON" 0 98 CreateShortCut "\$desktop\\Octave-$VERSION (Experimental GUI).lnk" "\$INSTDIR\\bin\\octave-gui.exe" "" "\$INSTDIR\\$ICON" 0
99 FunctionEnd 99 FunctionEnd
100 100
101 !define MUI_FINISHPAGE_SHOWREADME "" 101 !define MUI_FINISHPAGE_SHOWREADME ""
102 !define MUI_FINISHPAGE_SHOWREADME_CHECKED 102 !define MUI_FINISHPAGE_SHOWREADME_CHECKED
103 !define MUI_FINISHPAGE_SHOWREADME_TEXT "Create Desktop Shortcut" 103 !define MUI_FINISHPAGE_SHOWREADME_TEXT "Create Desktop Shortcut"
142 cat >> octave.nsi << EOF 142 cat >> octave.nsi << EOF
143 143
144 ; add qt.conf 144 ; add qt.conf
145 Push \$0 145 Push \$0
146 \${StrRep} '\$0' '\$INSTDIR' '\\' '/' 146 \${StrRep} '\$0' '\$INSTDIR' '\\' '/'
147 WriteINIStr "\$INSTDIR\\libexec\\octave\\$OCTAVE_VERSION\\exec\\i686-pc-mingw32\\qt.conf" "Paths" "Prefix" "\$0" 147 WriteINIStr "\$INSTDIR\\bin\\qt.conf" "Paths" "Prefix" "\$0"
148 WriteINIStr "\$INSTDIR\\libexec\\octave\\$OCTAVE_VERSION\\exec\\i686-pc-mingw32\\qt.conf" "Paths" "Translations" "translations" 148 WriteINIStr "\$INSTDIR\\bin\\qt.conf" "Paths" "Translations" "translations"
149 Pop \$0 149 Pop \$0
150 SectionEnd 150 SectionEnd
151 151
152 Section make_uninstaller 152 Section make_uninstaller
153 ; Write the uninstall keys for Windows 153 ; Write the uninstall keys for Windows
163 ; start menu (currently hardcoded) 163 ; start menu (currently hardcoded)
164 Section "Shortcuts" 164 Section "Shortcuts"
165 165
166 CreateDirectory "\$SMPROGRAMS\\Octave-$VERSION" 166 CreateDirectory "\$SMPROGRAMS\\Octave-$VERSION"
167 CreateShortCut "\$SMPROGRAMS\\Octave-$VERSION\\Uninstall.lnk" "\$INSTDIR\\uninstall.exe" "" "\$INSTDIR\\uninstall.exe" 0 167 CreateShortCut "\$SMPROGRAMS\\Octave-$VERSION\\Uninstall.lnk" "\$INSTDIR\\uninstall.exe" "" "\$INSTDIR\\uninstall.exe" 0
168 SetOutPath "\$INSTDIR\\bin" 168 SetOutPath "%USERPROFILE%"
169 CreateShortCut "\$SMPROGRAMS\\Octave-$VERSION\\Octave (Command Line).lnk" "\$INSTDIR\\bin\\octave.exe" "" "\$INSTDIR\\$ICON" 0 169 CreateShortCut "\$SMPROGRAMS\\Octave-$VERSION\\Octave (Command Line).lnk" "\$INSTDIR\\bin\\octave-cli.exe" "" "\$INSTDIR\\$ICON" 0
170 CreateShortCut "\$SMPROGRAMS\\Octave-$VERSION\\Octave (Experimental GUI).lnk" "\$INSTDIR\\libexec\\octave\\$OCTAVE_VERSION\\exec\\i686-pc-mingw32\\octave-gui.exe" "" "\$INSTDIR\\$ICON" 0 170 CreateShortCut "\$SMPROGRAMS\\Octave-$VERSION\\Octave (Experimental GUI).lnk" "\$INSTDIR\\bin\\octave-gui.exe" "" "\$INSTDIR\\$ICON" 0
171 SetOutPath "\$INSTDIR" 171 SetOutPath "\$INSTDIR"
172 EOF 172 EOF
173 # if we have documentation files, create shortcuts 173 # if we have documentation files, create shortcuts
174 if [ -d $OCTAVE_SOURCE/share/doc/octave ]; then 174 if [ -d $OCTAVE_SOURCE/share/doc/octave ]; then
175 cat >> octave.nsi << EOF 175 cat >> octave.nsi << EOF
198 198
199 Delete "\$desktop\\Octave-$VERSION (Command Line).lnk" 199 Delete "\$desktop\\Octave-$VERSION (Command Line).lnk"
200 Delete "\$desktop\\Octave-$VERSION (Experimental GUI).lnk" 200 Delete "\$desktop\\Octave-$VERSION (Experimental GUI).lnk"
201 201
202 ; delete generated qt.conf file 202 ; delete generated qt.conf file
203 Delete "\$INSTDIR\\libexec\\octave\\$OCTAVE_VERSION\\exec\\i686-pc-mingw32\\qt.conf" 203 Delete "\$INSTDIR\\bin\\qt.conf"
204 EOF 204 EOF
205 205
206 # insert dir list (backwards order) for uninstall files 206 # insert dir list (backwards order) for uninstall files
207 for f in $(find $OCTAVE_SOURCE -depth -type d -printf "%P\n"); do 207 for f in $(find $OCTAVE_SOURCE -depth -type d -printf "%P\n"); do
208 winf=`echo $f | sed 's,/,\\\\,g'` 208 winf=`echo $f | sed 's,/,\\\\,g'`