[dreimer] 37956: Some more clean up and code reduction.

Author: dreimer
Date: Tue Dec  9 02:39:06 2008
New Revision: 37956

URL: http://svn.reactos.org/svn/reactos?rev=37956&view=rev
Log:
Some more clean up and code reduction.

Modified:
    trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1
    trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1
    trunk/tools/RosBE/RosBE-Windows/Powershell/Config.ps1
    trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1
    trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd
    trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd
    trunk/tools/RosBE/RosBE-Windows/Root/Config.cmd
    trunk/tools/RosBE/RosBE-Windows/Root/charch.cmd
    trunk/tools/RosBE/RosBE-Windows/Root/chdefgcc.cmd
    trunk/tools/RosBE/RosBE-Windows/Root/options.cmd
    trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd
    trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd
    trunk/tools/RosBE/RosBE-Windows/Root/update.cmd

Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 [iso-8859-1] Tue Dec  9 02:39:06
2008
@@ -51,49 +51,20 @@
 if ($_ROSBE_USECCACHE -ne $null) {
     if ($_ROSBE_USECCACHE -eq 1) {
         $ENV:CCACHE_DIR = "$APPDATA\RosBE\.ccache"
-        $ENV:HOST_CC = "ccache gcc"
-        $ENV:HOST_CPP = "ccache g++"
-
-        #
-        #Target defaults to host(i386)
-        #
-
-        $ENV:TARGET_CC = "ccache gcc"
-        $ENV:TARGET_CPP = "ccache g++"
-        if ($ENV:ROS_ARCH -eq "arm") {
-            $ENV:TARGET_CC = "ccache arm-pc-mingw32-gcc"
-            $ENV:TARGET_CPP = "ccache arm-pc-mingw32-g++"
-        }
-        if ($ENV:ROS_ARCH -eq "amd64") {
-            $ENV:TARGET_CC = "ccache x86_64-pc-mingw32-gcc"
-            $ENV:TARGET_CPP = "ccache x86_64-pc-mingw32-g++"
-        }
-        if ($ENV:ROS_ARCH -eq "ppc") {
-            $ENV:TARGET_CC = "ccache ppc-pc-mingw32-gcc"
-            $ENV:TARGET_CPP = "ccache ppc-pc-mingw32-g++"
-        }
-    } else {
-        $ENV:HOST_CC = "gcc"
-        $ENV:HOST_CPP = "g++"
-
-        #
-        #Target defaults to host(i386)
-        #
-
-        $ENV:TARGET_CC = "gcc"
-        $ENV:TARGET_CPP = "g++"
-        if ($ENV:ROS_ARCH -eq "arm") {
-            $ENV:TARGET_CC = "arm-pc-mingw32-gcc"
-            $ENV:TARGET_CPP = "arm-pc-mingw32-g++"
-        }
-        if ($ENV:ROS_ARCH -eq "amd64") {
-            $ENV:TARGET_CC = "x86_64-pc-mingw32-gcc"
-            $ENV:TARGET_CPP = "x86_64-pc-mingw32-g++"
-        }
-        if ($ENV:ROS_ARCH -eq "ppc") {
-            $ENV:TARGET_CC = "ppc-pc-mingw32-gcc"
-            $ENV:TARGET_CPP = "ppc-pc-mingw32-g++"
-        }
+        $_ROSBE_CCACHE = "ccache "
+    }
+    $ENV:HOST_CC = "$_ROSBE_CCACHE" + "gcc"
+    $ENV:HOST_CPP = "$_ROSBE_CCACHE" + "g++"
+
+    #
+    #Target defaults to host(i386)
+    #
+
+    $ENV:TARGET_CC = "$_ROSBE_CCACHE" + "gcc"
+    $ENV:TARGET_CPP = "$_ROSBE_CCACHE" + "g++"
+    if ($ENV:ROS_ARCH -ne $null) {
+        $ENV:TARGET_CC = "$_ROSBE_CCACHE" +
"$ROS_ARCH-pc-mingw32-gcc"
+        $ENV:TARGET_CPP = "$_ROSBE_CCACHE" +
"$ROS_ARCH-pc-mingw32-g++"
     }
 }
 
