mxe-octave: makeinst-script.sh comparison

comparison makeinst-script.sh @ 3367:cfcbe03c9160

installer: Enable documentation build and add to installer. * makefile: add ENABLE_DOCS variable. * configure.ac: add --enable-docs arg (default yes) * makeinst-script.sh: - fix some \ vs \\ issues in script. - add shortcuts for documentation (if docs were created) * octave.mk: use --enable-docs if ENABLE_DOCS variable is yes, and install html and PDF docs.

author	John Donoghue <john.donoghue@ieee.org>
date	Mon, 09 Dec 2013 20:23:14 -0500
parents	ab6116aa1039
children	0de28586712a

comparison

equal deleted inserted replaced

-:ab6116aa1039
+:cfcbe03c9160
 echo "Generating installer script ... "
 cd $TOPDIR
-# find icon
+# find octave shortcut icon
 ICON=`find $OCTAVE_SOURCE -name octave-logo.ico -printf "%P" | head -1 | sed 's,/,\\\\,g'`
 # extract version number
 VERSION=`sed -n 's,.*id=\"octave-version\">\([0-9\.]*\).*,\1,p' < ../index.html`
 OCTAVE_VERSION=`sed -n 's,.*id=\"octave-version\">\([^<]*\).*,\1,p' < ../index.html`
 !define INSTALLER_FILES "../installer_files"
 !define INSTALLER_NAME "octave-installer.exe"
 !define MAIN_APP_EXE "octave.exe"
 !define INSTALL_TYPE "SetShellVarContext current"
 !define PRODUCT_ROOT_KEY "HKLM"
-!define PRODUCT_KEY "Software\Octave"
+!define PRODUCT_KEY "Software\\Octave"
 ######################################################################
 VIProductVersion  "\${VERSION}"
 VIAddVersionKey "ProductName"  "\${APP_NAME}"
 Caption "\${APP_NAME}"
 OutFile "\${INSTALLER_NAME}"
 BrandingText "\${APP_NAME}"
 XPStyle on
 InstallDir "C:\\Octave\\Octave-\${OCTAVE_VERSION}"
-Icon "$OCTAVE_SOURCE\\$ICON"
+Icon "\${INSTALLER_FILES}/octave-logo.ico"
 ######################################################################
 ; MUI settings
 !include "MUI.nsh"
 !insertmacro MUI_PAGE_DIRECTORY
 !insertmacro MUI_PAGE_INSTFILES
-!define MUI_FINISHPAGE_RUN "\$INSTDIR\bin\\\${MAIN_APP_EXE}"
+!define MUI_FINISHPAGE_RUN "\$INSTDIR\\bin\\\${MAIN_APP_EXE}"
 !insertmacro MUI_PAGE_FINISH
 !insertmacro MUI_UNPAGE_CONFIRM
 !insertmacro MUI_UNPAGE_INSTFILES
 Section make_uninstaller
 ; Write the uninstall keys for Windows
 SetOutPath "\$INSTDIR"
 WriteRegStr HKLM "Software\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Octave" "DisplayName" "Octave"
-WriteRegStr HKLM "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Octave" "UninstallString" "\$INSTDIR\uninstall.exe"
+WriteRegStr HKLM "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Octave" "UninstallString" "\$INSTDIR\\uninstall.exe"
 WriteRegDWORD HKLM "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Octave" "NoModify" 1
 WriteRegDWORD HKLM "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Octave" "NoRepair" 1
 WriteUninstaller "uninstall.exe"
 SectionEnd
 ; start menu (currently hardcoded)
 Section "Shortcuts"
 CreateDirectory "\$SMPROGRAMS\\Octave"
 CreateShortCut "\$SMPROGRAMS\\Octave\\Uninstall.lnk" "\$INSTDIR\\uninstall.exe" "" "\$INSTDIR\\uninstall.exe" 0
