Author: peterw Date: Sat Nov 10 05:24:43 2007 New Revision: 30313
URL: http://svn.reactos.org/svn/reactos?rev=30313&view=rev Log: - Switch to MUI2, have optional components selected by default and deactivate the license page for the time being.
Modified: trunk/tools/RosBE/RosBE-Windows/RosBE.nsi trunk/tools/RosBE/RosBE-Windows/RosSourceDir.nsh
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 (original) +++ trunk/tools/RosBE/RosBE-Windows/RosBE.nsi Sat Nov 10 05:24:43 2007 @@ -31,7 +31,8 @@ CRCCheck force SetCompressor /FINAL /SOLID lzma
-!include "MUI.nsh" +!include "MUI2.nsh" +!include "InstallOptions.nsh" !include "RosSourceDir.nsh" !include "LogicLib.nsh"
@@ -43,7 +44,7 @@ Function .onInit Call CheckAdminOrCurrent Call UninstallPrevious - !insertmacro MUI_INSTALLOPTIONS_EXTRACT "RosSourceDir.ini" + !insertmacro INSTALLOPTIONS_EXTRACT "RosSourceDir.ini" FunctionEnd
;; @@ -56,7 +57,7 @@
!define MUI_WELCOMEPAGE_TITLE_3LINES !insertmacro MUI_PAGE_WELCOME -!insertmacro MUI_PAGE_LICENSE "Root\License.txt" +;!insertmacro MUI_PAGE_LICENSE "Root\License.txt" !insertmacro MUI_PAGE_DIRECTORY
;; @@ -93,7 +94,7 @@ ;; ;; Language and reserve files ;; -!insertmacro MUI_RESERVEFILE_INSTALLOPTIONS +ReserveFile "${NSISDIR}\Plugins\InstallOptions.dll" !insertmacro MUI_LANGUAGE "English"
;; MUI end. @@ -130,7 +131,7 @@ File /r Components\4.1.3*.* SectionEnd
-Section /o "RosBE Configurator" SEC03 +Section "RosBE Configurator (options)" SEC03 SetShellVarContext current SetOutPath "$INSTDIR" SetOverwrite try @@ -146,7 +147,7 @@ !insertmacro MUI_STARTMENU_WRITE_END SectionEnd
-Section /o "SVN Tools" SEC04 +Section "SVN Tools (ssvn)" SEC04 SetShellVarContext current SetOutPath "$INSTDIR" SetOverwrite try @@ -166,7 +167,7 @@ File /r Root\Tools\licenses*.* SectionEnd
-Section /o "Shortcut Tool" SEC05 +Section "Shortcut Tool (scut)" SEC05 SetShellVarContext current SetOutPath "$INSTDIR" SetOverwrite try @@ -176,14 +177,14 @@ File /r Root\Tools\scut.exe SectionEnd
-Section /o "CCache" SEC06 +Section "CCache" SEC06 SetShellVarContext current SetOutPath "$INSTDIR\4.1.3\bin" SetOverwrite try File /r Root\Tools\ccache.exe SectionEnd
-Section /o "relAddr2Line Tool" SEC07 +Section "relAddr2Line Tool" SEC07 SetShellVarContext current SetOutPath "$INSTDIR" SetOverwrite try @@ -195,7 +196,7 @@ File /r Root\Tools\chkslash.exe SectionEnd
-Section /o "Other Tools" SEC08 +Section "Other Tools (chdefdir, chdefgcc and config)" SEC08 SetShellVarContext current SetOutPath "$INSTDIR" SetOverwrite try
Modified: trunk/tools/RosBE/RosBE-Windows/RosSourceDir.nsh URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/RosSource... ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/RosSourceDir.nsh (original) +++ trunk/tools/RosBE/RosBE-Windows/RosSourceDir.nsh Sat Nov 10 05:24:43 2007 @@ -6,11 +6,11 @@
Function RosDir.show !insertmacro MUI_HEADER_TEXT "Select ReactOS Source Location" "Select the directory where the ReactOS sources are located or will be checked out to later." - !insertmacro MUI_INSTALLOPTIONS_WRITE "RosSourceDir.ini" "Field 2" "State" "$INSTDIR\Source" - !insertmacro MUI_INSTALLOPTIONS_DISPLAY "RosSourceDir.ini" + !insertmacro INSTALLOPTIONS_WRITE "RosSourceDir.ini" "Field 2" "State" "$INSTDIR\Source" + !insertmacro INSTALLOPTIONS_DISPLAY "RosSourceDir.ini" FunctionEnd
Function RosDir.leave - !insertmacro MUI_INSTALLOPTIONS_READ $REACTOS_SOURCE_DIRECTORY "RosSourceDir.ini" "Field 2" "State" + !insertmacro INSTALLOPTIONS_READ $REACTOS_SOURCE_DIRECTORY "RosSourceDir.ini" "Field 2" "State" FunctionEnd !macroend