[dreimer] 30268: Added CCache to the Install Selection. Sorted the Section a bit more effective.

Author: dreimer
Date: Thu Nov  8 15:29:02 2007
New Revision: 30268

URL: http://svn.reactos.org/svn/reactos?rev=30268&view=rev
Log:
Added CCache to the Install Selection.
Sorted the Section a bit more effective.

Modified:
    trunk/tools/RosBE-Windows/Root/ChangeLog.txt
    trunk/tools/RosBE-Windows/RosBE.nsi

Modified: trunk/tools/RosBE-Windows/Root/ChangeLog.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/ChangeLog…
==============================================================================
--- trunk/tools/RosBE-Windows/Root/ChangeLog.txt (original)
+++ trunk/tools/RosBE-Windows/Root/ChangeLog.txt Thu Nov  8 15:29:02 2007
@@ -3,6 +3,7 @@
 - Updated: GCC 4.1.3 Build 20071015 with recent patches to get makex run under Vista.
(Peter Ward, TODO: name of tamlin)
 - Updated: Binutils 2.18.50 Build 20071015. (Peter Ward)
 - Updated: NASM to 0.99.06 (Daniel Reimer)
+- Updated: You can now select the components you want to install. (Daniel Reimer)
 
 - Updated RosBE Configuration Tool. (Pierre Schweitzer, Peter Ward, Daniel Reimer)
    - Added French translation. (Pierre Schweitzer)
@@ -53,7 +54,7 @@
 - Fix a warning in echoh.c. (Peter Ward)
 - Fix options.exe compile with RosBE 0.3.8.1 (Peter Ward)
 - Merged the NSIS files back together. (Peter Ward)
-- Rewrote Scut in C. (Peter Ward) 
+- Rewrote Scut in C. (Peter Ward)
 
 - Heaviliy cleaning up the .cmd files. (Peter Ward, Daniel Reimer)
    - Remove typos. (Peter Ward, Daniel Reimer)
@@ -70,7 +71,7 @@
    - Added more Error Messages to prevent confusion and stupid mistakes. (Daniel Reimer)
    - Remove trailing Spaces. (Daniel Reimer)
    - Make helpfile entries dependant on the installed optional files. (Daniel Reimer)
-   - Added echo Messages which tell a sucessful process. (Daniel Reimer)
+   - Added echo Messages which inform you about a sucessful process. (Daniel Reimer)
    - Sorted and fixed parts of the help. (Daniel Reimer, Peter Ward)
    - Modify many "if" to "if /I" to ignore lower and upper case.
(Daniel Reimer)
    - Modify ERROR messages in scut to abort the process when Name and Path are specified
by Shell Commands, too. (Daniel Reimer)

Modified: trunk/tools/RosBE-Windows/RosBE.nsi
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/RosBE.nsi?rev=…
==============================================================================
--- trunk/tools/RosBE-Windows/RosBE.nsi (original)
+++ trunk/tools/RosBE-Windows/RosBE.nsi Thu Nov  8 15:29:02 2007
@@ -98,7 +98,7 @@
 
 ;; MUI end.
 
-Section -BaseFiles SEC02
+Section -BaseFiles SEC01
     SetShellVarContext current
     SetOutPath "$INSTDIR"
     SetOverwrite try
@@ -124,13 +124,29 @@
     File /r Root\Tools\tee.exe
 SectionEnd
 
-Section -MinGWGCCNASM SEC01
-    SetOutPath "$INSTDIR\4.1.3\"
+Section -MinGWGCCNASM SEC02
+    SetOutPath "$INSTDIR\4.1.3"
     SetOverwrite try
     File /r Components\4.1.3\*.*
 SectionEnd
 
-Section /o "SVN Tools" SEC03
+Section /o "RosBE Configurator" SEC03
+    SetShellVarContext current
+    SetOutPath "$INSTDIR"
+    SetOverwrite try
+    File /r Root\options.cmd
+    SetOutPath "$INSTDIR\Tools"
+    SetOverwrite try
+    File /r Root\Tools\options.exe
+    !insertmacro MUI_STARTMENU_WRITE_BEGIN Application
+        CreateDirectory "$SMPROGRAMS\$ICONS_GROUP"
+        SetOutPath $REACTOS_SOURCE_DIRECTORY
+        CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\Options.lnk" \
+                       "$INSTDIR\Tools\options.exe"
+    !insertmacro MUI_STARTMENU_WRITE_END
+SectionEnd
+
+Section /o "SVN Tools" SEC04
     SetShellVarContext current
     SetOutPath "$INSTDIR"
     SetOverwrite try
