[ros-diffs] [dreimer] 35877: Fixed some typos.

Author: dreimer
Date: Tue Sep  2 14:39:17 2008
New Revision: 35877

URL: http://svn.reactos.org/svn/reactos?rev=35877&view=rev
Log:
Fixed some typos.

Modified:
    trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt
    trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd
    trunk/tools/RosBE/RosBE-Windows/Root/charch.cmd
    trunk/tools/RosBE/RosBE-Windows/Root/update.cmd

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] Tue Sep  2 14:39:17
2008
@@ -13,6 +13,7 @@
 - Added: Update command (Daniel Reimer)
 - Fixed: Dependant on the Arch variable a crosscompiler will be used now. (Daniel
Reimer)
 - Fixed: Clean only cleans the arch which is active right now. (Daniel Reimer)
+- Fixed: "if defined xxx" with a nested "if %xxx% == foobar" does not
work in batch. (Daniel Reimer)
 - Fixed: Stripped apps and removed Debug Symbols at once may not be possible. (Daniel
Reimer)
 
 *** January 23rd, 2008 - RosBE 1.2 Released

Modified: trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Cle…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd [iso-8859-1] Tue Sep  2 14:39:17 2008
@@ -48,7 +48,7 @@
 
 :DEL
 
-if %ROS_ARCH% == arm (
+if .%ROS_ARCH%. == .arm. (
     ::
     :: Check if we have something to clean, if so, clean it.
     ::
@@ -68,7 +68,7 @@
         echo ERROR: There is no compiler output to clean.
     )
 )
-if %ROS_ARCH% == x86 (
+if .%ROS_ARCH%. == .x86. (
     ::
     :: Check if we have something to clean, if so, clean it.
     ::
@@ -88,7 +88,7 @@
         echo ERROR: There is no compiler output to clean.
     )
 )
-if %ROS_ARCH% == ppc (
+if .%ROS_ARCH%. == .ppc. (
     ::
     :: Check if we have something to clean, if so, clean it.
     ::
@@ -108,20 +108,40 @@
         echo ERROR: There is no compiler output to clean.
     )
 )
-if %ROS_ARCH% == amd64 (
+if .%ROS_ARCH%. == .amd64. (
     ::
     :: Check if we have something to clean, if so, clean it.
     ::
-    if exist "obj-x86_64\." (
+    if exist "obj-amd64\." (
         echo Cleaning ReactOS source directory...
         ::
         : Remove directories created by the build.
         ::
-        if exist "obj-x86_64\." (
-            rd /s /q "obj-x86_64" 1> NUL 2> NUL
+        if exist "obj-amd64\." (
+            rd /s /q "obj-amd64" 1> NUL 2> NUL
         )
-        if exist "output-x86_64\." (
-            rd /s /q "output-x86_64" 1> NUL 2> NUL
+        if exist "output-amd64\." (
+            rd /s /q "output-amd64" 1> NUL 2> NUL
+        )
+        echo Done cleaning ReactOS source directory.
+    ) else (
+        echo ERROR: There is no compiler output to clean.
+    )
+)
+if .%ROS_ARCH%. == .. (
+    ::
+    :: Check if we have something to clean, if so, clean it.
+    ::
+    if exist "obj-i386\." (
+        echo Cleaning ReactOS source directory...
+        ::
+        : Remove directories created by the build.
+        ::
+        if exist "obj-i386\." (
+            rd /s /q "obj-i386" 1> NUL 2> NUL
+        )
+        if exist "output-i386\." (
+            rd /s /q "output-i386" 1> NUL 2> NUL
         )
         echo Done cleaning ReactOS source directory.
     ) else (

Modified: trunk/tools/RosBE/RosBE-Windows/Root/charch.cmd
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/cha…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Root/charch.cmd [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Root/charch.cmd [iso-8859-1] Tue Sep  2 14:39:17 2008
@@ -35,12 +35,12 @@
     goto :EOC
 )
 if /i "%_1%" == "ppc" (
-    set ROS_ARCH==ppc
+    set ROS_ARCH=ppc
     set ROS_PREFIX=mingw32-ppc
     goto :EOC
 )
 if /i "%_1%" == "x64" (
-    set ROS_ARCH==amd64
+    set ROS_ARCH=amd64
     set ROS_PREFIX=mingw32-x86_64
     goto :EOC
 )

Modified: trunk/tools/RosBE/RosBE-Windows/Root/update.cmd
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/upd…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Root/update.cmd [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Root/update.cmd [iso-8859-1] Tue Sep  2 14:39:17 2008
@@ -208,8 +208,6 @@
     ::
     if exist GCC.7z (
         for %%F in (GCC.7z) do set _ROSBE_GCCDATE=%%~tF
-    ) else (
-        set _ROSBE_GCCDATE=0
     )
 
     "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/GCC.7z
@@ -232,8 +230,6 @@
     ::
     if exist Tools.7z (
         for %%F in (Tools.7z) do set _ROSBE_TOOLSDATE=%%~tF
-    ) else (
-        set _ROSBE_TOOOLSDATE=0
     )
 
     "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/Tools.7z