[ros-diffs] [dreimer] 29759: Fixed chdefdir. Now it should work. Updated options. It now checks if the .exe exists. If not, it throws an error. Updated echo Messages a bit.

Author: dreimer
Date: Mon Oct 22 03:11:16 2007
New Revision: 29759

URL: http://svn.reactos.org/svn/reactos?rev=29759&view=rev
Log:
Fixed chdefdir. Now it should work.
Updated options. It now checks if the .exe exists. If not, it throws an error.
Updated echo Messages a bit.

Modified:
    trunk/tools/RosBE-Windows/Root/Clean.cmd
    trunk/tools/RosBE-Windows/Root/Config.cmd
    trunk/tools/RosBE-Windows/Root/RosBE.cmd
    trunk/tools/RosBE-Windows/Root/chdefdir.cmd
    trunk/tools/RosBE-Windows/Root/options.cmd
    trunk/tools/RosBE-Windows/Root/sSVN.cmd
    trunk/tools/RosBE-Windows/Root/scut.cmd

Modified: trunk/tools/RosBE-Windows/Root/Clean.cmd
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Clean.cmd…
==============================================================================
--- trunk/tools/RosBE-Windows/Root/Clean.cmd (original)
+++ trunk/tools/RosBE-Windows/Root/Clean.cmd Mon Oct 22 03:11:16 2007
@@ -101,7 +101,7 @@
 
         echo Done cleaning ReactOS source directory.
     ) else (
-        echo There is nothing to clean.
+        echo ERROR: There is nothing to clean.
     )
     title ReactOS Build Environment %_ROSBE_VERSION%
     goto :EOC
@@ -117,7 +117,7 @@
 
         echo Done cleaning build logs.
     ) else (
-        echo There are no logs to clean.
+        echo ERROR: There are no logs to clean.
     )
     goto :EOC
 )

Modified: trunk/tools/RosBE-Windows/Root/Config.cmd
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Config.cm…
==============================================================================
--- trunk/tools/RosBE-Windows/Root/Config.cmd (original)
+++ trunk/tools/RosBE-Windows/Root/Config.cmd Mon Oct 22 03:11:16 2007
@@ -47,7 +47,7 @@
     del "%_ROSBE_BASEDIR%\*.rbuild"
     del "config.rbuild"
     copy "config.template.rbuild" "%_ROSBE_BASEDIR%\config.rbuild"
