comparison makeinst-script.sh @ 3387:0779856e1186

Add desktop shortcut and octave-versionxxxxx-installer.exe naming. * makeinst-script.mk: change installer name to octave-VERSION.exe, add checkbox option to create deskyop shortcuts. * mk-dist: when in stable mode use folder name of octave-VERSION.
author John Donoghue <john.donoghue@ieee.org>
date Fri, 03 Jan 2014 02:14:54 -0500
parents 0de28586712a
children b5abbada6616
comparison
equal deleted inserted replaced
3386:17ef0d555e71 3387:0779856e1186
34 !define VERSION "$VERSION.0" 34 !define VERSION "$VERSION.0"
35 !define OCTAVE_VERSION "$OCTAVE_VERSION" 35 !define OCTAVE_VERSION "$OCTAVE_VERSION"
36 !define COPYRIGHT "Copyright © 2013 John W. Eaton and others." 36 !define COPYRIGHT "Copyright © 2013 John W. Eaton and others."
37 !define DESCRIPTION "GNU Octave is a high-level programming language, primarily intended for numerical computations." 37 !define DESCRIPTION "GNU Octave is a high-level programming language, primarily intended for numerical computations."
38 !define INSTALLER_FILES "../installer_files" 38 !define INSTALLER_FILES "../installer_files"
39 !define INSTALLER_NAME "octave-installer.exe" 39 !define INSTALLER_NAME "octave-$OCTAVE_VERSION-installer.exe"
40 !define MAIN_APP_EXE "octave.exe" 40 !define MAIN_APP_EXE "octave.exe"
41 !define INSTALL_TYPE "SetShellVarContext current" 41 !define INSTALL_TYPE "SetShellVarContext current"
42 !define PRODUCT_ROOT_KEY "HKLM" 42 !define PRODUCT_ROOT_KEY "HKLM"
43 !define PRODUCT_KEY "Software\\Octave" 43 !define PRODUCT_KEY "Software\\Octave"
44 44
83 !insertmacro MUI_PAGE_LICENSE "\${INSTALLER_FILES}/gpl-3.0.txt" 83 !insertmacro MUI_PAGE_LICENSE "\${INSTALLER_FILES}/gpl-3.0.txt"
84 84
85 !insertmacro MUI_PAGE_DIRECTORY 85 !insertmacro MUI_PAGE_DIRECTORY
86 86
87 !insertmacro MUI_PAGE_INSTFILES 87 !insertmacro MUI_PAGE_INSTFILES
88
89 ; set up checkbox to create desktop icon
90 Function finishpage_desktopshortcut
91 SetOutPath "\$INSTDIR\\bin"
92 CreateShortCut "\$desktop\\Octave-$VERSION.lnk" "\$INSTDIR\\bin\\octave.exe" "" "\$INSTDIR\\$ICON" 0
93 CreateShortCut "\$desktop\\Octave-$VERSION (Experimental GUI).lnk" "\$INSTDIR\\libexec\\octave\\$OCTAVE_VERSION\\exec\\i686-pc-mingw32\\octave-gui.exe" "" "\$INSTDIR\\$ICON" 0
94 FunctionEnd
95
96 !define MUI_FINISHPAGE_SHOWREADME ""
97 !define MUI_FINISHPAGE_SHOWREADME_CHECKED
98 !define MUI_FINISHPAGE_SHOWREADME_TEXT "Create Desktop Shortcut"
99 !define MUI_FINISHPAGE_SHOWREADME_FUNCTION finishpage_desktopshortcut
88 100
89 !define MUI_FINISHPAGE_RUN "\$INSTDIR\\bin\\\${MAIN_APP_EXE}" 101 !define MUI_FINISHPAGE_RUN "\$INSTDIR\\bin\\\${MAIN_APP_EXE}"
90 !insertmacro MUI_PAGE_FINISH 102 !insertmacro MUI_PAGE_FINISH
91 103
92 !insertmacro MUI_UNPAGE_CONFIRM 104 !insertmacro MUI_UNPAGE_CONFIRM
170 RMDir "\$SMPROGRAMS\\Octave\\Documentation" 182 RMDir "\$SMPROGRAMS\\Octave\\Documentation"
171 183
172 Delete "\$SMPROGRAMS\\Octave\\*.*" 184 Delete "\$SMPROGRAMS\\Octave\\*.*"
173 RMDir "\$SMPROGRAMS\\Octave" 185 RMDir "\$SMPROGRAMS\\Octave"
174 186
187 Delete "\$desktop\\Octave-$VERSION.lnk"
188 Delete "\$desktop\\Octave-$VERSION (Experimental GUI).lnk"
175 EOF 189 EOF
176 190
177 # insert dir list (backwards order) for uninstall files 191 # insert dir list (backwards order) for uninstall files
178 for f in $(find $OCTAVE_SOURCE -depth -type d -printf "%P\n"); do 192 for f in $(find $OCTAVE_SOURCE -depth -type d -printf "%P\n"); do
179 winf=`echo $f | sed 's,/,\\\\,g'` 193 winf=`echo $f | sed 's,/,\\\\,g'`