@@ -150,7 +166,24 @@
     File /r Root\Tools\licenses\*.*
 SectionEnd
 
-Section /o "relAddr2Line Tool" SEC04
+Section /o "Shortcut Tool" SEC05
+    SetShellVarContext current
+    SetOutPath "$INSTDIR"
+    SetOverwrite try
+    File /r Root\scut.cmd
+    SetOutPath "$INSTDIR\Tools"
+    SetOverwrite try
+    File /r Root\Tools\scut.exe
+SectionEnd
+
+Section /o "CCache" SEC06
+    SetShellVarContext current
+    SetOutPath "$INSTDIR\4.1.3\bin"
+    SetOverwrite try
+    File /r Root\Tools\ccache.exe
+SectionEnd
+
+Section /o "relAddr2Line Tool" SEC07
     SetShellVarContext current
     SetOutPath "$INSTDIR"
     SetOverwrite try
@@ -162,34 +195,7 @@
     File /r Root\Tools\chkslash.exe
 SectionEnd
 
-Section /o "RosBE Configurator" SEC05
-    SetShellVarContext current
-    SetOutPath "$INSTDIR"
-    SetOverwrite try
-    File /r Root\options.cmd
-    SetOutPath "$INSTDIR\Tools"
-    SetOverwrite try
-    File /r Root\Tools\options.exe
-    !insertmacro MUI_STARTMENU_WRITE_BEGIN Application
-        CreateDirectory "$SMPROGRAMS\$ICONS_GROUP"
-        SetOutPath $REACTOS_SOURCE_DIRECTORY
-        CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\Options.lnk" \
-                       "$INSTDIR\Tools\options.exe"
-    !insertmacro MUI_STARTMENU_WRITE_END
-
-SectionEnd
-
-Section /o "Shortcut Tool" SEC06
-    SetShellVarContext current
-    SetOutPath "$INSTDIR"
-    SetOverwrite try
-    File /r Root\scut.cmd
-    SetOutPath "$INSTDIR\Tools"
-    SetOverwrite try
-    File /r Root\Tools\scut.exe
-SectionEnd
-
-Section /o "Other Tools" SEC07
+Section /o "Other Tools" SEC08
     SetShellVarContext current
     SetOutPath "$INSTDIR"
     SetOverwrite try
@@ -198,7 +204,7 @@
     File /r Root\Config.cmd
 SectionEnd
 
-Section -StartMenuShortcuts SEC08
+Section -StartMenuShortcuts SEC09
     SetShellVarContext current
 
     ;;
@@ -216,7 +222,7 @@
     !insertmacro MUI_STARTMENU_WRITE_END
 SectionEnd
 
-Section /o "Desktop Shortcuts" SEC09
+Section /o "Desktop Shortcuts" SEC10
     SetShellVarContext current
 
     ;;
@@ -226,7 +232,7 @@
     CreateShortCut "$DESKTOP\ReactOS Build Environment.lnk"
"$SYSDIR\cmd.exe" '/k "$INSTDIR\RosBE.cmd"'
"$INSTDIR\terminal.ico"
 SectionEnd
 
-Section /o "Quick Launch Shortcuts" SEC10
+Section /o "Quick Launch Shortcuts" SEC11
     SetShellVarContext current
 
     ;;
@@ -236,7 +242,7 @@
     CreateShortCut "$QUICKLAUNCH\ReactOS Build Environment.lnk"
"$SYSDIR\cmd.exe" '/k "$INSTDIR\RosBE.cmd"'
"$INSTDIR\terminal.ico"
 SectionEnd
 
-Section -Post SEC11
+Section -Post SEC12
     WriteUninstaller "$INSTDIR\Uninstall-${PRODUCT_VERSION}.exe"
     WriteRegStr HKCU "${PRODUCT_DIR_REGKEY}" ""
"$INSTDIR\RosBE.cmd"
     WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}"
"DisplayName" "$(^Name)"