-    echo Updated.
+    echo Successfully Updated.
     goto :NOK
 )
 if not "%1" == "" (
@@ -102,10 +102,10 @@
 ::
 :: Start with reading settings from config.rbuild and let the user edit them.
 ::
-echo Sub-architecture to build for.
+echo Sub-Architecture to build for.
 echo Default is: none
 echo.
-echo Right now
+echo Right now:
 grep \"SARCH\" "%_ROSBE_BASEDIR%\config.rbuild"|cut -d
"\"" -f 4
 set /P X="(), (xbox)"
 sed "s/\"SARCH\" value=\"\"/\"SARCH\"
value=\"%X%\"/g;s/\"SARCH\"
value=\"xbox\"/\"SARCH\" value=\"%X%\"/g"
"%_ROSBE_BASEDIR%\config.rbuild" >
"%_ROSBE_BASEDIR%\config2.rbuild"
@@ -118,7 +118,7 @@
 echo See GCC manual for more CPU names and which CPUs GCC can optimize for.
 echo Default is: pentium
 echo.
-echo Right now
+echo Right now:
 grep \"OARCH\" "%_ROSBE_BASEDIR%\config.rbuild"|cut -d
"\"" -f 4
 set /P XX=
 if "%XX%" == "" (
@@ -134,7 +134,7 @@
 echo official release builds and debug builds.
 echo warning : 2,3,4,5 is not tested on ReactOS. Change at own risk.
 echo.
-echo Right now
+echo Right now:
 grep \"OPTIMIZE\" "%_ROSBE_BASEDIR%\config.rbuild"|cut -d
"\"" -f 4
 set /P Y="(0), (1), (2), (3), (4), (5)"
 if "%Y%" == "" (
@@ -146,7 +146,7 @@
 echo Whether to compile for an uniprocessor or multiprocessor machine.
 echo Default is: 0
 echo.
-echo Right now
+echo Right now:
 grep \"MP\" "%_ROSBE_BASEDIR%\config.rbuild"|cut -d
"\"" -f 4
 set /P Z="(0), (1)"
 if "%Z%" == "" (
@@ -158,7 +158,7 @@
 echo Whether to compile in the integrated kernel debugger.
 echo Default is: 0
 echo.
-echo Right now
+echo Right now:
 grep \"KDBG\" "%_ROSBE_BASEDIR%\config.rbuild"|cut -d
"\"" -f 4
 set /P A="(0), (1)"
 if "%A%" == "" (
@@ -171,7 +171,7 @@
 echo performed.
 echo Default is: 1
 echo.
-echo Right now
+echo Right now:
 grep \"DBG\" "%_ROSBE_BASEDIR%\config.rbuild"|cut -d
"\"" -f 4
 set /P B="(0), (1)"
 if "%B%" == "" (
@@ -184,7 +184,7 @@
 echo don't enable this.
 echo Default is: 0
 echo.
-echo Right now
+echo Right now:
 grep \"GDB\" "%_ROSBE_BASEDIR%\config.rbuild"|cut -d
"\"" -f 4
 set /P C="(0), (1)"
 if "%C%" == "" (
@@ -199,7 +199,7 @@
 echo from the patent owner).
 echo Default is: 0
 echo.
-echo Right now
+echo Right now:
 grep \"NSWPAT\" "%_ROSBE_BASEDIR%\config.rbuild"|cut -d
"\"" -f 4
 set /P D="(0), (1)"
 if "%D%" == "" (
@@ -216,7 +216,7 @@
 echo unless you know what you're doing.
 echo Default is: 0
 echo.
-echo Right now
+echo Right now:
 grep \"_WINKD_\" "%_ROSBE_BASEDIR%\config.rbuild"|cut -d
"\"" -f 4
 set /P F="(0), (1)"
 if "%F%" == "" (

Modified: trunk/tools/RosBE-Windows/Root/RosBE.cmd
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/RosBE.cmd…
==============================================================================
--- trunk/tools/RosBE-Windows/Root/RosBE.cmd (original)
+++ trunk/tools/RosBE-Windows/Root/RosBE.cmd Mon Oct 22 03:11:16 2007
@@ -57,7 +57,7 @@
 :EndCommandParse
 
 ::
-:: Load the Base Directory from the Shortcut-XML and set it as new
+:: Load the Base Directory from the Shortcut-txt and set it as new
 :: Source Directory and add PATH for Tools Folder.
 ::
 set PATH=%_ROSBE_BASEDIR%\Tools;%PATH%
@@ -85,7 +85,7 @@
 doskey /macrofile="%_ROSBE_BASEDIR%\RosBE.mac"
 
 ::
-:: Look if the Source Folder is empty. If so, ask for using "svn create".
+:: Look if the Source Folder is empty. If so, ask for using "ssvn create".
 ::
 dir /b "%_ROSBE_ROSSOURCEDIR%" 2>nul|findstr "." >nul
 if errorlevel 1 (

Modified: trunk/tools/RosBE-Windows/Root/chdefdir.cmd
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/chdefdir.…
==============================================================================
--- trunk/tools/RosBE-Windows/Root/chdefdir.cmd (original)
+++ trunk/tools/RosBE-Windows/Root/chdefdir.cmd Mon Oct 22 03:11:16 2007
@@ -10,11 +10,13 @@
 
 title Change the Default Dir...
 
+set _ROSBE_ROSSOURCEDIRBCK=%_ROSBE_ROSSOURCEDIR%
+
 if /i "%1" == "" (
     goto :INTERACTIVE
 )
 if /i "%1" == "default" (
-    set _ROSBE_ROSSOURCEDIR=%_ROSBE_ROSSOURCEDIR%
+    set _ROSBE_ROSSOURCEDIR=%_ROSBE_ROSSOURCEDIRBCK%
 ) else (
     set _ROSBE_ROSSOURCEDIR=%1
 )

Modified: trunk/tools/RosBE-Windows/Root/options.cmd
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/options.c…
==============================================================================
--- trunk/tools/RosBE-Windows/Root/options.cmd (original)
+++ trunk/tools/RosBE-Windows/Root/options.cmd Mon Oct 22 03:11:16 2007
@@ -10,7 +10,15 @@
 
 title Options
 
-"%_ROSBE_BASEDIR%\options.exe"
-echo Press any Button to reset RosBE with the new Settings.
-pause
-"%_ROSBE_BASEDIR%\RosBE.cmd"
+::
+:: Run options.exe
+::
+if exist "%_ROSBE_BASEDIR%\options.exe" (
+    "%_ROSBE_BASEDIR%\options.exe"
+    echo Press any Button to reset RosBE with the new Settings.
+    pause
+    "%_ROSBE_BASEDIR%\RosBE.cmd"
+) else (
+    echo ERROR: options.exe was not found.
+    title ReactOS Build Environment %_ROSBE_VERSION%
+)

Modified: trunk/tools/RosBE-Windows/Root/sSVN.cmd
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/sSVN.cmd?…
==============================================================================
--- trunk/tools/RosBE-Windows/Root/sSVN.cmd (original)
+++ trunk/tools/RosBE-Windows/Root/sSVN.cmd Mon Oct 22 03:11:16 2007
@@ -39,14 +39,14 @@
 if "%1" == "create" (
     title Creating...
     if exist ".svn\." (
-        echo Folder already cotains a Reposority. Exiting
+        echo ERROR: Folder already cotains a Reposority. Exiting
         goto :ExitSVN
     )
     dir /b 2>nul|findstr "." >nul
     if errorlevel 1 (
         svn checkout svn://svn.reactos.org/reactos/trunk/reactos
     ) else (
-        echo Folder is not empty. Continuing is dangerous and can cause errors. ABORTED
+        echo ERROR: Folder is not empty. Continuing is dangerous and can cause errors.
ABORTED
     )
     goto :ExitSVN
 )

Modified: trunk/tools/RosBE-Windows/Root/scut.cmd
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/scut.cmd?…
==============================================================================
--- trunk/tools/RosBE-Windows/Root/scut.cmd (original)
+++ trunk/tools/RosBE-Windows/Root/scut.cmd Mon Oct 22 03:11:16 2007
@@ -31,7 +31,7 @@
 if /I "%1"=="run" (
     for /f "usebackq tokens=1-2 delims=," %%i in (`type
"%_ROSBE_BASEDIR%\srclist.txt"`) do (
         if %%i == Base (
-            echo Used Shortcut: %%j
+            echo Active Shortcut: %%j
             echo.
             ::
             : Set new source directory, if needed.
@@ -49,7 +49,7 @@
 goto :END
 
 ::
-:: Load Shortcut from XML and set it active.
+:: Load Shortcut from txt and set it active.
 ::
 :DEF
 echo Choose your Source Folder:
@@ -61,11 +61,11 @@
         goto :END
     )
 )
-echo ERROR: This Shortcut (%XY%) does not exist.
+echo ERROR: The Shortcut %XY% does not exist.
 goto :END
 
 ::
-:: Add new Shortcut to XML.
+:: Add new Shortcut to txt.
 ::
 :ADD
 if not "%2" == "" (
@@ -90,7 +90,7 @@
 :ADD23
 for /f "usebackq tokens=1-2 delims=, skip=1" %%i in (`type
"%_ROSBE_BASEDIR%\srclist.txt"`) do (
     if %%i == %CUT% (
-        echo ERROR: A Shortcut with the name %CUT% does already exists.
+        echo ERROR: A Shortcut with the name %CUT% does already exist.
         goto :END
     )
 )
@@ -98,7 +98,7 @@
 goto :END
 
 ::
-:: Remove Shortcut from XML.
+:: Remove Shortcut from txt.
 ::
 :REM
 if not "%2" == "" (
@@ -137,6 +137,9 @@
 :DEF1
 call "%_ROSBE_BASEDIR%\scut.cmd" edit Base %DIR%
 
+::
+:: Edit a existing Shortcut.
+::
 :EDIT
 if not "%2" == "" (
     if not "%3" == "" (