[dreimer] 41825: Update ChangeLog.txt Prepare Setup Scripts for RosBE64 1.1

Author: dreimer
Date: Thu Jul  9 16:42:08 2009
New Revision: 41825

URL: http://svn.reactos.org/svn/reactos?rev=41825&view=rev
Log:
Update ChangeLog.txt
Prepare Setup Scripts for RosBE64 1.1

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

Modified: trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Cha…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt [iso-8859-1] Thu Jul  9 16:42:08
2009
@@ -6,6 +6,12 @@
   * Installer uninstalls charch too.
   * Fixed some line skippers.
 (care2debug, Daniel Reimer)
+- AMD64 Addon Fixes:
+  * Fix the one dash too much problem.
+  * Fix the args not checked bug.
+(Samuel Serapion)
+- Prepare scripts for RosBE64 1.1 which is compatible with the new RosBE Versions (Daniel
Reimer)
+
 
 *** Jun 29th, 2009 - RosBE 1.4.4 Released
 

Modified: trunk/tools/RosBE/RosBE-Windows/RosBE64.nsi
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/RosBE64.…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/RosBE64.nsi [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/RosBE64.nsi [iso-8859-1] Thu Jul  9 16:42:08 2009
@@ -105,33 +105,13 @@
 ReserveFile "${NSISDIR}\Plugins\InstallOptions.dll"
 !insertmacro MUI_LANGUAGE "English"
 
-Section -BaseFiles SEC01
-    SetShellVarContext current
-    SetOutPath "$INSTDIR"
-    SetOverwrite try
-    File /r Root\charch.cmd
-    File /r Root\options.cmd
-    IfFileExists "$INSTDIR\RosBE.ps1" 0 +3
-        File /r Root\charch.ps1
-        File /r Root\options.ps1
-    SetOutPath "$INSTDIR\Tools"
-    SetOverwrite try
-    File /r Components\Tools\options64.exe
-    !insertmacro MUI_STARTMENU_WRITE_BEGIN Application
-        CreateDirectory "$SMPROGRAMS\$ICONS_GROUP"
-        SetOutPath $INSTDIR
-        CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\Options x86-64.lnk" \
-                       "$INSTDIR\Tools\options64.exe"
-    !insertmacro MUI_STARTMENU_WRITE_END
-SectionEnd
-
-Section -MinGWGCCNASM SEC02
+Section -MinGWGCCNASM SEC01
     SetOutPath "$INSTDIR\amd64"
     SetOverwrite try
     File /r Components\amd64\*.*
 SectionEnd
 
-Section -StartMenuShortcuts SEC03
+Section -StartMenuShortcuts SEC02
     SetShellVarContext current
 
     ;;
@@ -150,6 +130,24 @@
     !insertmacro MUI_STARTMENU_WRITE_END
 SectionEnd
 
+Section /o "Config Tool" SEC03
+    SetShellVarContext current
+    SetOutPath "$INSTDIR"
+    SetOverwrite try
+    File /r Root\options.cmd
+    IfFileExists "$INSTDIR\RosBE.ps1" 0 +3
+        File /r Root\options.ps1
+    SetOutPath "$INSTDIR\Tools"
+    SetOverwrite try
+    File /r Components\Tools\options64.exe
+    !insertmacro MUI_STARTMENU_WRITE_BEGIN Application
+        CreateDirectory "$SMPROGRAMS\$ICONS_GROUP"
+        SetOutPath $INSTDIR
+        CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\Options x86-64.lnk" \
+                       "$INSTDIR\Tools\options64.exe"
+    !insertmacro MUI_STARTMENU_WRITE_END
+SectionEnd
+
 Section /o "Desktop Shortcuts" SEC04
     SetShellVarContext current
 
@@ -205,8 +203,8 @@
     ;; Clean up installed files.
     ;;
     RMDir /r /REBOOTOK "$INSTDIR\x86_64"
-    Delete /REBOOTOK "$INSTDIR\charch.cmd"
-    Delete /REBOOTOK "$INSTDIR\charch.ps1"
+    Delete /REBOOTOK "$INSTDIR\Tools\options64.exe
+    Delete /REBOOTOK "$INSTDIR\Tools\options64.exe
     Delete /REBOOTOK "$INSTDIR\Uninstall-${PRODUCT_VERSION}.exe"
     ;; Whoever dares to change this back into: RMDir /r /REBOOTOK "$INSTDIR"
will be KILLED!!!
     RMDir /REBOOTOK "$INSTDIR"