Mercurial > mxe-octave

comparison makeinst-script.sh @ 3409:5e77c5fc91ed

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
qt: build translations in cross build and install * src/qt.mk: in cross compile configure options, set translate path and -make option. * makeinst-script.sh: Add createion and removal of libexec\octave\octave-version\qt.conf
author John Donoghue <john.donoghue@ieee.org>
date Fri, 10 Jan 2014 21:22:39 -0500
parents c0fe8d735baf
children 2a0e9378056c
comparison
equal deleted inserted replaced
3408:e0552735e3f3 3409:5e77c5fc91ed
61 XPStyle on 61 XPStyle on
62 InstallDir "C:\\Octave\\Octave-\${OCTAVE_VERSION}" 62 InstallDir "C:\\Octave\\Octave-\${OCTAVE_VERSION}"
63 Icon "\${INSTALLER_FILES}/octave-logo.ico" 63 Icon "\${INSTALLER_FILES}/octave-logo.ico"
64 64
65 ###################################################################### 65 ######################################################################
66 ; StrFunc usage
67 !include "StrFunc.nsh"
68 \${StrRep}
69 ######################################################################
66 ; MUI settings 70 ; MUI settings
67 !include "MUI.nsh" 71 !include "MUI.nsh"
68 72
69 !define MUI_ABORTWARNING 73 !define MUI_ABORTWARNING
70 !define MUI_UNABORTWARNING 74 !define MUI_UNABORTWARNING
135 find "$OCTAVE_SOURCE/$f" -maxdepth 1 -type f -printf " File \"%p\"\n" >> octave.nsi 139 find "$OCTAVE_SOURCE/$f" -maxdepth 1 -type f -printf " File \"%p\"\n" >> octave.nsi
136 done 140 done
137 141
138 cat >> octave.nsi << EOF 142 cat >> octave.nsi << EOF
139 143
144 ; add qt.conf
145 Push \$0
146 \${StrRep} '\$0' '\$INSTDIR' '\\' '/'
147 WriteINIStr "\$INSTDIR\\libexec\\octave\\$OCTAVE_VERSION\\exec\\i686-pc-mingw32\\qt.conf" "Paths" "Prefix" "\$0"
148 WriteINIStr "\$INSTDIR\\libexec\\octave\\$OCTAVE_VERSION\\exec\\i686-pc-mingw32\\qt.conf" "Paths" "Translations" "translations"
149 Pop \$0
140 SectionEnd 150 SectionEnd
141 151
142 Section make_uninstaller 152 Section make_uninstaller
143 ; Write the uninstall keys for Windows 153 ; Write the uninstall keys for Windows
144 SetOutPath "\$INSTDIR" 154 SetOutPath "\$INSTDIR"
186 Delete "\$SMPROGRAMS\\Octave-$VERSION\\*.*" 196 Delete "\$SMPROGRAMS\\Octave-$VERSION\\*.*"
187 RMDir "\$SMPROGRAMS\\Octave-$VERSION" 197 RMDir "\$SMPROGRAMS\\Octave-$VERSION"
188 198
189 Delete "\$desktop\\Octave-$VERSION.lnk" 199 Delete "\$desktop\\Octave-$VERSION.lnk"
190 Delete "\$desktop\\Octave-$VERSION (Experimental GUI).lnk" 200 Delete "\$desktop\\Octave-$VERSION (Experimental GUI).lnk"
201
202 ; delete generated qt.conf file
203 Delete "\$INSTDIR\\libexec\\octave\\$OCTAVE_VERSION\\exec\\i686-pc-mingw32\\qt.conf"
191 EOF 204 EOF
192 205
193 # insert dir list (backwards order) for uninstall files 206 # insert dir list (backwards order) for uninstall files
194 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
195 winf=`echo $f | sed 's,/,\\\\,g'` 208 winf=`echo $f | sed 's,/,\\\\,g'`
197 echo " RmDir \"\$INSTDIR\\$winf\"" >> octave.nsi 210 echo " RmDir \"\$INSTDIR\\$winf\"" >> octave.nsi
198 done 211 done
199 212
200 # last bit of the uninstaller 213 # last bit of the uninstaller
201 cat >> octave.nsi << EOF 214 cat >> octave.nsi << EOF
202 Delete "\$INSTDIR\*.*" 215 Delete "\$INSTDIR\\*.*"
203 RmDir "\$INSTDIR" 216 RmDir "\$INSTDIR"
204 SectionEnd 217 SectionEnd
205 218
206 ; Function to detect Windows version and abort if Octave is unsupported in the current platform 219 ; Function to detect Windows version and abort if Octave is unsupported in the current platform
207 Function DetectWinVer 220 Function DetectWinVer