diff options
author | Derrick Hendricks <derrick@nanorex.com> | 2008-07-21 15:27:00 +0000 |
---|---|---|
committer | Derrick Hendricks <derrick@nanorex.com> | 2008-07-21 15:27:00 +0000 |
commit | 0668f68ddc81dbdc503ddcc4c31de425c083e609 (patch) | |
tree | 99500efa02a85a83c3ca210ecb46a4c786b65d74 /packaging | |
parent | 894c8b59e2a1b88c5cbadc12b1e6a0b7d4dfde0a (diff) | |
download | nanoengineer-theirix-0668f68ddc81dbdc503ddcc4c31de425c083e609.tar.gz nanoengineer-theirix-0668f68ddc81dbdc503ddcc4c31de425c083e609.zip |
merged in fixes needed for install build
Diffstat (limited to 'packaging')
-rw-r--r-- | packaging/Suite/Win32/suite_installer.nsi | 8 | ||||
-rw-r--r-- | packaging/Win32/installer.nsi | 311 |
2 files changed, 160 insertions, 159 deletions
diff --git a/packaging/Suite/Win32/suite_installer.nsi b/packaging/Suite/Win32/suite_installer.nsi index 8d000e52d..f1b76c926 100644 --- a/packaging/Suite/Win32/suite_installer.nsi +++ b/packaging/Suite/Win32/suite_installer.nsi @@ -92,7 +92,7 @@ InstType "Full" ; MUI end ------
-Name "${PRODUCT_NAME} v${PRODUCT_VERSION}"
+Name "${PRODUCT_NAME} Version v${PRODUCT_VERSION}"
OutFile "..\..\..\cad\src\build\NanoEngineer-1_Suite_v${PRODUCT_VERSION}.exe"
InstallDir "$PROGRAMFILES\Nanorex"
InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" ""
@@ -321,9 +321,9 @@ SectionGroupEnd Section -AdditionalIcons
SetOutPath $INSTDIR
- CreateShortCut "$SMPROGRAMS\Nanorex\NanoEngineer-1 ${PRODUCT_VERSION}\partlib.lnk" "$INSTDIR\NanoEngineer-1 ${PRODUCT_VERSION}\partlib"
- CreateShortCut "$SMPROGRAMS\Nanorex\NanoEngineer-1 ${PRODUCT_VERSION}\Licenses.lnk" "$INSTDIR\NanoEngineer-1 ${PRODUCT_VERSION}\Licenses"
- CreateShortCut "$SMPROGRAMS\Nanorex\NanoEngineer-1 ${PRODUCT_VERSION}\Uninstall.lnk" "$INSTDIR\uninst.exe"
+ CreateShortCut "$SMPROGRAMS\Nanorex\NanoEngineer-1 v${PRODUCT_VERSION}\partlib.lnk" "$INSTDIR\NanoEngineer-1 v${PRODUCT_VERSION}\partlib"
+ CreateShortCut "$SMPROGRAMS\Nanorex\NanoEngineer-1 v${PRODUCT_VERSION}\Licenses.lnk" "$INSTDIR\NanoEngineer-1 v${PRODUCT_VERSION}\Licenses"
+ CreateShortCut "$SMPROGRAMS\Nanorex\NanoEngineer-1 v${PRODUCT_VERSION}\Uninstall.lnk" "$INSTDIR\uninst.exe"
; WriteIniStr "$INSTDIR\NanoVision-1\${PRODUCT_NV1_NAME}-${PRODUCT_NV1_VERSION.url" "InternetShortcut" "URL" "${PRODUCT_NV1_WEB_SITE}"
; CreateShortCut "$SMPROGRAMS\Nanorex\NanoVision-1\Website.lnk" "$INSTDIR\NanoVision-1\${PRODUCT_NV1_NAME}.url"
WriteIniStr "$INSTDIR\${QMX_INST_DIR}\${PRODUCT_QMX_NAME}-${PRODUCT_QMX_VERSION}.url" "InternetShortcut" "URL" "${PRODUCT_QMX_WEB_SITE}"
diff --git a/packaging/Win32/installer.nsi b/packaging/Win32/installer.nsi index 044b3b5a4..375eb8e75 100644 --- a/packaging/Win32/installer.nsi +++ b/packaging/Win32/installer.nsi @@ -1,155 +1,156 @@ -; Script generated by the HM NIS Edit Script Wizard. - -; HM NIS Edit Wizard helper defines -!define PRODUCT_NAME "NanoEngineer-1" -!define PRODUCT_VERSION "1.1.1" -!define PRODUCT_PUBLISHER "Nanorex, Inc." -!define PRODUCT_WEB_SITE "http://www.nanoengineer-1.com" -!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\${PRODUCT_NAME}\${PRODUCT_VERSION}" -;!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\babel.exe" -!define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" -!define PRODUCT_UNINST_ROOT_KEY "HKLM" - -; MUI 1.67 compatible ------ -!include "MUI.nsh" -!include "registerExtension.nsh" - -; MUI Settings -!define MUI_ABORTWARNING -!define MUI_ICON "install.ico" -!define MUI_UNICON "uninstall.ico" -!define MUI_HEADERIMAGE -!define MUI_HEADERIMAGE_BITMAP "install-header.bmp" -!define MUI_HEADERIMAGE_UNBITMAP "install-header.bmp" -!define MUI_WELCOMEFINISHPAGE_BITMAP "wizard-sidebar.bmp" -!define MUI_UNWELCOMEFINISHPAGE_BITMAP "wizard-sidebar.bmp" - -InstType "Basic" -InstType "Full" - -; Welcome page -!insertmacro MUI_PAGE_WELCOME -; License page -!insertmacro MUI_PAGE_LICENSE "..\..\cad\src\dist\Licenses\NanoEngineer-1_License.txt" -; Components page -!insertmacro MUI_PAGE_COMPONENTS -; Directory page -!insertmacro MUI_PAGE_DIRECTORY -; Instfiles page -!insertmacro MUI_PAGE_INSTFILES -; Finish page -!define MUI_FINISHPAGE_RUN "$INSTDIR\program\main.exe" -!define MUI_FINISHPAGE_SHOWREADME "$INSTDIR\ReadMe.html" -!insertmacro MUI_PAGE_FINISH - -; Uninstaller pages -!insertmacro MUI_UNPAGE_INSTFILES - -; Language files -!insertmacro MUI_LANGUAGE "English" - -; MUI end ------ - -Name "${PRODUCT_NAME} v${PRODUCT_VERSION}" -OutFile "..\..\cad\src\build\NanoEngineer-1_v${PRODUCT_VERSION}.exe" -InstallDir "$PROGRAMFILES\Nanorex\NanoEngineer-1 v${PRODUCT_VERSION}" -InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" "" -ShowInstDetails show -ShowUnInstDetails show - -SectionGroup /e "NanoEngineer-1" -Section "MainSection" SEC01 - SectionIn 1 2 - SetOutPath "$INSTDIR" - File "..\..\cad\src\dist\ReadMe.html" - SetOverwrite try - SetOutPath "$INSTDIR\bin" - File /r "..\..\cad\src\dist\bin\*" - SetOutPath "$INSTDIR\doc" - File /r "..\..\cad\src\dist\doc\*" - SetOutPath "$INSTDIR\Licenses" - File /r "..\..\cad\src\dist\Licenses\*" - SetOutPath "$INSTDIR\partlib" - File /r "..\..\cad\src\dist\partlib\*" - SetOutPath "$INSTDIR\plugins" - File /r "..\..\cad\src\dist\plugins\*" - SetOutPath "$INSTDIR\program" - File /r "..\..\cad\src\dist\program\*" - SetOutPath "$INSTDIR\src" - File /r "..\..\cad\src\dist\src\*" - - ; hack - SetOutPath "$INSTDIR\program" - File "C:\Qt\4.3.5\bin\QtSvg4.dll" - - SetOutPath "$SYSDIR" - SetOverwrite off - File "glut32.dll" - File "gle32.dll" - CreateDirectory "$SMPROGRAMS\Nanorex\NanoEngineer-1 ${PRODUCT_VERSION}" - CreateShortCut "$SMPROGRAMS\Nanorex\NanoEngineer-1 ${PRODUCT_VERSION}\NanoEngineer-1.lnk" "$INSTDIR\program\main.exe" - CreateShortCut "$DESKTOP\NanoEngineer-1.lnk" "$INSTDIR\program\main.exe" - CreateShortCut "$SMPROGRAMS\Nanorex\NanoEngineer-1 ${PRODUCT_VERSION}\ReadMe.html.lnk" "$INSTDIR\ReadMe.html" -SectionEnd -Section /o "Source" SEC_QMX_SRC - SectionIn 2 - SetOutPath "$INSTDIR\source" - SetOverwrite try - File /r "..\..\cad\src\dist\source\*" - SetOutPath "$INSTDIR" -SectionEnd -SectionGroupEnd - -Section -AdditionalIcons - SetOutPath $INSTDIR - CreateShortCut "$SMPROGRAMS\Nanorex\NanoEngineer-1 ${PRODUCT_VERSION}\partlib.lnk" "$INSTDIR\partlib" - CreateShortCut "$SMPROGRAMS\Nanorex\NanoEngineer-1 ${PRODUCT_VERSION}\Licenses.lnk" "$INSTDIR\Licenses" - CreateShortCut "$SMPROGRAMS\Nanorex\NanoEngineer-1 ${PRODUCT_VERSION}\Uninstall.lnk" "$INSTDIR\uninst.exe" -SectionEnd - -Section -Post - WriteUninstaller "$INSTDIR\uninst.exe" - WriteRegStr HKLM "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\program\main.exe" - WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "$(^Name)" - WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\uninst.exe" - WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\program\main.exe" - WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}" - WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "URLInfoAbout" "${PRODUCT_WEB_SITE}" - WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "Publisher" "${PRODUCT_PUBLISHER}" - ${registerExtension} "$INSTDIR\program\main.exe " ".mmp" "NanoEngineer-1 File" -SectionEnd - - -Function un.onUninstSuccess - HideWindow - MessageBox MB_ICONINFORMATION|MB_OK "$(^Name) was successfully removed from your computer." -FunctionEnd - -Function un.onInit - MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 "Are you sure you want to completely remove $(^Name) and all of its components?" IDYES +2 - Abort -FunctionEnd - -Section Uninstall - Delete "$INSTDIR\*" - RMDir /r "$INSTDIR\src" - RMDir /r "$INSTDIR\program" - RMDir /r "$INSTDIR\plugins" - RMDir /r "$INSTDIR\partlib" - RMDir /r "$INSTDIR\Licenses" - RMDir /r "$INSTDIR\doc" - RMDir /r "$INSTDIR\bin" - RMDir /r "$INSTDIR\source" - RMDir "$INSTDIR" - RMDir "$PROGRAMFILES\Nanorex" - - Delete "$DESKTOP\NanoEngineer-1.lnk" - - RMDir /r "$SMPROGRAMS\Nanorex\NanoEngineer-1 v${PRODUCT_VERSION}" - RMDir "$SMPROGRAMS\Nanorex" - - DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" - DeleteRegKey HKLM "${PRODUCT_DIR_REGKEY}" - ${unregisterExtension} ".mmp" "NanoEngineer-1 File" - SetAutoClose true -SectionEnd +; Script generated by the HM NIS Edit Script Wizard.
+
+; HM NIS Edit Wizard helper defines
+!define PRODUCT_NAME "NanoEngineer-1"
+!define PRODUCT_VERSION "1.1.1"
+!define PRODUCT_PUBLISHER "Nanorex, Inc."
+!define PRODUCT_WEB_SITE "http://www.nanoengineer-1.com"
+!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\${PRODUCT_NAME}\${PRODUCT_VERSION}"
+;!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\babel.exe"
+!define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
+!define PRODUCT_UNINST_ROOT_KEY "HKLM"
+
+; MUI 1.67 compatible ------
+!include "MUI.nsh"
+!include "registerExtension.nsh"
+
+; MUI Settings
+!define MUI_ABORTWARNING
+!define MUI_ICON "install.ico"
+!define MUI_UNICON "uninstall.ico"
+!define MUI_HEADERIMAGE
+!define MUI_HEADERIMAGE_BITMAP "install-header.bmp"
+!define MUI_HEADERIMAGE_UNBITMAP "install-header.bmp"
+!define MUI_WELCOMEFINISHPAGE_BITMAP "wizard-sidebar.bmp"
+!define MUI_UNWELCOMEFINISHPAGE_BITMAP "wizard-sidebar.bmp"
+
+InstType "Basic"
+InstType "Full"
+
+; Welcome page
+!insertmacro MUI_PAGE_WELCOME
+; License page
+!insertmacro MUI_PAGE_LICENSE "..\..\cad\src\dist\Licenses\NanoEngineer-1_License.txt"
+; Components page
+!insertmacro MUI_PAGE_COMPONENTS
+; Directory page
+!insertmacro MUI_PAGE_DIRECTORY
+; Instfiles page
+!insertmacro MUI_PAGE_INSTFILES
+; Finish page
+!define MUI_FINISHPAGE_RUN "$INSTDIR\program\main.exe"
+!define MUI_FINISHPAGE_SHOWREADME "$INSTDIR\ReadMe.html"
+;!define MUI_FINISHPAGE_SHOWREADME "http://www.nanoengineer-1.net/mediawiki/index.php?title=Online_Readme"
+!insertmacro MUI_PAGE_FINISH
+
+; Uninstaller pages
+!insertmacro MUI_UNPAGE_INSTFILES
+
+; Language files
+!insertmacro MUI_LANGUAGE "English"
+
+; MUI end ------
+
+Name "${PRODUCT_NAME} v${PRODUCT_VERSION}"
+OutFile "..\..\cad\src\build\NanoEngineer-1_v${PRODUCT_VERSION}.exe"
+InstallDir "$PROGRAMFILES\Nanorex\NanoEngineer-1 v${PRODUCT_VERSION}"
+InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" ""
+ShowInstDetails show
+ShowUnInstDetails show
+
+SectionGroup /e "NanoEngineer-1"
+Section "MainSection" SEC01
+ SectionIn 1 2
+ SetOutPath "$INSTDIR"
+ File "..\..\cad\src\dist\ReadMe.html"
+ SetOverwrite try
+ SetOutPath "$INSTDIR\bin"
+ File /r "..\..\cad\src\dist\bin\*"
+ SetOutPath "$INSTDIR\doc"
+ File /r "..\..\cad\src\dist\doc\*"
+ SetOutPath "$INSTDIR\Licenses"
+ File /r "..\..\cad\src\dist\Licenses\*"
+ SetOutPath "$INSTDIR\partlib"
+ File /r "..\..\cad\src\dist\partlib\*"
+ SetOutPath "$INSTDIR\plugins"
+ File /r "..\..\cad\src\dist\plugins\*"
+ SetOutPath "$INSTDIR\program"
+ File /r "..\..\cad\src\dist\program\*"
+ SetOutPath "$INSTDIR\src"
+ File /r "..\..\cad\src\dist\src\*"
+
+ ; hack
+ SetOutPath "$INSTDIR\program"
+ File "C:\Qt\4.3.5\bin\QtSvg4.dll"
+
+ SetOutPath "$SYSDIR"
+ SetOverwrite off
+ File "glut32.dll"
+ File "gle32.dll"
+ CreateDirectory "$SMPROGRAMS\Nanorex\NanoEngineer-1 v${PRODUCT_VERSION}"
+ CreateShortCut "$SMPROGRAMS\Nanorex\NanoEngineer-1 v${PRODUCT_VERSION}\NanoEngineer-1.lnk" "$INSTDIR\program\main.exe"
+ CreateShortCut "$DESKTOP\NanoEngineer-1.lnk" "$INSTDIR\program\main.exe"
+ CreateShortCut "$SMPROGRAMS\Nanorex\NanoEngineer-1 v${PRODUCT_VERSION}\ReadMe.html.lnk" "$INSTDIR\ReadMe.html"
+SectionEnd
+Section /o "Source" SEC_QMX_SRC
+ SectionIn 2
+ SetOutPath "$INSTDIR\source"
+ SetOverwrite try
+ File /r "..\..\cad\src\dist\source\*"
+ SetOutPath "$INSTDIR"
+SectionEnd
+SectionGroupEnd
+
+Section -AdditionalIcons
+ SetOutPath $INSTDIR
+ CreateShortCut "$SMPROGRAMS\Nanorex\NanoEngineer-1 v${PRODUCT_VERSION}\partlib.lnk" "$INSTDIR\partlib"
+ CreateShortCut "$SMPROGRAMS\Nanorex\NanoEngineer-1 v${PRODUCT_VERSION}\Licenses.lnk" "$INSTDIR\Licenses"
+ CreateShortCut "$SMPROGRAMS\Nanorex\NanoEngineer-1 v${PRODUCT_VERSION}\Uninstall.lnk" "$INSTDIR\uninst.exe"
+SectionEnd
+
+Section -Post
+ WriteUninstaller "$INSTDIR\uninst.exe"
+ WriteRegStr HKLM "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\program\main.exe"
+ WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "$(^Name)"
+ WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\uninst.exe"
+ WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\program\main.exe"
+ WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}"
+ WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "URLInfoAbout" "${PRODUCT_WEB_SITE}"
+ WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "Publisher" "${PRODUCT_PUBLISHER}"
+ ${registerExtension} "$INSTDIR\program\main.exe " ".mmp" "NanoEngineer-1 File"
+SectionEnd
+
+
+Function un.onUninstSuccess
+ HideWindow
+ MessageBox MB_ICONINFORMATION|MB_OK "$(^Name) was successfully removed from your computer."
+FunctionEnd
+
+Function un.onInit
+ MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 "Are you sure you want to completely remove $(^Name) and all of its components?" IDYES +2
+ Abort
+FunctionEnd
+
+Section Uninstall
+ Delete "$INSTDIR\*"
+ RMDir /r "$INSTDIR\src"
+ RMDir /r "$INSTDIR\program"
+ RMDir /r "$INSTDIR\plugins"
+ RMDir /r "$INSTDIR\partlib"
+ RMDir /r "$INSTDIR\Licenses"
+ RMDir /r "$INSTDIR\doc"
+ RMDir /r "$INSTDIR\bin"
+ RMDir /r "$INSTDIR\source"
+ RMDir "$INSTDIR"
+ RMDir "$PROGRAMFILES\Nanorex"
+
+ Delete "$DESKTOP\NanoEngineer-1.lnk"
+
+ RMDir /r "$SMPROGRAMS\Nanorex\NanoEngineer-1 v${PRODUCT_VERSION}"
+ RMDir "$SMPROGRAMS\Nanorex"
+
+ DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}"
+ DeleteRegKey HKLM "${PRODUCT_DIR_REGKEY}"
+ ${unregisterExtension} ".mmp" "NanoEngineer-1 File"
+ SetAutoClose true
+SectionEnd
|