@@ -103,7 +74,7 @@
 #
 if ($_ROSBE_OBJPATH -ne $null) {
     if (Test-Path "$_ROSBE_OBJPATH") {
-        "ERROR: The path specified doesn't seem to exist."
+        "ERROR: The Object-Path specified doesn't seem to exist."
         exit
     } else {
         $ENV:ROS_INTERMEDIATE = "$_ROSBE_OBJPATH"
@@ -111,7 +82,7 @@
 }
 if ($_ROSBE_OUTPATH -ne $null) {
     if (Test-Path "$_ROSBE_OUTPATH") {
-        "ERROR: The path specified doesn't seem to exist."
+        "ERROR: The Output-Path specified doesn't seem to exist."
         exit
     } else {
         $ENV:ROS_OUTPUT = "$_ROSBE_OUTPATH"
@@ -240,3 +211,4 @@
 $TIMENAME = $null
 $CPUCOUNT = $null
 $sw = $null
+$_ROSBE_CCACHE = $null

Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1 [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1 [iso-8859-1] Tue Dec  9 02:39:06
2008
@@ -27,67 +27,26 @@
     # Check if we have something to clean, if so, clean it.
     #
 
-    if ($ENV:ROS_ARCH -eq "arm") {
-        if (Test-Path ".\obj-arm") {
-            "Cleaning ReactOS ARM source directory..."
+    if ($ENV:ROS_ARCH -ne $null) {
+        if (Test-Path ".\obj-$ENV:ROS_ARCH") {
+            "Cleaning ReactOS $ENV:ROS_ARCH source directory..."
             #
             # Remove directories/makefile.auto created by the build.
             #
-            if (Test-Path ".\obj-arm") {
-                $null = (Remove-Item ".\obj-arm" -recurse -force)
+            if (Test-Path ".\obj-$ENV:ROS_ARCH") {
+                $null = (Remove-Item ".\obj-$ENV:ROS_ARCH" -recurse -force)
             }
-            if (Test-Path ".\output-arm") {
-                $null = (Remove-Item ".\output-arm" -recurse -force)
+            if (Test-Path ".\output-$ENV:ROS_ARCH") {
+                $null = (Remove-Item ".\output-$ENV:ROS_ARCH" -recurse -force)
             }
-            if (Test-Path ".\makefile-arm.auto") {
-                $null = (Remove-Item ".\makefile-arm.auto" -force)
+            if (Test-Path ".\makefile-$ENV:ROS_ARCH.auto") {
+                $null = (Remove-Item ".\makefile-$ENV:ROS_ARCH.auto" -force)
             }
-            "Done cleaning ReactOS ARM source directory."
+            "Done cleaning ReactOS $ENV:ROS_ARCH source directory."
         } else {
-            "ERROR: There is no compiler output to clean."
+            "ERROR: There is no $ENV:ROS_ARCH compiler output to clean."
         }
-    }
-    elseif ($ENV:ROS_ARCH -eq "ppc") {
-        if (Test-Path ".\obj-ppc") {
-            "Cleaning ReactOS PPC source directory..."
-            #
-            # Remove directories/makefile.auto created by the build.
-            #
-            if (Test-Path ".\obj-ppc") {
-                $null = (Remove-Item ".\obj-ppc" -recurse -force)
-            }
-            if (Test-Path ".\output-ppc") {
-                $null = (Remove-Item ".\output-ppc" -recurse -force)
-            }
-            if (Test-Path ".\makefile-ppc.auto") {
-                $null = (Remove-Item ".\makefile-ppc.auto" -force)
-            }
-            "Done cleaning ReactOS PPC source directory."
-        } else {
-            "ERROR: There is no compiler output to clean."
-        }
-    }
-    elseif ($ENV:ROS_ARCH -eq "amd64") {
-        if (Test-Path ".\obj-amd64") {
-            "Cleaning ReactOS x86_64 source directory..."
-            #
-            # Remove directories/makefile.auto created by the build.
-            #
-            if (Test-Path ".\obj-amd64") {
-                $null = (Remove-Item ".\obj-amd64" -recurse -force)
-            }
-            if (Test-Path ".\output-amd64") {
-                $null = (Remove-Item ".\output-amd64" -recurse -force)
-            }
-            if (Test-Path ".\makefile-amd64.auto") {
-                $null = (Remove-Item ".\makefile-amd64.auto" -force)
-            }
-            "Done cleaning ReactOS x86_64 source directory."
-        } else {
-            "ERROR: There is no compiler output to clean."
-        }
-    }
-    elseif ($ENV:ROS_ARCH -eq $null) {
+    } else {
         if (Test-Path ".\obj-i386") {
             "Cleaning ReactOS i386 source directory..."
             #
@@ -104,7 +63,7 @@
             }
             "Done cleaning ReactOS i386 source directory."
         } else {
-            "ERROR: There is no compiler output to clean."
+            "ERROR: There is no i386 compiler output to clean."
         }
     }
     if (Test-Path "reactos") {

Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Config.ps1
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Powershell/Config.ps1 [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Powershell/Config.ps1 [iso-8859-1] Tue Dec  9 02:39:06
2008
@@ -75,7 +75,6 @@
 ""
 
 $YESNO = Read-Host "(yes), (no)"
-
 if ($YESNO -ne "yes") {settitle}
 
 #

Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 [iso-8859-1] Tue Dec  9
02:39:06 2008
@@ -110,7 +110,7 @@
         & yasm --version | select-string "yasm 0"
     } else {
         if ($_ROSBE_MODE -eq "RosBE") {
-            "ERROR: NASM or YASM is required to build ReactOS, none found in the
current MinGW/GCC."
+            "ERROR: NASM or YASM is required to build ReactOS, none was found in the
current MinGW/GCC."
         }
     }
 }
@@ -118,7 +118,7 @@
     & bison '--version' | select-string "GNU Bison"
 } else {
     if ($_ROSBE_MODE -eq "RosBE") {
-        "WARNING: Bison will soon be required to build ReactOS, none found in the
current MinGW/GCC."
+        "WARNING: Bison will soon be required to build ReactOS, none was found in
the current MinGW/GCC."
     }
 }
 if (Test-Path "$_ROSBE_HOST_MINGWPATH\bin\flex.exe") {
@@ -126,7 +126,7 @@
     "flex $fver"
 } else {
     if ($_ROSBE_MODE -eq "RosBE") {
-        "WARNING: Flex will soon be required to build ReactOS, none found in the
current MinGW/GCC."
+        "WARNING: Flex will soon be required to build ReactOS, none was found in the
current MinGW/GCC."
     }
 }
 & mingw32-make -v | & find "GNU Make"

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] Tue Dec  9 02:39:06 2008
@@ -36,68 +36,43 @@
 ::
 :: Check if strip, no Debug Symbols or ccache are being used and set the appropriate
options.
 ::
-if .%_ROSBE_NOSTRIP%. == .1. (
+if "%_ROSBE_NOSTRIP%" == "1" (
     set ROS_BUILDNOSTRIP=yes
 ) else (
     set ROS_BUILDNOSTRIP=no
 )
 
-if .%_ROSBE_STRIP%. == .1. (
+if "%_ROSBE_STRIP%" == "1" (
     set ROS_LEAN_AND_MEAN=yes
 ) else (
     set ROS_LEAN_AND_MEAN=no
 )
 
 :: Small Security Check to prevent useless apps.
-if .%ROS_LEAN_AND_MEAN%. == .yes. (
-    if .%ROS_BUILDNOSTRIP%. == .yes. (
+if "%ROS_LEAN_AND_MEAN%" == "yes" (
+    if "%ROS_BUILDNOSTRIP%" == "yes" (
         cls
         echo Selecting Stripping and removing Debug Symbols together will most likely
cause useless apps. Please deselect one of them.
         goto :EOC
     )
 )
 
-if .%_ROSBE_USECCACHE%. == .1. (
+if "%_ROSBE_USECCACHE%" == "1" (
     set CCACHE_DIR=%APPDATA%\RosBE\.ccache
-    set HOST_CC=ccache gcc
-    set HOST_CPP=ccache g++
-
-    REM Target defaults to host(i386)
-
-    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%. == .amd64. (
-        set TARGET_CC=ccache x86_64-pc-mingw32-gcc
-        set TARGET_CPP=ccache x86_64-pc-mingw32-g++
-    )
-    if .%ROS_ARCH%. == .ppc. (
-        set TARGET_CC=ccache ppc-pc-mingw32-gcc
-        set TARGET_CPP=ccache ppc-pc-mingw32-g++
-    )
-) else (
-    set HOST_CC=gcc
-    set HOST_CPP=g++
-
-    REM Target defaults to host(i386)
-
-    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%. == .amd64. (
-        set TARGET_CC=x86_64-pc-mingw32-gcc
-        set TARGET_CPP=x86_64-pc-mingw32-g++
-    )
-    if .%ROS_ARCH%. == .ppc. (
-        set TARGET_CC=ppc-pc-mingw32-gcc
-        set TARGET_CPP=ppc-pc-mingw32-g++
-    )
+    set _ROSBE_CCACHE=ccache 
+)
+
+:: Target defaults to host(i386)
+
+set HOST_CC=%_ROSBE_CCACHE%gcc
+set HOST_CPP=%_ROSBE_CCACHE%g++
+
+set TARGET_CC=%_ROSBE_CCACHE%gcc
+set TARGET_CPP=%_ROSBE_CCACHE%g++
+
+if not "%ROS_ARCH%" == "" (
+    set TARGET_CC=%_ROSBE_CCACHE%%ROS_ARCH%-pc-mingw32-gcc
+    set TARGET_CPP=%_ROSBE_CCACHE%%ROS_ARCH%-pc-mingw32-g++
 )
 
 ::
@@ -106,7 +81,7 @@
 ::
 if defined _ROSBE_OBJPATH (
     if not exist "%_ROSBE_OBJPATH%\." (
-        echo ERROR: The path specified doesn't seem to exist.
+        echo ERROR: The Object-Path specified doesn't seem to exist.
         goto :EOC
     ) else (
         set ROS_INTERMEDIATE=%_ROSBE_OBJPATH%
@@ -114,7 +89,7 @@
 )
 if defined _ROSBE_OUTPATH (
     if not exist "%_ROSBE_OUTPATH%\." (
-        echo ERROR: The path specified doesn't seem to exist.
+        echo ERROR: The Output-Path specified doesn't seem to exist.
         goto :EOC
     ) else (
         set ROS_OUTPUT=%_ROSBE_OUTPATH%
@@ -228,5 +203,4 @@
 set ROS_TEMPORARY=
 set CPUCOUNT=
 set CCACHE_DIR=
-set ROSA_DEL=
-set ROSB_DEL=
+set _ROSBE_CCACHE=

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 Dec  9 02:39:06 2008
@@ -54,57 +54,21 @@
 
 :DEL
 
-if .%ROS_ARCH%. == .arm. (
-    if exist "obj-arm\." (
-        echo Cleaning ReactOS ARM source directory...
-        if exist "obj-arm\." (
-            rd /s /q "obj-arm" 1> NUL 2> NUL
+if not "%ROS_ARCH%" == "" (
+    if exist "obj-%ROS_ARCH%\." (
+        echo Cleaning ReactOS %ROS_ARCH% source directory...
+        if exist "obj-%ROS_ARCH%\." (
+            rd /s /q "obj-%ROS_ARCH%" 1> NUL 2> NUL
         )
-        if exist "output-arm\." (
-            rd /s /q "output-arm" 1> NUL 2> NUL
+        if exist "output-%ROS_ARCH%\." (
+            rd /s /q "output-%ROS_ARCH%" 1> NUL 2> NUL
         )
-        if exist "makefile-arm.auto" (
-            del "makefile-arm.auto" 1> NUL 2> NUL
+        if exist "makefile-%ROS_ARCH%.auto" (
+            del "makefile-%ROS_ARCH%.auto" 1> NUL 2> NUL
         )
-        echo Done cleaning ReactOS ARM source directory.
+        echo Done cleaning ReactOS %ROS_ARCH% source directory.
     ) else (
-        echo ERROR: There is no compiler output to clean.
-    )
-    goto :ROS
-)
-if .%ROS_ARCH%. == .ppc. (
-    if exist "obj-ppc\." (
-        echo Cleaning ReactOS PPC source directory...
-        if exist "obj-ppc\." (
-            rd /s /q "obj-ppc" 1> NUL 2> NUL
-        )
-        if exist "output-ppc\." (
-            rd /s /q "output-ppc" 1> NUL 2> NUL
-        )
-        if exist "makefile-ppc.auto" (
-            del "makefile-ppc.auto" 1> NUL 2> NUL
-        )
-        echo Done cleaning ReactOS PPC source directory.
-    ) else (
-        echo ERROR: There is no compiler output to clean.
-    )
-    goto :ROS
-)
-if .%ROS_ARCH%. == .amd64. (
-    if exist "obj-amd64\." (
-        echo Cleaning ReactOS X86_64 source directory...
-        if exist "obj-amd64\." (
-            rd /s /q "obj-amd64" 1> NUL 2> NUL
-        )
-        if exist "output-amd64\." (
-            rd /s /q "output-amd64" 1> NUL 2> NUL
-        )
-        if exist "makefile-amd64.auto" (
-            del "makefile-amd64.auto" 1> NUL 2> NUL
-        )
-        echo Done cleaning ReactOS X86_64 source directory.
-    ) else (
-        echo ERROR: There is no compiler output to clean.
+        echo ERROR: There is no %ROS_ARCH% compiler output to clean.
     )
     goto :ROS
 )
@@ -122,7 +86,7 @@
     )
     echo Done cleaning ReactOS i386 source directory.
 ) else (
-    echo ERROR: There is no compiler output to clean.
+    echo ERROR: There is no i386 compiler output to clean.
 )
 
 :ROS

Modified: trunk/tools/RosBE/RosBE-Windows/Root/Config.cmd
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Con…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Root/Config.cmd [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Root/Config.cmd [iso-8859-1] Tue Dec  9 02:39:06 2008
@@ -22,7 +22,6 @@
     echo Continue?
     set /p YESNO="(yes), (no)"
     if /i "%YESNO%"=="yes" goto :CONT
-    if /i "%YESNO%"=="no" goto :NOK
     goto :NOK
 
     :CONT
@@ -46,7 +45,7 @@
     echo Continue?
     set /p YESNO="(yes), (no)"
     if /i "%YESNO%"=="yes" goto :CONT2
-    if /i "%YESNO%"=="no" goto :NOK
+    goto :NOK
 
     :CONT2
     del "%_ROSBE_BASEDIR%\*.rbuild"
@@ -78,9 +77,7 @@
 echo.
 
 set /p YESNO="(yes), (no)"
-
 if /i "%YESNO%"=="yes" goto :OK
-if /i "%YESNO%"=="no" goto :NOK
 goto :NOK
 
 :OK
@@ -101,7 +98,6 @@
         echo.
         set /p YESNO="(yes), (no)"
         if /i "%YESNO%"=="yes" del
"%APPDATA%\RosBE\*.rbuild" | del "config.rbuild" | copy
"config.template.rbuild" "%APPDATA%\RosBE\config.rbuild" | goto :OK
-        if /i "%YESNO%"=="no" goto :NOK
         endlocal
         goto :NOK
     )

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 Dec  9 02:39:06 2008
@@ -53,7 +53,6 @@
 call "%_ROSBE_BASEDIR%\rosbe-gcc-env.cmd"
 goto :EOC
 
-
 ::
 :: If Parameters were set, parse them, if not, ask the user to add them.
 ::

Modified: trunk/tools/RosBE/RosBE-Windows/Root/chdefgcc.cmd
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/chd…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Root/chdefgcc.cmd [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Root/chdefgcc.cmd [iso-8859-1] Tue Dec  9 02:39:06
2008
@@ -25,7 +25,7 @@
     call :INTERACTIVE
 )
 if "%_2%" == "" (
-    call :INTERACTIVE
+    call :INTERACTIVE2
 )
 
 if exist "%_ROSBE_BASEDIR%\%_1%\." (
@@ -66,6 +66,9 @@
     echo ERROR: You must enter a MinGW/GCC directory.
     goto :EOC
 )
+
+:INTERACTIVE2
+
 set /p _2="Please specify, if this will be the Target or Host GCC: "
 if "%_2%" == "" (
     echo ERROR: You must enter "target" or "host".

Modified: trunk/tools/RosBE/RosBE-Windows/Root/options.cmd
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/opt…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Root/options.cmd [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Root/options.cmd [iso-8859-1] Tue Dec  9 02:39:06
2008
@@ -18,9 +18,7 @@
 :: Run options.exe
 ::
 if exist "%_ROSBE_BASEDIR%\Tools\options.exe" (
-    pushd "%_ROSBE_BASEDIR%"
     call "%_ROSBE_BASEDIR%\Tools\options.exe"
-    popd "%_ROSBE_BASEDIR%"
     if exist "%APPDATA%\RosBE\rosbe-options.cmd" (
         call "%APPDATA%\RosBE\rosbe-options.cmd"
     )

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] Tue Dec  9
02:39:06 2008
@@ -33,17 +33,17 @@
     goto :main
 )
 
-if .%_ROSBE_ARCH%. == .1. (
+if "%_ROSBE_ARCH%" == "1" (
     set ROS_ARCH=arm
     set ROS_PREFIX=arm-pc-mingw32
     set _ROSBE_TARGET_MINGWPATH=%_ROSBE_BASEDIR%\arm
 )
-if .%_ROSBE_ARCH%. == .2. (
+if "%_ROSBE_ARCH%" == "2" (
     set ROS_ARCH=ppc
     set ROS_PREFIX=ppc-pc-mingw32
     set _ROSBE_TARGET_MINGWPATH=%_ROSBE_BASEDIR%\ppc
 )
-if .%_ROSBE_ARCH%. == .3. (
+if "%_ROSBE_ARCH%" == "3" (
     set ROS_ARCH=amd64
     set ROS_PREFIX=x86_64-pc-mingw32
     set _ROSBE_TARGET_MINGWPATH=%_ROSBE_BASEDIR%\x86_64
@@ -101,9 +101,9 @@
 ::
 :: Display the current version of GCC, NASM, ld and make.
 ::
-if not .%ROS_ARCH%. == .. (
+if not "%ROS_ARCH%" == "" (
     "%_ROSBE_TARGET_MINGWPATH%\bin\%ROS_PREFIX%-gcc" -v 2>&1 | find
"gcc version"
-    if .%ROS_PREFIX%. == .. (
+    if "%ROS_PREFIX%" == "" (
         echo gcc target^: %_ROSBE_GCCTARGET%
     ) else (
         echo gcc target^: %ROS_PREFIX:~0,-11%
@@ -111,7 +111,7 @@
     "%_ROSBE_TARGET_MINGWPATH%\bin\%ROS_PREFIX%-ld" -v
 ) else (
     gcc -v 2>&1 | find "gcc version"
-    if .%ROS_PREFIX%. == .. (
+    if "%ROS_PREFIX%" == "" (
         echo gcc target^: %_ROSBE_GCCTARGET%
     ) else (
         echo gcc target^: %ROS_PREFIX:~0,-11%
@@ -126,7 +126,7 @@
         yasm --version | find "yasm 0"
     ) else (
         if "%_ROSBE_MODE%" == "RosBE" (
-            echo ERROR: NASM or YASM is required to build ReactOS, none found in the
current MinGW/GCC.
+            echo ERROR: NASM or YASM is required to build ReactOS, none was found in the
current MinGW/GCC.
         )
     )
 )
@@ -134,14 +134,14 @@
     bison --version | find "GNU Bison"
 ) else (
     if "%_ROSBE_MODE%" == "RosBE" (
-        echo WARNING: Bison will soon be required to build ReactOS, none found in the
current MinGW/GCC.
+        echo WARNING: Bison will soon be required to build ReactOS, none was found in the
current MinGW/GCC.
     )
 )
 if exist "%_ROSBE_HOST_MINGWPATH%\bin\flex.exe" (
     flex --version
 ) else (
     if "%_ROSBE_MODE%" == "RosBE" (
-        echo WARNING: Flex will soon be required to build ReactOS, none found in the
current MinGW/GCC.
+        echo WARNING: Flex will soon be required to build ReactOS, none was found in the
current MinGW/GCC.
     )
 )
 mingw32-make -v | find "GNU Make"

Modified: trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/sSV…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd [iso-8859-1] Tue Dec  9 02:39:06 2008
@@ -90,14 +90,14 @@
 )
 if %OFFSVN% equ %ONSVN% (
     echo Your tree is up to date.
-    goto :EOC
+    goto :EOF
 )
 
 :UP2
 
 set /p UP="Please enter 'yes' or 'no': "
 if /i "%UP%"=="yes" "%_ROSBE_BASEDIR%\ssvn" update
-if /i "%UP%"=="no" goto :EOC
+if /i "%UP%"=="no" goto :EOF
 
 :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 Dec  9 02:39:06 2008
@@ -123,7 +123,8 @@
     call :STATUS
     set /a _ROSBE_STATCOUNT+=1
     call :STATUS
-    goto :UPDFIN
+    call :UPDFIN
+    goto :EOC
 )
 if not "%1" == "" (
     echo Unknown parameter specified. Try 'help update'.
@@ -166,7 +167,7 @@
 ) else (
     echo RosBE is up to Date.
 )
-goto :EOC
+goto :EOF
 
 :UPDCHECK