Mercurial > mxe-octave
comparison tools/makeinst-script.sh.in @ 4258:a45374f7d9a3
Use 8.3 format for octave path
* installer-files/octave-firsttime.vbs: convert OctavePath to shortpath
* installer-files/octave.vbs: convert OctavePath to shortpath
* installer-files/octave.bat: convert OCT_HOME to 8.3 path
* tools/makeinst-script.sh.in: call pkg rbuild and fc_cache with 8.3 pathname
author | John D |
---|---|
date | Tue, 06 Dec 2016 02:27:58 -0500 |
parents | ee1ae5d1fd88 |
children | 2f1309f19b49 |
comparison
equal
deleted
inserted
replaced
4257:8f71549f53b9 | 4258:a45374f7d9a3 |
---|---|
253 WriteINIStr "\$INSTDIR\\bin\\qt.conf" "Paths" "Prefix" "\$0" | 253 WriteINIStr "\$INSTDIR\\bin\\qt.conf" "Paths" "Prefix" "\$0" |
254 WriteINIStr "\$INSTDIR\\bin\\qt.conf" "Paths" "Translations" "translations" | 254 WriteINIStr "\$INSTDIR\\bin\\qt.conf" "Paths" "Translations" "translations" |
255 Pop \$0 | 255 Pop \$0 |
256 | 256 |
257 ; run fc-cache updater | 257 ; run fc-cache updater |
258 GetFullPathName /SHORT \$1 \$INSTDIR | |
258 DetailPrint "Building font cache (may take a while)" | 259 DetailPrint "Building font cache (may take a while)" |
259 ExecWait "\$INSTDIR\\fc_update.bat" | 260 ExecWait "\$1\\fc_update.bat" |
260 SectionEnd | 261 SectionEnd |
261 | 262 |
262 Section make_uninstaller | 263 Section make_uninstaller |
263 ; Write the uninstall keys for Windows | 264 ; Write the uninstall keys for Windows |
264 SetOutPath "\$INSTDIR" | 265 SetOutPath "\$INSTDIR" |
342 \${EndIf} | 343 \${EndIf} |
343 SectionEnd | 344 SectionEnd |
344 | 345 |
345 Section "InstallPackages" | 346 Section "InstallPackages" |
346 ; fix the installed packages (if any) | 347 ; fix the installed packages (if any) |
347 SetOutPath "\$INSTDIR" | 348 GetFullPathName /SHORT \$1 \$INSTDIR |
348 ExecWait '"\$INSTDIR\\bin\\octave-cli.exe" --no-gui -W -H -f -q --eval "pkg rebuild"' \$0 | 349 SetOutPath "\$1" |
350 ExecWait '"\$1\\bin\\octave-cli.exe" --no-gui -W -H -f -q --eval "pkg rebuild"' \$0 | |
349 SectionEnd | 351 SectionEnd |
350 | 352 |
351 Section "Uninstall" | 353 Section "Uninstall" |
352 | 354 |
353 ReadRegDWORD \$0 HKLM "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Octave-$VERSION" "AllUsers" | 355 ReadRegDWORD \$0 HKLM "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Octave-$VERSION" "AllUsers" |