[ros-diffs] [dreimer] 32156: Why easy if you can get it difficult. Removed two Variables I used in charch. Add a security check for title setting. Check if RosBE Version got declared.

Author: dreimer
Date: Wed Feb  6 14:00:24 2008
New Revision: 32156

URL: http://svn.reactos.org/svn/reactos?rev=32156&view=rev
Log:
Why easy if you can get it difficult. Removed two Variables I used in charch.
Add a security check for title setting. Check if RosBE Version got declared.

Modified:
    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/Help.cmd
    trunk/tools/RosBE/RosBE-Windows/Root/charch.cmd
    trunk/tools/RosBE/RosBE-Windows/Root/chdefdir.cmd
    trunk/tools/RosBE/RosBE-Windows/Root/options.cmd
    trunk/tools/RosBE/RosBE-Windows/Root/reladdr2line.cmd
    trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd
    trunk/tools/RosBE/RosBE-Windows/Root/scut.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 (original)
+++ trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd Wed Feb  6 14:00:24 2008
@@ -163,7 +163,9 @@
 ::
 "%_ROSBE_BASEDIR%\Tools\flash.exe"
 
-title ReactOS Build Environment %_ROSBE_VERSION%
+if defined _ROSBE_VERSION (
+    title ReactOS Build Environment %_ROSBE_VERSION%
+)
 
 ::
 :: Unload all used Vars.

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 (original)
+++ trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd Wed Feb  6 14:00:24 2008
@@ -73,5 +73,6 @@
 )
 goto :EOF
 
-:EOC
-title ReactOS Build Environment %_ROSBE_VERSION%
+:EOCif defined _ROSBE_VERSION (
+    title ReactOS Build Environment %_ROSBE_VERSION%
+)

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 (original)
+++ trunk/tools/RosBE/RosBE-Windows/Root/Config.cmd Wed Feb  6 14:00:24 2008
@@ -248,7 +248,9 @@
 goto :NOK
 
 :NOK
-title ReactOS Build Environment %_ROSBE_VERSION%
+if defined _ROSBE_VERSION (
+    title ReactOS Build Environment %_ROSBE_VERSION%
+)
 
 ::
 :: Unload all used Vars.

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 (original)
+++ trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd Wed Feb  6 14:00:24 2008
@@ -107,7 +107,6 @@
         echo Change the ReactOS source directory for the current RosBE session.
         echo Possible Architectures are: x86, ppc, arm.
         echo.
-        echo    previous - Switch to the previous ReactOS source directory.
         goto :EOC
     )
 )
@@ -203,4 +202,6 @@
 )
 
 :EOC
-title ReactOS Build Environment %_ROSBE_VERSION%
+if defined _ROSBE_VERSION (
+    title ReactOS Build Environment %_ROSBE_VERSION%
+)

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 (original)
+++ trunk/tools/RosBE/RosBE-Windows/Root/charch.cmd Wed Feb  6 14:00:24 2008
@@ -15,28 +15,28 @@
 
 ::
 :: Parse the command line arguments.
+:: ROS_ARCH: Set to x86, ppc or arm.
+:: ROS_PREFIX: Default is mingw32. ppc could be mingw32-ppc, arm mingw32-arm.
 ::
+
 if "%1" == "" (
     call :INTERACTIVE
 ) else (
     set _1=%1
 )
-if /i "%_1%" == "previous" (
-    popd
-)
 if /i "%_1%" == "x86" (
-    set _ROSBE_ARCH%=x86
-    set _ROSBE_PREFIX=mingw32
+    set ROS_ARCH=
+    set ROS_PREFIX=
     goto :EOC
 )
 if /i "%_1%" == "arm" (
-    set _ROSBE_ARCH%=arm
-    set _ROSBE_PREFIX=mingwarm
+    set ROS_ARCH=arm
+    set ROS_PREFIX=mingw32-arm
     goto :EOC
 )
 if /i "%_1%" == "ppc" (
-    set _ROSBE_ARCH%=ppc
-    set _ROSBE_PREFIX=mingwppc
+    set ROS_ARCH==ppc
+    set ROS_PREFIX=mingw32-ppc
     goto :EOC
 )
 if not "%_1%" == "" (
@@ -57,27 +57,8 @@
 goto :EOF
 
 :EOC
-pushd %_1%
-
-::
-:: Set to x86, ppc or arm.
-::
-set ROS_ARCH=%_ROSBE_ARCH%
-
-::
-:: Default is mingw32. ppc could be mingwppc, arm mingwarm.
-::
-set ROS_PREFIX=%_ROSBE_PREFIX%
-
 REM chdefgcc %PATH%
-REM Maybe another way to set the compiler...
 
 if defined _ROSBE_VERSION (
     title ReactOS Build Environment %_ROSBE_VERSION%
 )
-
-::
-:: Unload all used Vars.
-::
-set _ROSBE_ARCH=
-set _ROSBE_PREFIX=

Modified: trunk/tools/RosBE/RosBE-Windows/Root/chdefdir.cmd
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/chd…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Root/chdefdir.cmd (original)
+++ trunk/tools/RosBE/RosBE-Windows/Root/chdefdir.cmd Wed Feb  6 14:00:24 2008
@@ -48,7 +48,9 @@
 goto :EOF
 
 :EOC
-title ReactOS Build Environment %_ROSBE_VERSION%
+if defined _ROSBE_VERSION (
+    title ReactOS Build Environment %_ROSBE_VERSION%
+)
 
 ::
 :: Unload all used Vars.

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 (original)
+++ trunk/tools/RosBE/RosBE-Windows/Root/options.cmd Wed Feb  6 14:00:24 2008
@@ -28,4 +28,6 @@
     echo ERROR: options.exe was not found.
 )
 
-title ReactOS Build Environment %_ROSBE_VERSION%
+if defined _ROSBE_VERSION (
+    title ReactOS Build Environment %_ROSBE_VERSION%
+)

Modified: trunk/tools/RosBE/RosBE-Windows/Root/reladdr2line.cmd
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/rel…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Root/reladdr2line.cmd (original)
+++ trunk/tools/RosBE/RosBE-Windows/Root/reladdr2line.cmd Wed Feb  6 14:00:24 2008
@@ -84,7 +84,9 @@
 goto :EOF
 
 :EOC
-title ReactOS Build Environment %_ROSBE_VERSION%
+if defined _ROSBE_VERSION (
+    title ReactOS Build Environment %_ROSBE_VERSION%
+)
 
 ::
 :: Unload all used Vars.

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 (original)
+++ trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd Wed Feb  6 14:00:24 2008
@@ -90,7 +90,9 @@
 if /i "%UP%"=="no" goto :EOC
 
 :EOC
-title ReactOS Build Environment %_ROSBE_VERSION%
+if defined _ROSBE_VERSION (
+    title ReactOS Build Environment %_ROSBE_VERSION%
+)
 
 ::
 :: Unload all used Vars.

Modified: trunk/tools/RosBE/RosBE-Windows/Root/scut.cmd
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/scu…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Root/scut.cmd (original)
+++ trunk/tools/RosBE/RosBE-Windows/Root/scut.cmd Wed Feb  6 14:00:24 2008
@@ -38,4 +38,6 @@
 call "%_ROSBE_BASEDIR%\Tools\scut.exe" "%1" %2 %3
 
 :EOC
-title ReactOS Build Environment %_ROSBE_VERSION%
+if defined _ROSBE_VERSION (
+    title ReactOS Build Environment %_ROSBE_VERSION%
+)