Mercurial > mxe-octave

diff makeinst-script.sh @ 3425:1ac93670d0bc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge away extra head on default
author John W. Eaton <jwe@octave.org>
date Wed, 15 Jan 2014 22:22:40 -0500
parents c8e055d83b9f
children 2183ac663bcb
line wrap: on
line diff
--- a/makeinst-script.sh	Sun Jan 12 17:11:15 2014 -0500
+++ b/makeinst-script.sh	Wed Jan 15 22:22:40 2014 -0500
@@ -93,9 +93,9 @@
 
 ; set up checkbox to create desktop icon
 Function finishpage_desktopshortcut
-  SetOutPath "\$INSTDIR\\bin"
-  CreateShortCut "\$desktop\\Octave-$VERSION.lnk" "\$INSTDIR\\bin\\octave.exe" "" "\$INSTDIR\\$ICON" 0
-  CreateShortCut "\$desktop\\Octave-$VERSION (Experimental GUI).lnk" "\$INSTDIR\\libexec\\octave\\$OCTAVE_VERSION\\exec\\i686-pc-mingw32\\octave-gui.exe" "" "\$INSTDIR\\$ICON" 0
+  SetOutPath "%USERPROFILE%"
+  CreateShortCut "\$desktop\\Octave-$VERSION (Command Line).lnk" "\$INSTDIR\\bin\\octave-cli.exe" "" "\$INSTDIR\\$ICON" 0
+  CreateShortCut "\$desktop\\Octave-$VERSION (Experimental GUI).lnk" "\$INSTDIR\\bin\\octave-gui.exe" "" "\$INSTDIR\\$ICON" 0
 FunctionEnd
 
 !define MUI_FINISHPAGE_SHOWREADME ""
@@ -144,8 +144,8 @@
  ; add qt.conf
  Push \$0
  \${StrRep} '\$0' '\$INSTDIR' '\\' '/'
- WriteINIStr "\$INSTDIR\\libexec\\octave\\$OCTAVE_VERSION\\exec\\i686-pc-mingw32\\qt.conf" "Paths" "Prefix" "\$0"
- WriteINIStr "\$INSTDIR\\libexec\\octave\\$OCTAVE_VERSION\\exec\\i686-pc-mingw32\\qt.conf" "Paths" "Translations" "translations"
+ WriteINIStr "\$INSTDIR\\bin\\qt.conf" "Paths" "Prefix" "\$0"
+ WriteINIStr "\$INSTDIR\\bin\\qt.conf" "Paths" "Translations" "translations"
  Pop \$0
 SectionEnd
 
@@ -165,9 +165,9 @@
 
  CreateDirectory "\$SMPROGRAMS\\Octave-$VERSION"
  CreateShortCut "\$SMPROGRAMS\\Octave-$VERSION\\Uninstall.lnk" "\$INSTDIR\\uninstall.exe" "" "\$INSTDIR\\uninstall.exe" 0
- SetOutPath "\$INSTDIR\\bin"
- CreateShortCut "\$SMPROGRAMS\\Octave-$VERSION\\Octave.lnk" "\$INSTDIR\\bin\\octave.exe" "" "\$INSTDIR\\$ICON" 0
- CreateShortCut "\$SMPROGRAMS\\Octave-$VERSION\\Octave (Experimental GUI).lnk" "\$INSTDIR\\libexec\\octave\\$OCTAVE_VERSION\\exec\\i686-pc-mingw32\\octave-gui.exe" "" "\$INSTDIR\\$ICON" 0
+ SetOutPath "%USERPROFILE%"
+ CreateShortCut "\$SMPROGRAMS\\Octave-$VERSION\\Octave (Command Line).lnk" "\$INSTDIR\\bin\\octave-cli.exe" "" "\$INSTDIR\\$ICON" 0
+ CreateShortCut "\$SMPROGRAMS\\Octave-$VERSION\\Octave (Experimental GUI).lnk" "\$INSTDIR\\bin\\octave-gui.exe" "" "\$INSTDIR\\$ICON" 0
  SetOutPath "\$INSTDIR"
 EOF
   # if we have documentation files, create shortcuts
@@ -196,11 +196,11 @@
  Delete "\$SMPROGRAMS\\Octave-$VERSION\\*.*"
  RMDir "\$SMPROGRAMS\\Octave-$VERSION"
 
- Delete "\$desktop\\Octave-$VERSION.lnk" 
+ Delete "\$desktop\\Octave-$VERSION (Command Line).lnk" 
  Delete "\$desktop\\Octave-$VERSION (Experimental GUI).lnk" 
 
  ; delete generated qt.conf file
- Delete "\$INSTDIR\\libexec\\octave\\$OCTAVE_VERSION\\exec\\i686-pc-mingw32\\qt.conf"
+ Delete "\$INSTDIR\\bin\\qt.conf"
 EOF
 
 # insert dir list (backwards order) for uninstall files