Mercurial > mxe-octave

comparison tools/makeinst-script.sh.in @ 4949:1c251625c3cf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* tools/makeinst-script.sh.in: call .vbs files via wscript call (Bug #55635)
author John Donoghue
date Tue, 05 Feb 2019 12:05:43 -0500
parents 4b11bbe7c8ff
children cd7689f3fcd8
comparison
equal deleted inserted replaced
4948:ff812078f5cf 4949:1c251625c3cf
332 Section "Shortcuts" 332 Section "Shortcuts"
333 333
334 CreateDirectory "\$SMPROGRAMS\\GNU Octave $VERSION" 334 CreateDirectory "\$SMPROGRAMS\\GNU Octave $VERSION"
335 CreateShortCut "\$SMPROGRAMS\\GNU Octave $VERSION\\Uninstall.lnk" "\$INSTDIR\\uninstall.exe" "" "\$INSTDIR\\uninstall.exe" 0 335 CreateShortCut "\$SMPROGRAMS\\GNU Octave $VERSION\\Uninstall.lnk" "\$INSTDIR\\uninstall.exe" "" "\$INSTDIR\\uninstall.exe" 0
336 SetOutPath "%USERPROFILE%" 336 SetOutPath "%USERPROFILE%"
337 CreateShortCut "\$SMPROGRAMS\\GNU Octave $VERSION\\Octave-$VERSION (CLI).lnk" "\$INSTDIR\\octave.vbs" "--no-gui" "\$INSTDIR\\$ICON" 0 SW_SHOWMINIMIZED 337 CreateShortCut "\$SMPROGRAMS\\GNU Octave $VERSION\\Octave-$VERSION (CLI).lnk" "%SYSTEMROOT%\\system32\\wscript.exe" "\$\\"\$INSTDIR\\octave.vbs\$\\" --no-gui" "\$INSTDIR\\$ICON" 0 SW_SHOWMINIMIZED
338 CreateShortCut "\$SMPROGRAMS\\GNU Octave $VERSION\\Octave-$VERSION (GUI).lnk" "\$INSTDIR\\octave.vbs" "--force-gui" "\$INSTDIR\\$ICON" 0 SW_SHOWMINIMIZED 338 CreateShortCut "\$SMPROGRAMS\\GNU Octave $VERSION\\Octave-$VERSION (GUI).lnk" "%SYSTEMROOT%\\system32\\wscript.exe" "\$\\"\$INSTDIR\\octave.vbs\$\\" --force-gui" "\$INSTDIR\\$ICON" 0 SW_SHOWMINIMIZED
339 SetOutPath "\$INSTDIR" 339 SetOutPath "\$INSTDIR"
340 340
341 ; fix the shortcuts for appid 341 ; fix the shortcuts for appid
342 ; run in hidden console window 342 ; run in hidden console window
343 nsExec::Exec /TIMEOUT=30000 '"\$INSTDIR\\$OCTAVE_SUBDIR\\bin\\win7appid.exe" "\$SMPROGRAMS\\GNU Octave $VERSION\\Octave-$VERSION (GUI).lnk" "gnu.octave.$VERSION"' 343 nsExec::Exec /TIMEOUT=30000 '"\$INSTDIR\\$OCTAVE_SUBDIR\\bin\\win7appid.exe" "\$SMPROGRAMS\\GNU Octave $VERSION\\Octave-$VERSION (GUI).lnk" "gnu.octave.$VERSION"'
383 StrCpy \$R0 "\$INSTDIR" 383 StrCpy \$R0 "\$INSTDIR"
384 StrCpy \$R2 "\$INSTDIR\\$ICON" 384 StrCpy \$R2 "\$INSTDIR\\$ICON"
385 385
386 have_ver_str: 386 have_ver_str:
387 SetOutPath "%USERPROFILE%" 387 SetOutPath "%USERPROFILE%"
388 CreateShortCut "\$desktop\\GNU Octave (CLI).lnk" "\$R0\\octave.vbs" "--no-gui" "\$R2" 0 SW_SHOWMINIMIZED 388 CreateShortCut "\$desktop\\GNU Octave (CLI).lnk" "%SYSTEMROOT%\\system32\\wscript.exe" "\$\\"\$R0\\octave.vbs\$\\" --no-gui" "\$R2" 0 SW_SHOWMINIMIZED
389 CreateShortCut "\$desktop\\GNU Octave (GUI).lnk" "\$R0\\octave.vbs" "--force-gui" "\$R2" 0 SW_SHOWMINIMIZED 389 CreateShortCut "\$desktop\\GNU Octave (GUI).lnk" "%SYSTEMROOT%\\system32\\wscript.exe" "\$\\"\$R0\\octave.vbs\$\\" --force-gui" "\$R2" 0 SW_SHOWMINIMIZED
390 390
391 nsExec::Exec /TIMEOUT=30000 '"\$INSTDIR\\$OCTAVE_SUBDIR\\bin\\win7appid.exe" "\$desktop\\GNU Octave (GUI).lnk" "gnu.octave.\$R1"' 391 nsExec::Exec /TIMEOUT=30000 '"\$INSTDIR\\$OCTAVE_SUBDIR\\bin\\win7appid.exe" "\$desktop\\GNU Octave (GUI).lnk" "gnu.octave.\$R1"'
392 Pop \$0 392 Pop \$0
393 393
394 Pop \$R2 394 Pop \$R2
484 484
485 ReadRegStr \$R2 HKLM "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Octave-\$R1" "DisplayIcon" 485 ReadRegStr \$R2 HKLM "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Octave-\$R1" "DisplayIcon"
486 486
487 IfFileExists "\$desktop\\GNU Octave (CLI).lnk" 0 check_gui_shortcut 487 IfFileExists "\$desktop\\GNU Octave (CLI).lnk" 0 check_gui_shortcut
488 SetOutPath "%USERPROFILE%" 488 SetOutPath "%USERPROFILE%"
489 CreateShortCut "\$desktop\\GNU Octave (CLI).lnk" "\$R0\\octave.vbs" "--no-gui" "\$R2" 0 SW_SHOWMINIMIZED 489 CreateShortCut "\$desktop\\GNU Octave (CLI).lnk" "%SYSTEMROOT%\system32\wscript.exe" "\$\\"\$R0\\octave.vbs\$\\" --no-gui" "\$R2" 0 SW_SHOWMINIMIZED
490 490
491 check_gui_shortcut: 491 check_gui_shortcut:
492 IfFileExists "\$desktop\\GNU Octave (GUI).lnk" 0 done_remove_desktop_shortcuts 492 IfFileExists "\$desktop\\GNU Octave (GUI).lnk" 0 done_remove_desktop_shortcuts
493 SetOutPath "%USERPROFILE%" 493 SetOutPath "%USERPROFILE%"
494 CreateShortCut "\$desktop\\GNU Octave (GUI).lnk" "\$R0\\octave.vbs" "--force-gui" "\$R2" 0 SW_SHOWMINIMIZED 494 CreateShortCut "\$desktop\\GNU Octave (GUI).lnk" "%SYSTEMROOT%\system32\wscript.exe" "\$\\"\$R0\\octave.vbs\$\\" --force-gui" "\$R2" 0 SW_SHOWMINIMIZED
495 nsExec::Exec /TIMEOUT=30000 '"\$INSTDIR\\$OCTAVE_SUBDIR\\bin\\win7appid.exe" "\$desktop\\GNU Octave (GUI).lnk" "gnu.octave.\$R1"' 495 nsExec::Exec /TIMEOUT=30000 '"\$INSTDIR\\$OCTAVE_SUBDIR\\bin\\win7appid.exe" "\$desktop\\GNU Octave (GUI).lnk" "gnu.octave.\$R1"'
496 Pop \$0 496 Pop \$0
497 497
498 GoTo done_remove_desktop_shortcuts 498 GoTo done_remove_desktop_shortcuts
499 499