[ros-diffs] [dreimer] 35974: More cleanup.

Author: dreimer
Date: Sat Sep  6 02:57:53 2008
New Revision: 35974

URL: http://svn.reactos.org/svn/reactos?rev=35974&view=rev
Log:
More cleanup.

Modified:
    trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd
    trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd
    trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd
    trunk/tools/RosBE/RosBE-Windows/Root/charch.cmd
    trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd

Modified: trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Bui…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd [iso-8859-1] Sat Sep  6 02:57:53 2008
@@ -61,14 +61,12 @@
     set CCACHE_DIR=%APPDATA%\RosBE\.ccache
     set HOST_CC=ccache gcc
     set HOST_CPP=ccache g++
+    set TARGET_CC=ccache gcc
+    set TARGET_CPP=ccache g++
     if .%ROS_ARCH%. == .arm. (
         set TARGET_CC=ccache arm-pc-mingw32-gcc
         set TARGET_CPP=ccache arm-pc-mingw32-g++
     )
-    if .%ROS_ARCH%. == .i386. (
-        set TARGET_CC=ccache gcc
-        set TARGET_CPP=ccache g++
-    )
     if .%ROS_ARCH%. == .amd64. (
         set TARGET_CC=ccache x86_64-pc-mingw32-gcc
         set TARGET_CPP=ccache x86_64-pc-mingw32-g++
@@ -80,14 +78,12 @@
 ) else (
     set HOST_CC=gcc
     set HOST_CPP=g++
+    set TARGET_CC=gcc
+    set TARGET_CPP=g++
     if .%ROS_ARCH%. == .arm. (
         set TARGET_CC=arm-pc-mingw32-gcc
         set TARGET_CPP=arm-pc-mingw32-g++
     )
-    if .%ROS_ARCH%. == .i386. (
-        set TARGET_CC=gcc
-        set TARGET_CPP=g++
-    )
     if .%ROS_ARCH%. == .amd64. (
         set TARGET_CC=x86_64-pc-mingw32-gcc
         set TARGET_CPP=x86_64-pc-mingw32-g++
@@ -140,16 +136,16 @@
 ::
 if "%1" == "multi" (
     if not "%2" == "" (
-        title 'makex %2' parallel build started: %TIMERAW% %ROS_ARCH%
-    ) else (
-        title 'makex' parallel build started: %TIMERAW% %ROS_ARCH%
+        title 'makex %2' parallel build started: %TIMERAW%   %ROS_ARCH%
+    ) else (
+        title 'makex' parallel build started: %TIMERAW%   %ROS_ARCH%
     )
     call :BUILDMULTI %*
 ) else (
     if not "%1" == "" (
-        title 'make %1' build started: %TIMERAW% %ROS_ARCH%
-    ) else (
-        title 'make' build started: %TIMERAW% %ROS_ARCH%
+        title 'make %1' build started: %TIMERAW%   %ROS_ARCH%
+    ) else (
+        title 'make' build started: %TIMERAW%   %ROS_ARCH%
     )
     call :BUILD %*
 )

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] Sat Sep  6 02:57:53 2008
@@ -65,30 +65,6 @@
         )
         if exist "makefile-arm.auto" (
             del "makefile-arm.auto" 1> NUL 2> NUL
-        )
-        echo Done cleaning ReactOS source directory.
-    ) else (
-        echo ERROR: There is no compiler output to clean.
-    )
-    goto :ROS
-)
-if .%ROS_ARCH%. == .i386. (
-    ::
-    :: 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
-        )
-        if exist "makefile.auto" (
-            del "makefile.auto" 1> NUL 2> NUL
         )
         echo Done cleaning ReactOS source directory.
     ) else (

Modified: trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Hel…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd [iso-8859-1] Sat Sep  6 02:57:53 2008
@@ -109,7 +109,7 @@
     if /i "%1" == "charch" (
         echo Usage: charch [OPTIONS]
         echo Change the ReactOS source directory for the current RosBE session.
-        echo Possible Architectures are: x86, ppc, arm.
+        echo Possible Architectures are: i386, ppc, arm, amd64.
         echo.
         goto :EOC
     )

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] Sat Sep  6 02:57:53 2008
@@ -66,3 +66,8 @@
 if defined _ROSBE_VERSION (
     title ReactOS Build Environment %_ROSBE_VERSION%
 )
+
+::
+:: Unload all used Vars.
+::
+set _1=

Modified: trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/ros…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd [iso-8859-1] Sat Sep  6
02:57:53 2008
@@ -26,10 +26,6 @@
 ::
 :: Set the Arch Variables
 ::
-if .%_ROSBE_ARCH%. == .0. (
-    set ROS_ARCH=
-    set ROS_PREFIX=
-)
 if .%_ROSBE_ARCH%. == .1. (
     set ROS_ARCH=arm
     set ROS_PREFIX=arm-pc-mingw32