[ros-diffs] [dreimer] 31142: - Added a "all" switch to clean.cmd to do both jobs, deleting Compiler Output AND Logs in one process. - Added a Security Prompt to clean.cmd to not accidentally delete all Built stuff.

Author: dreimer
Date: Tue Dec 11 16:41:13 2007
New Revision: 31142

URL: http://svn.reactos.org/svn/reactos?rev=31142&view=rev
Log:
- Added a "all" switch to clean.cmd to do both jobs, deleting Compiler Output
AND Logs in one process.
- Added a Security Prompt to clean.cmd to not accidentally delete all Built stuff.

Modified:
    trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt
    trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd
    trunk/tools/RosBE/RosBE-Windows/Root/Help.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 (original)
+++ trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt Tue Dec 11 16:41:13 2007
@@ -1,3 +1,8 @@
+*** XXX XXth, 2008 - RosBE 1.2 Released
+
+- Added a "all" switch to clean.cmd to do both jobs, deleting Compiler Output
AND Logs in one process. (Daniel Reimer)
+- Added a Security Prompt to clean.cmd to not accidentally delete all Built stuff.
(Daniel Reimer)
+
 *** December 8th, 2007 - RosBE 1.1 Released
 
 - Updated: NASM to 2.00 (Peter Ward)

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 Tue Dec 11 16:41:13 2007
@@ -9,50 +9,26 @@
 ::
 @echo off
 
+echo Do you REALLY want to continue?
+set /p YESNO="(yes), (no)"
+if /i "%YESNO%"=="yes" goto :CONT
+if /i "%YESNO%"=="no" goto :EOC
+goto :NOK
+
+:CONT
 title Cleaning...
 
 if "%1" == "" (
-    ::
-    : Check if we have something to clean, if so, clean it.
-    ::
-    if exist "obj-i386\." (
-        echo Cleaning ReactOS source directory...
-
-        ::
-        : Remove directories/makefile.auto 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 "reactos\." (
-            rd /s /q "reactos" 1> NUL 2> NUL
-        )
-        if exist "makefile.auto" (
-            del "makefile.auto" 1> NUL 2> NUL
-        )
-
-        echo Done cleaning ReactOS source directory.
-    ) else (
-        echo ERROR: There is nothing to clean.
-    )
+    call :DEL
     goto :EOC
 )
 if /i "%1" == "logs" (
-    ::
-    : Check if we have any logs to clean, if so, clean them.
-    ::
-    if exist "%_ROSBE_LOGDIR%\*.txt" (
-        echo Cleaning build logs...
-
-        del /f "%_ROSBE_LOGDIR%\*.txt" 1> NUL 2> NUL
-
-        echo Done cleaning build logs.
-    ) else (
-        echo ERROR: There are no logs to clean.
-    )
+    call :LOG
+    goto :EOC
+)
+if /i "%1" == "all" (
+    call :DEL
+    call :LOG
     goto :EOC
 )
 if not "%1" == "" (
@@ -60,5 +36,46 @@
     goto :EOC
 )
 
+:LOG
+::
+: Check if we have any logs to clean, if so, clean them.
+::
+if exist "%_ROSBE_LOGDIR%\*.txt" (
+    echo Cleaning build logs...
+    del /f "%_ROSBE_LOGDIR%\*.txt" 1> NUL 2> NUL
+    echo Done cleaning build logs.
+) else (
+    echo ERROR: There are no logs to clean.
+)
+goto :EOC
+
+:DEL
+::
+: Check if we have something to clean, if so, clean it.
+::
+if exist "obj-i386\." (
+    echo Cleaning ReactOS source directory...
+
+    ::
+    : Remove directories/makefile.auto 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 "reactos\." (
+        rd /s /q "reactos" 1> NUL 2> NUL
+    )
+    if exist "makefile.auto" (
+        del "makefile.auto" 1> NUL 2> NUL
+    )
+    echo Done cleaning ReactOS source directory.
+) else (
+    echo ERROR: There is no Compiler Output to clean.
+)
+goto :EOC
+
 :EOC
 title ReactOS Build Environment %_ROSBE_VERSION%

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 Tue Dec 11 16:41:13 2007
@@ -33,7 +33,7 @@
         echo                           current RosBE session.
     )
 
-    echo    clean [logs]         - Fully clean the ReactOS source directory and/or
+    echo    clean [OPTIONS]      - Fully clean the ReactOS source directory and/or
     echo                           the RosBE build logs.
 
     if exist "%_ROSBE_BASEDIR%\Config.cmd" (
@@ -113,6 +113,7 @@
     echo Usage: clean [logs]
     echo Fully clean the ReactOS source directory.
     echo.
+    echo    all  - Removes build logs and Compiler Output in the RosBE-Logs directory.
     echo    logs - Removes all build logs in the RosBE-Logs directory.
     goto :EOC
 )