Author: dreimer Date: Wed Oct 1 08:29:19 2008 New Revision: 36611
URL: http://svn.reactos.org/svn/reactos?rev=36611&view=rev Log: Updated 64 Bit Target NSIS Script. Still tbd: Proper Uninstall Part.
Modified: trunk/tools/RosBE/RosBE-Windows/RosBE.nsi trunk/tools/RosBE/RosBE-Windows/RosBE64.nsi
Modified: trunk/tools/RosBE/RosBE-Windows/RosBE.nsi URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/RosBE.nsi... ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/RosBE.nsi [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/RosBE.nsi [iso-8859-1] Wed Oct 1 08:29:19 2008 @@ -25,7 +25,7 @@ VIAddVersionKey /LANG=1033 "LegalTrademarks" "Copyright © 2008 ReactOS Team" VIAddVersionKey /LANG=1033 "LegalCopyright" "Copyright © 2008 ReactOS Team" VIAddVersionKey /LANG=1033 "FileDescription" "${PRODUCT_NAME} Setup" -VIProductVersion "1.2.0.0" +VIProductVersion "1.3.0.0"
CRCCheck force SetCompressor /FINAL /SOLID lzma
Modified: trunk/tools/RosBE/RosBE-Windows/RosBE64.nsi URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/RosBE64.n... ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/RosBE64.nsi [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/RosBE64.nsi [iso-8859-1] Wed Oct 1 08:29:19 2008 @@ -1,5 +1,5 @@ -!define PRODUCT_NAME "ReactOS Build Environment for Windows" -!define PRODUCT_VERSION "1.3" +!define PRODUCT_NAME "ReactOS Build Environment for Windows - 64 Bit Target Compiler" +!define PRODUCT_VERSION "1.0" !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\RosBE.cmd" !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall${PRODUCT_NAME}" !define PRODUCT_UNINST_ROOT_KEY "HKCU" @@ -9,7 +9,7 @@ ;; Basic installer options ;; Name "${PRODUCT_NAME} ${PRODUCT_VERSION}" -OutFile "RosBE-${PRODUCT_VERSION}.exe" +OutFile "RosBE64-${PRODUCT_VERSION}.exe" InstallDirRegKey HKCU "${PRODUCT_DIR_REGKEY}" "" ShowInstDetails show ShowUnInstDetails show @@ -17,7 +17,7 @@ ;; ;; Add version/product information metadata to the installation file. ;; -VIAddVersionKey /LANG=1033 "FileVersion" "1.3.0.0" +VIAddVersionKey /LANG=1033 "FileVersion" "1.0.0.0" VIAddVersionKey /LANG=1033 "ProductVersion" "${PRODUCT_VERSION}" VIAddVersionKey /LANG=1033 "ProductName" "${PRODUCT_NAME}" VIAddVersionKey /LANG=1033 "Comments" "This installer was written by Peter Ward and Daniel Reimer using Nullsoft Scriptable Install System (http://nsis.sourceforge.net/)" @@ -25,7 +25,7 @@ VIAddVersionKey /LANG=1033 "LegalTrademarks" "Copyright © 2008 ReactOS Team" VIAddVersionKey /LANG=1033 "LegalCopyright" "Copyright © 2008 ReactOS Team" VIAddVersionKey /LANG=1033 "FileDescription" "${PRODUCT_NAME} Setup" -VIProductVersion "1.2.0.0" +VIProductVersion "1.0.0.0"
CRCCheck force SetCompressor /FINAL /SOLID lzma @@ -111,155 +111,17 @@ SetOverwrite try File /r Icons\mingw.ico File /r Icons\rosbe.ico - File /r Root\README.pdf - File /r Root\RosBE.mac - File /r Root\changelog.txt File /r Root\LICENSE.txt - File /r Root\MinGW.cmd File /r Root\charch.cmd - File /r Root\MinGW.mac - File /r Root\Build.cmd - File /r Root\chdefgcc.cmd - File /r Root\Clean.cmd - File /r Root\Help.cmd - File /r Root\RosBE.cmd - File /r Root\rosbe-gcc-env.cmd - File /r Root\TimeDate.cmd - SetOutPath "$INSTDIR\Tools" - SetOverwrite try - File /r Components\Tools\buildtime.exe - File /r Components\Tools\chknewer.exe - File /r Components\Tools\cpucount.exe - File /r Components\Tools\flash.exe - File /r Components\Tools\getdate.exe - File /r Components\Tools\rquote.exe - File /r Components\Tools\tee.exe SectionEnd
Section -MinGWGCCNASM SEC02 SetOutPath "$INSTDIR\4.1.3" SetOverwrite try - File /r Components\4.1.3*.* -SectionEnd - -Section "RosBE Configurator (options)" SEC03 - SetShellVarContext current - SetOutPath "$INSTDIR" - SetOverwrite try - File /r Root\options.cmd - SetOutPath "$INSTDIR\Tools" - SetOverwrite try - File /r Components\Tools\options.exe - !insertmacro MUI_STARTMENU_WRITE_BEGIN Application - CreateDirectory "$SMPROGRAMS$ICONS_GROUP" - SetOutPath $INSTDIR - CreateShortCut "$SMPROGRAMS$ICONS_GROUP\Options.lnk" \ - "$INSTDIR\Tools\options.exe" - !insertmacro MUI_STARTMENU_WRITE_END -SectionEnd - -Section "Subversion Tools (svn, ssvn)" SEC04 - SetShellVarContext current - SetOutPath "$INSTDIR" - SetOverwrite try - File /r Root\sSVN.cmd - SetOutPath "$INSTDIR\Tools" - SetOverwrite try - File /r Components\Tools\svn.exe - File /r Components\Tools\intl3_svn.dll - File /r Components\Tools\libapr.dll - File /r Components\Tools\libeay32.dll - File /r Components\Tools\ssleay32.dll - File /r Components\Tools\libaprutil.dll - File /r Components\Tools\libdb44.dll - File /r Components\Tools\libapriconv.dll - File /r Components\Tools\libsasl.dll - File /r Components\Tools\libsvn_client-1.dll - File /r Components\Tools\libsvn_delta-1.dll - File /r Components\Tools\libsvn_diff-1.dll - File /r Components\Tools\libsvn_fs-1.dll - File /r Components\Tools\libsvn_ra-1.dll - File /r Components\Tools\libsvn_repos-1.dll - File /r Components\Tools\libsvn_subr-1.dll - File /r Components\Tools\libsvn_wc-1.dll - SetOutPath "$INSTDIR\Tools\licenses" - SetOverwrite try - File /r Components\Tools\licenses*.* -SectionEnd - -Section "Shortcut Tool (scut)" SEC05 - SetShellVarContext current - SetOutPath "$INSTDIR" - SetOverwrite try - File /r Root\scut.cmd - SetOutPath "$INSTDIR\Tools" - SetOverwrite try - File /r Components\Tools\scut.exe -SectionEnd - -Section "ccache - Compiler Cache" SEC06 - SetShellVarContext current - SetOutPath "$INSTDIR\4.1.3\bin" - SetOverwrite try - File /r Components\Tools\ccache.exe -SectionEnd - -Section "GDB - The GNU Project Debugger" SEC07 - SetShellVarContext current - SetOutPath "$INSTDIR\4.1.3\bin" - SetOverwrite try - File /r Components\Tools\gdb.exe - File /r Components\Tools\gdbserver.exe -SectionEnd - -Section "relAddr2Line Tool" SEC08 - SetShellVarContext current - SetOutPath "$INSTDIR" - SetOverwrite try - File /r Root\reladdr2line.cmd - SetOutPath "$INSTDIR\Tools" - SetOverwrite try - File /r Components\Tools\echoh.exe - File /r Components\Tools\raddr2line.exe - File /r Components\Tools\chkslash.exe -SectionEnd - -Section "Other Tools (chdefdir and config)" SEC09 - SetShellVarContext current - SetOutPath "$INSTDIR" - SetOverwrite try - File /r Root\chdefdir.cmd - File /r Root\Config.cmd -SectionEnd - -Section "PowerShell RosBE Version" SEC10 - SetShellVarContext current - SetOutPath "$INSTDIR" - SetOverwrite try - File /r Root\sSVN.cmd - File /r Components\Powershell\Build.ps1 - File /r Components\Powershell\Clean.ps1 - File /r Components\Powershell\Help.ps1 - File /r Components\Powershell\MinGW.ps1 - File /r Components\Powershell\RosBE.ps1 - File /r Components\Powershell\rosbe-gcc-env.ps1 -SectionEnd - -Section "Update Script" SEC11 - SetShellVarContext current - SetOutPath "$INSTDIR\Tools" - SetOverwrite try - File /r Components\Tools\wget.exe - File /r Components\Tools\libintl3.dll - File /r Components\Tools\libeay32.dll - File /r Components\Tools\ssleay32.dll - File /r Components\Tools\libiconv2.dll - SetOutPath "$INSTDIR" - SetOverwrite try - File /r Root\update.cmd -SectionEnd - -Section -StartMenuShortcuts SEC12 + File /r Components\4.4.0*.* +SectionEnd + +Section -StartMenuShortcuts SEC03 SetShellVarContext current
;; @@ -268,64 +130,50 @@ !insertmacro MUI_STARTMENU_WRITE_BEGIN Application CreateDirectory "$SMPROGRAMS$ICONS_GROUP" SetOutPath $REACTOS_SOURCE_DIRECTORY - CreateShortCut "$SMPROGRAMS$ICONS_GROUP\ReactOS Build Environment.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\RosBE.cmd"' "$INSTDIR\rosbe.ico" - SetOutPath $REACTOS_SOURCE_DIRECTORY CreateShortCut "$SMPROGRAMS$ICONS_GROUP\ReactOS Build Environment 64-bit.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\RosBE.cmd" amd64' "$INSTDIR\rosbe.ico" - SetOutPath $PROFILE - CreateShortCut "$SMPROGRAMS$ICONS_GROUP\Standard MinGW Build Environment.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\MinGW.cmd"' "$INSTDIR\mingw.ico" SetOutPath $INSTDIR - CreateShortCut "$SMPROGRAMS$ICONS_GROUP\Uninstall RosBE.lnk" \ - "$INSTDIR\Uninstall-${PRODUCT_VERSION}.exe" - CreateShortCut "$SMPROGRAMS$ICONS_GROUP\Readme.lnk" \ - "$INSTDIR\README.pdf" + CreateShortCut "$SMPROGRAMS$ICONS_GROUP\Uninstall RosBE - 64 Bit Target.lnk" \ + "$INSTDIR\Uninstall64-${PRODUCT_VERSION}.exe" !insertmacro MUI_STARTMENU_WRITE_END SectionEnd
-Section /o "Desktop Shortcuts" SEC13 +Section /o "Desktop Shortcuts" SEC04 SetShellVarContext current
;; ;; Add our desktop shortcuts. ;; - SetOutPath $REACTOS_SOURCE_DIRECTORY - CreateShortCut "$DESKTOP\ReactOS Build Environment.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\RosBE.cmd"' "$INSTDIR\rosbe.ico" SetOutPath $REACTOS_SOURCE_DIRECTORY CreateShortCut "$DESKTOP\ReactOS Build Environment 64-bit.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\RosBE.cmd" amd64' "$INSTDIR\rosbe.ico" - SetOutPath $PROFILE - CreateShortCut "$DESKTOP\Standard MinGW Build Environment.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\MinGW.cmd"' "$INSTDIR\mingw.ico" -SectionEnd - -Section /o "Quick Launch Shortcuts" SEC14 +SectionEnd + +Section /o "Quick Launch Shortcuts" SEC05 SetShellVarContext current
;; ;; Add our quick launch shortcuts. ;; - SetOutPath $REACTOS_SOURCE_DIRECTORY - CreateShortCut "$QUICKLAUNCH\ReactOS Build Environment.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\RosBE.cmd"' "$INSTDIR\rosbe.ico" SetOutPath $REACTOS_SOURCE_DIRECTORY CreateShortCut "$QUICKLAUNCH\ReactOS Build Environment 64-bit.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\RosBE.cmd" amd64' "$INSTDIR\rosbe.ico" - SetOutPath $PROFILE - CreateShortCut "$QUICKLAUNCH\Standard MinGW Build Environment.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\MinGW.cmd"' "$INSTDIR\mingw.ico" -SectionEnd - -Section -Post SEC15 - WriteUninstaller "$INSTDIR\Uninstall-${PRODUCT_VERSION}.exe" +SectionEnd + +Section -Post SEC06 + WriteUninstaller "$INSTDIR\Uninstall64-${PRODUCT_VERSION}.exe" WriteRegStr HKCU "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\RosBE.cmd" WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "$(^Name)" - WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\Uninstall-${PRODUCT_VERSION}.exe" + WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\Uninstall64-${PRODUCT_VERSION}.exe" WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}" SectionEnd
Function un.onUninstSuccess HideWindow MessageBox MB_ICONINFORMATION|MB_OK \ - "ReactOS Build Environment was successfully removed from your computer." + "ReactOS Build Environment - 64 Bit Target 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 ReactOS Build Environment and all of its components?" \ + "Are you sure you want to completely remove ReactOS Build Environment - 64 Bit Target and all of its components?" \ IDYES +2 Abort FunctionEnd @@ -338,59 +186,14 @@ ;; Clean up installed files. ;; RMDir /r /REBOOTOK "$INSTDIR\4.1.3" - RMDir /r /REBOOTOK "$INSTDIR\Tools" - RMDir /r /REBOOTOK "$SMPROGRAMS$ICONS_GROUP" - IfFileExists "$PROFILE\RosBE." 0 +2 - RMDir /r /REBOOTOK "$PROFILE\RosBE" - IfFileExists "$APPDATA\RosBE." 0 +2 - RMDir /r /REBOOTOK "$APPDATA\RosBE" - Delete /REBOOTOK "$INSTDIR\Build.cmd" - Delete /REBOOTOK "$INSTDIR\Build.ps1" Delete /REBOOTOK "$INSTDIR\charch.cmd" - Delete /REBOOTOK "$INSTDIR\chdefdir.cmd" - Delete /REBOOTOK "$INSTDIR\chdefgcc.cmd" - Delete /REBOOTOK "$INSTDIR\Clean.cmd" - Delete /REBOOTOK "$INSTDIR\Clean.ps1" - Delete /REBOOTOK "$INSTDIR\Config.cmd" - Delete /REBOOTOK "$INSTDIR\Help.cmd" - Delete /REBOOTOK "$INSTDIR\Help.ps1" - Delete /REBOOTOK "$INSTDIR\MinGW.cmd" - Delete /REBOOTOK "$INSTDIR\MinGW.ps1" - Delete /REBOOTOK "$INSTDIR\options.cmd" - Delete /REBOOTOK "$INSTDIR\reladdr2line.cmd" - Delete /REBOOTOK "$INSTDIR\RosBE.cmd" - Delete /REBOOTOK "$INSTDIR\RosBE.ps1" - Delete /REBOOTOK "$INSTDIR\rosbe-gcc-env.cmd" - Delete /REBOOTOK "$INSTDIR\rosbe-gcc-env.ps1" - Delete /REBOOTOK "$INSTDIR\scut.cmd" - Delete /REBOOTOK "$INSTDIR\sSVN.cmd" - Delete /REBOOTOK "$INSTDIR\TimeDate.cmd" - Delete /REBOOTOK "$INSTDIR\update.cmd" - Delete /REBOOTOK "$INSTDIR\README.pdf" - Delete /REBOOTOK "$INSTDIR\rosbe.ico" - Delete /REBOOTOK "$INSTDIR\mingw.ico" - Delete /REBOOTOK "$INSTDIR\uninstall.ico" - Delete /REBOOTOK "$INSTDIR\MinGW.mac" - Delete /REBOOTOK "$INSTDIR\RosBE.mac" - Delete /REBOOTOK "$INSTDIR\ChangeLog.txt" - Delete /REBOOTOK "$INSTDIR\LICENSE.txt" - Delete /REBOOTOK "$INSTDIR\srclist.txt" - Delete /REBOOTOK "$INSTDIR\config.rbuild" Delete /REBOOTOK "$INSTDIR\Uninstall-${PRODUCT_VERSION}.exe" ;; Whoever dares to change this back into: RMDir /r /REBOOTOK "$INSTDIR" will be KILLED!!! RMDir /REBOOTOK "$INSTDIR" - IfFileExists "$DESKTOP\ReactOS Build Environment.lnk" 0 +2 - Delete /REBOOTOK "$DESKTOP\ReactOS Build Environment.lnk" IfFileExists "$DESKTOP\ReactOS Build Environment 64-bit.lnk" 0 +2 Delete /REBOOTOK "$DESKTOP\ReactOS Build Environment 64-bit.lnk" - IfFileExists "$QUICKLAUNCH\ReactOS Build Environment.lnk" 0 +2 - Delete /REBOOTOK "$QUICKLAUNCH\ReactOS Build Environment.lnk" IfFileExists "$QUICKLAUNCH\ReactOS Build Environment 64-bit.lnk" 0 +2 Delete /REBOOTOK "$QUICKLAUNCH\ReactOS Build Environment 64-bit.lnk" - IfFileExists "$DESKTOP\Standard MinGW Build Environment.lnk" 0 +2 - Delete /REBOOTOK "$DESKTOP\Standard MinGW Build Environment.lnk" - IfFileExists "$QUICKLAUNCH\Standard MinGW Build Environment.lnk" 0 +2 - Delete /REBOOTOK "$QUICKLAUNCH\Standard MinGW Build Environment.lnk"
;; ;; Clean up the registry.
-
dreimer＠svn.reactos.org