-CreateShortCut "\$SMPROGRAMS\Octave\\Octave.lnk" "\$INSTDIR\\bin\\octave.exe" "" "\$INSTDIR\\$ICON" 0
+CreateShortCut "\$SMPROGRAMS\\Octave\\Octave.lnk" "\$INSTDIR\\bin\\octave.exe" "" "\$INSTDIR\\$ICON" 0
-CreateShortCut "\$SMPROGRAMS\Octave\\Octave (Experimental GUI).lnk" "\$INSTDIR\\bin\\octave-gui.exe" "" "\$INSTDIR\\$ICON" 0
+CreateShortCut "\$SMPROGRAMS\\Octave\\Octave (Experimental GUI).lnk" "\$INSTDIR\\bin\\octave-gui.exe" "" "\$INSTDIR\\$ICON" 0
+EOF
+# if we have documentation files, create shortcuts
+if [ -d $OCTAVE_SOURCE/share/doc/octave ]; then
+cat >> octave.nsi << EOF
+CreateDirectory "\$SMPROGRAMS\\Octave\\Documentation"
+CreateShortCut "\$SMPROGRAMS\\Octave\\Documentation\\Octave C++ Classes (PDF).lnk" "\$INSTDIR\\share\\doc\\octave\\liboctave.pdf" "" "" 0
+CreateShortCut "\$SMPROGRAMS\\Octave\\Documentation\\Octave C++ Classes (HTML).lnk" "\$INSTDIR\\share\\doc\\octave\\liboctave.html\\index.html" "" "" 0
+CreateShortCut "\$SMPROGRAMS\\Octave\\Documentation\\Octave (PDF).lnk" "\$INSTDIR\\share\\doc\\octave\\octave.pdf" "" "" 0
+CreateShortCut "\$SMPROGRAMS\\Octave\\Documentation\\Octave (HTML).lnk" "\$INSTDIR\\share\\doc\\octave\\octave.html\\index.html" "" "" 0
+EOF
+fi
+cat >> octave.nsi << EOF
 SectionEnd
 Section "Uninstall"
-DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Octave"
+DeleteRegKey HKLM "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Octave"
-DeleteRegKey HKLM "Software\Octave"
+DeleteRegKey HKLM "Software\\Octave"
 ; Remove shortcuts
-Delete "\$SMPROGRAMS\Octave\*.*"
+Delete "\$SMPROGRAMS\\Octave\\Documentation\\*.*"
-RMDir "\$SMPROGRAMS\Octave"
+RMDir "\$SMPROGRAMS\\Octave\\Documentation"
+Delete "\$SMPROGRAMS\\Octave\\*.*"
+RMDir "\$SMPROGRAMS\\Octave"
 EOF
 # insert dir list (backwards order) for uninstall files
 for f in $(find $OCTAVE_SOURCE -depth -type d -printf "%P\n"); do
 is_winnt_vista:
 is_winnt_7:
 Goto done
 is_error:
 StrCpy \$1 \$0
-ReadRegStr \$0 HKLM "SOFTWARE\Microsoft\Windows NT\CurrentVersion" ProductName
+ReadRegStr \$0 HKLM "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion" ProductName
 IfErrors 0 +4
-ReadRegStr \$0 HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion" Version
+ReadRegStr \$0 HKLM "SOFTWARE\\Microsoft\\Windows\\CurrentVersion" Version
 IfErrors 0 +2
 StrCpy \$0 "Unknown"
 MessageBox MB_ICONSTOP|MB_OK "This version of Octave cannot be installed on this system. Octave is supported only on Windows NT systems. Current system: \$0 (version: \$1)"
 Abort
 done:
 ; Function to check any previously installed version of Octave in the system
 Function CheckPrevVersion
 Push \$0
 Push \$1
 Push \$2
-IfFileExists "\$INSTDIR\bin\octave-\${OCTAVE_VERSION}.exe" 0 otherver
+IfFileExists "\$INSTDIR\\bin\\octave-\${OCTAVE_VERSION}.exe" 0 otherver
 MessageBox MB_OK|MB_ICONSTOP "Another Octave installation (with the same version) has been detected. Please uninstall it first."
 Abort
 otherver:
 StrCpy \$0 0
 StrCpy \$2 ""
 ; use java.exe to keep stdout/stderr
 !define JAVAEXE "javaw.exe"
 ClearErrors
 ReadEnvStr \$R0 "JAVA_HOME"
-StrCpy \$R0 "\$R0\bin\\\${JAVAEXE}"
+StrCpy \$R0 "\$R0\\bin\\\${JAVAEXE}"
 IfErrors 0 continue  ;; 1) found it in JAVA_HOME
 ClearErrors
-ReadRegStr \$R1 HKLM "SOFTWARE\JavaSoft\Java Runtime Environment" "CurrentVersion"
+ReadRegStr \$R1 HKLM "SOFTWARE\\JavaSoft\\Java Runtime Environment" "CurrentVersion"
-ReadRegStr \$R0 HKLM "SOFTWARE\JavaSoft\Java Runtime Environment\\\$R1" "JavaHome"
+ReadRegStr \$R0 HKLM "SOFTWARE\\JavaSoft\\Java Runtime Environment\\\$R1" "JavaHome"
-StrCpy \$R0 "\$R0\bin\\\${JAVAEXE}"
+StrCpy \$R0 "\$R0\\bin\\\${JAVAEXE}"
 IfErrors 0 continue  ;; 2) found it in the registry
 IfErrors JRE_Error
 JRE_Error:

Mercurial > mxe-octave

comparison makeinst-script.sh @ 3367:cfcbe03c9160