[ros-diffs] [peterw] 25427: - Added 'clean logs' command to clean up build logs created by RosBE. - Added help for individual commands.

Author: peterw
Date: Thu Jan 11 23:07:24 2007
New Revision: 25427

URL: http://svn.reactos.org/svn/reactos?rev=25427&view=rev
Log:
- Added 'clean logs' command to clean up build logs created
  by RosBE.
- Added help for individual commands.

Modified:
    trunk/tools/RosBE/ChangeLog.txt
    trunk/tools/RosBE/Clean.cmd
    trunk/tools/RosBE/Help.cmd
    trunk/tools/RosBE/RosBE.mac

Modified: trunk/tools/RosBE/ChangeLog.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/ChangeLog.txt?rev=2542…
==============================================================================
--- trunk/tools/RosBE/ChangeLog.txt (original)
+++ trunk/tools/RosBE/ChangeLog.txt Thu Jan 11 23:07:24 2007
@@ -1,3 +1,8 @@
+- Added 'clean logs' command to clean up build logs created
+  by RosBE.
+- Added help for individual commands.
+- Fixed a bug concerning spaces in file names/paths.
+
 *** Janruary 08th, 2007 - RosBE 0.3.4 Released
 
 - New command 'makex' which automatically determines the correct

Modified: trunk/tools/RosBE/Clean.cmd
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/Clean.cmd?rev=25427&am…
==============================================================================
--- trunk/tools/RosBE/Clean.cmd (original)
+++ trunk/tools/RosBE/Clean.cmd Thu Jan 11 23:07:24 2007
@@ -4,82 +4,103 @@
 ::    Clean the ReactOS source directory.
 @echo off
 
-::
-:: Check if we have something to clean, if so, clean it.
-::
-if exist "%_ROSSOURCEDIR%\obj-i386\." (
-    echo Cleaning ReactOS source directory...
-
+if "%1" == "" (
     ::
-    : Run ReactOS's make clean.
-    ::
-    if exist "%_ROSSOURCEDIR%\makefile.auto" (
-        if not "%CD%" == "%_ROSSOURCEDIR%" (
-            pushd "%_ROSSOURCEDIR%"
-            %_MINGWMAKE% clean 1> NUL 2> NUL
-            popd
-        ) else (
-            %_MINGWMAKE% clean 1> NUL 2> NUL
-        )
-    )
-
-    ::
-    : Remove directories/makefile.auto created by the build.
+    : Check if we have something to clean, if so, clean it.
     ::
     if exist "%_ROSSOURCEDIR%\obj-i386\." (
-        rd /s /q "%_ROSSOURCEDIR%\obj-i386" 1> NUL 2> NUL
+        echo Cleaning ReactOS source directory...
+
+        ::
+        : Run ReactOS's make clean.
+        ::
+        if exist "%_ROSSOURCEDIR%\makefile.auto" (
+            if not "%CD%" == "%_ROSSOURCEDIR%" (
+                pushd "%_ROSSOURCEDIR%"
+                %_MINGWMAKE% clean 1> NUL 2> NUL
+                popd
+            ) else (
+                %_MINGWMAKE% clean 1> NUL 2> NUL
+            )
+        )
+
+        ::
+        : Remove directories/makefile.auto created by the build.
+        ::
+        if exist "%_ROSSOURCEDIR%\obj-i386\." (
+            rd /s /q "%_ROSSOURCEDIR%\obj-i386" 1> NUL 2> NUL
+        )
+        if exist "%_ROSSOURCEDIR%\output-i386\." (
+            rd /s /q "%_ROSSOURCEDIR%\output-i386" 1> NUL 2> NUL
+        )
+        if exist "%_ROSSOURCEDIR%\reactos\." (
+            rd /s /q "%_ROSSOURCEDIR%\reactos" 1> NUL 2> NUL
+        )
+        if exist "%_ROSSOURCEDIR%\makefile.auto" (
+            del "%_ROSSOURCEDIR%\makefile.auto" 1> NUL 2> NUL
+        )
+
+        ::
+        : Now delete auto-generated/copied files not removed by make clean.
+        ::
+        del /f "%_ROSSOURCEDIR%\media\inf\syssetup.inf" 1> NUL 2> NUL
+        del /f "%_ROSSOURCEDIR%\include\roscfg.h" 1> NUL 2> NUL
+        del /f "%_ROSSOURCEDIR%\dll\win32\ole32\nodrop.cur" 1> NUL 2>
NUL
+        del /f "%_ROSSOURCEDIR%\dll\win32\ole32\drag_move.cur" 1> NUL 2>
NUL
+        del /f "%_ROSSOURCEDIR%\dll\win32\ole32\drag_copy.cur" 1> NUL 2>
NUL
+        del /f "%_ROSSOURCEDIR%\dll\win32\ole32\drag_link.cur" 1> NUL 2>
NUL
+        del /f "%_ROSSOURCEDIR%\dll\win32\comctl32\idc_divideropen.cur" 1>
NUL 2> NUL
+        del /f "%_ROSSOURCEDIR%\dll\win32\comctl32\idc_copy.cur" 1> NUL
2> NUL
+        del /f "%_ROSSOURCEDIR%\dll\win32\comctl32\idc_divider.cur" 1> NUL
2> NUL
+        del /f "%_ROSSOURCEDIR%\dll\win32\comctl32\idb_view_small.bmp" 1>
NUL 2> NUL
+        del /f "%_ROSSOURCEDIR%\dll\win32\comctl32\idb_std_large.bmp" 1> NUL
2> NUL
+        del /f "%_ROSSOURCEDIR%\dll\win32\comctl32\idb_view_large.bmp" 1>
NUL 2> NUL
+        del /f "%_ROSSOURCEDIR%\dll\win32\comctl32\idi_tt_info_sm.ico" 1>
NUL 2> NUL
+        del /f "%_ROSSOURCEDIR%\dll\win32\comctl32\idc_movebutton.cur" 1>
NUL 2> NUL
+        del /f "%_ROSSOURCEDIR%\dll\win32\comctl32\idi_tt_warn_sm.ico" 1>
NUL 2> NUL
+        del /f "%_ROSSOURCEDIR%\dll\win32\comctl32\idi_dragarrow.ico" 1> NUL
2> NUL
+        del /f "%_ROSSOURCEDIR%\dll\win32\comctl32\idb_hist_small.bmp" 1>
NUL 2> NUL
+        del /f "%_ROSSOURCEDIR%\dll\win32\comctl32\idb_hist_large.bmp" 1>
NUL 2> NUL
+        del /f "%_ROSSOURCEDIR%\dll\win32\comctl32\idt_check.bmp" 1> NUL
2> NUL
+        del /f "%_ROSSOURCEDIR%\dll\win32\comctl32\idi_tt_error_sm.ico" 1>
NUL 2> NUL
+        del /f "%_ROSSOURCEDIR%\dll\win32\comctl32\idb_std_small.bmp" 1> NUL
2> NUL
+        del /f "%_ROSSOURCEDIR%\dll\win32\msi\instabsent.bmp" 1> NUL 2>
NUL
+        del /f "%_ROSSOURCEDIR%\dll\win32\msi\instlocal.bmp" 1> NUL 2>
NUL
+        del /f "%_ROSSOURCEDIR%\dll\win32\msi\instadvert.bmp" 1> NUL 2>
NUL
+        del /f "%_ROSSOURCEDIR%\dll\win32\comdlg32\network.ico" 1> NUL 2>
NUL
+        del /f "%_ROSSOURCEDIR%\dll\win32\comdlg32\fontpics.bmp" 1> NUL
2> NUL
+        del /f "%_ROSSOURCEDIR%\dll\win32\comdlg32\pd32_nocollate.ico" 1>
NUL 2> NUL
+        del /f "%_ROSSOURCEDIR%\dll\win32\comdlg32\pd32_collate.ico" 1> NUL
2> NUL
+        del /f "%_ROSSOURCEDIR%\dll\win32\comdlg32\folder.ico" 1> NUL 2>
NUL
+        del /f "%_ROSSOURCEDIR%\dll\win32\comdlg32\cdrom.ico" 1> NUL 2>
NUL
+        del /f "%_ROSSOURCEDIR%\dll\win32\comdlg32\floppy.ico" 1> NUL 2>
NUL
+        del /f "%_ROSSOURCEDIR%\dll\win32\comdlg32\pd32_landscape.ico" 1>
NUL 2> NUL
+        del /f "%_ROSSOURCEDIR%\dll\win32\comdlg32\folder2.ico" 1> NUL 2>
NUL
+        del /f "%_ROSSOURCEDIR%\dll\win32\comdlg32\800.bmp" 1> NUL 2>
NUL
+        del /f "%_ROSSOURCEDIR%\dll\win32\comdlg32\pd32_portrait.ico" 1> NUL
2> NUL
+        del /f "%_ROSSOURCEDIR%\dll\win32\comdlg32\hdisk.ico" 1> NUL 2>
NUL
+
+        echo Done cleaning ReactOS source directory.
+    ) else (
+        echo There is nothing to clean.
     )
-    if exist "%_ROSSOURCEDIR%\output-i386\." (
-        rd /s /q "%_ROSSOURCEDIR%\output-i386" 1> NUL 2> NUL
+)
+if "%1" == "logs" (
+    ::
+    : Check if we have any logs to clean, if so, clean them.
+    ::
+    if exist "%_ROSBELOGDIR%\*.txt" (
+        echo Cleaning build logs...
+
+        del /f "%_ROSBELOGDIR%\*.txt" 1> NUL 2> NUL
+
+        echo Done cleaning build logs.
+    ) else (
+        echo There are no logs to clean.
     )
-    if exist "%_ROSSOURCEDIR%\reactos\." (
-        rd /s /q "%_ROSSOURCEDIR%\reactos" 1> NUL 2> NUL
-    )
-    if exist "%_ROSSOURCEDIR%\makefile.auto" (
-        del "%_ROSSOURCEDIR%\makefile.auto" 1> NUL 2> NUL
-    )
-
-    ::
-    : Now delete auto-generated/copied files not removed by make clean.
-    ::
-    del /f "%_ROSSOURCEDIR%\media\inf\syssetup.inf" 1> NUL 2> NUL
-    del /f "%_ROSSOURCEDIR%\include\roscfg.h" 1> NUL 2> NUL
-    del /f "%_ROSSOURCEDIR%\dll\win32\ole32\nodrop.cur" 1> NUL 2> NUL
-    del /f "%_ROSSOURCEDIR%\dll\win32\ole32\drag_move.cur" 1> NUL 2> NUL
-    del /f "%_ROSSOURCEDIR%\dll\win32\ole32\drag_copy.cur" 1> NUL 2> NUL
-    del /f "%_ROSSOURCEDIR%\dll\win32\ole32\drag_link.cur" 1> NUL 2> NUL
-    del /f "%_ROSSOURCEDIR%\dll\win32\comctl32\idc_divideropen.cur" 1> NUL
2> NUL
-    del /f "%_ROSSOURCEDIR%\dll\win32\comctl32\idc_copy.cur" 1> NUL 2>
NUL
-    del /f "%_ROSSOURCEDIR%\dll\win32\comctl32\idc_divider.cur" 1> NUL 2>
NUL
-    del /f "%_ROSSOURCEDIR%\dll\win32\comctl32\idb_view_small.bmp" 1> NUL
2> NUL
-    del /f "%_ROSSOURCEDIR%\dll\win32\comctl32\idb_std_large.bmp" 1> NUL
2> NUL
-    del /f "%_ROSSOURCEDIR%\dll\win32\comctl32\idb_view_large.bmp" 1> NUL
2> NUL
-    del /f "%_ROSSOURCEDIR%\dll\win32\comctl32\idi_tt_info_sm.ico" 1> NUL
2> NUL
-    del /f "%_ROSSOURCEDIR%\dll\win32\comctl32\idc_movebutton.cur" 1> NUL
2> NUL
-    del /f "%_ROSSOURCEDIR%\dll\win32\comctl32\idi_tt_warn_sm.ico" 1> NUL
2> NUL
-    del /f "%_ROSSOURCEDIR%\dll\win32\comctl32\idi_dragarrow.ico" 1> NUL
2> NUL
-    del /f "%_ROSSOURCEDIR%\dll\win32\comctl32\idb_hist_small.bmp" 1> NUL
2> NUL
-    del /f "%_ROSSOURCEDIR%\dll\win32\comctl32\idb_hist_large.bmp" 1> NUL
2> NUL
-    del /f "%_ROSSOURCEDIR%\dll\win32\comctl32\idt_check.bmp" 1> NUL 2>
NUL
-    del /f "%_ROSSOURCEDIR%\dll\win32\comctl32\idi_tt_error_sm.ico" 1> NUL
2> NUL
-    del /f "%_ROSSOURCEDIR%\dll\win32\comctl32\idb_std_small.bmp" 1> NUL
2> NUL
-    del /f "%_ROSSOURCEDIR%\dll\win32\msi\instabsent.bmp" 1> NUL 2> NUL
-    del /f "%_ROSSOURCEDIR%\dll\win32\msi\instlocal.bmp" 1> NUL 2> NUL
-    del /f "%_ROSSOURCEDIR%\dll\win32\msi\instadvert.bmp" 1> NUL 2> NUL
-    del /f "%_ROSSOURCEDIR%\dll\win32\comdlg32\network.ico" 1> NUL 2>
NUL
-    del /f "%_ROSSOURCEDIR%\dll\win32\comdlg32\fontpics.bmp" 1> NUL 2>
NUL
-    del /f "%_ROSSOURCEDIR%\dll\win32\comdlg32\pd32_nocollate.ico" 1> NUL
2> NUL
-    del /f "%_ROSSOURCEDIR%\dll\win32\comdlg32\pd32_collate.ico" 1> NUL
2> NUL
-    del /f "%_ROSSOURCEDIR%\dll\win32\comdlg32\folder.ico" 1> NUL 2> NUL
-    del /f "%_ROSSOURCEDIR%\dll\win32\comdlg32\cdrom.ico" 1> NUL 2> NUL
-    del /f "%_ROSSOURCEDIR%\dll\win32\comdlg32\floppy.ico" 1> NUL 2> NUL
-    del /f "%_ROSSOURCEDIR%\dll\win32\comdlg32\pd32_landscape.ico" 1> NUL
2> NUL
-    del /f "%_ROSSOURCEDIR%\dll\win32\comdlg32\folder2.ico" 1> NUL 2>
NUL
-    del /f "%_ROSSOURCEDIR%\dll\win32\comdlg32\800.bmp" 1> NUL 2> NUL
-    del /f "%_ROSSOURCEDIR%\dll\win32\comdlg32\pd32_portrait.ico" 1> NUL
2> NUL
-    del /f "%_ROSSOURCEDIR%\dll\win32\comdlg32\hdisk.ico" 1> NUL 2> NUL
-
-    echo Done cleaning ReactOS source directory.
-) else (
-    echo There is nothing to clean.
+    goto :EOF
 )
+if not "%1" == "" (
+    echo Unknown parameter specified. Try 'help [COMMAND]'.
+    goto :EOF
+)

Modified: trunk/tools/RosBE/Help.cmd
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/Help.cmd?rev=25427&…
==============================================================================
--- trunk/tools/RosBE/Help.cmd (original)
+++ trunk/tools/RosBE/Help.cmd Thu Jan 11 23:07:24 2007
@@ -5,14 +5,53 @@
 ::    ReactOS Build Environment.
 @echo off
 
-echo.
-echo Available Commands:
-echo    make [OPTIONS]  - make, without options does a standard build of
-echo                      ReactOS. OPTIONS are the standard ReactOS build
-echo                      options ie. bootcd.
-echo    makex [OPTIONS] - Same as 'make' but automatically determines the
-echo                      number of CPUs in the system and uses -j with
-echo                      the appropriate number.
-echo    clean           - Fully clean the ReactOS source directory.
-echo    help            - Display the available commands.
-echo    basedir         - Switch back to the ReactOS source directory.
+if "%1" == "" (
+    echo.
+    echo Available Commands:
+    echo    make [OPTIONS]  - make, without options does a standard build of
+    echo                      ReactOS. OPTIONS are the standard ReactOS build
+    echo                      options ie. bootcd.
+    echo    makex [OPTIONS] - Same as 'make' but automatically determines the
+    echo                      number of CPUs in the system and uses -j with
+    echo                      the appropriate number.
+    echo    clean           - Fully clean the ReactOS source directory.
+    echo    help            - Display the available commands.
+    echo    basedir         - Switch back to the ReactOS source directory.
+    goto :EOF
+)
+if "%1" == "make" (
+    echo Usage: make [OPTIONS]
+    echo make, without options does a standard build of ReactOS. OPTIONS
+    echo are the standard ReactOS build options ie. bootcd.
+    goto :EOF
+)
+if "%1" == "makex" (
+    echo Usage: makex [OPTIONS]
+    echo Same as 'make' but automatically determines the number of CPUs
+    echo in the system and uses -j with the appropriate number.
+    echo NOTE: The number makex uses can be modified by editing
+    echo       Build-Multi.cmd located in the RosBE directory,
+    echo       instructions for doing so are contained within the file.
+    goto :EOF
+)
+if "%1" == "clean" (
+    echo Usage: clean [OPTION]
+    echo Fully clean the ReactOS source directory.
+    echo.
+    echo   logs - Removes all build logs in the RosBE-Logs directory.
+    goto :EOF
+)
+if "%1" == "help" (
+    echo Usage: help [COMMAND]
+    echo Shows help for the specified command or lists all available commands.
+    goto :EOF
+)
+if "%1" == "basedir" (
+    echo Usage: basedir
+    echo Switches back to the ReactOS source directory.
+    goto :EOF
+)
+if not "%1" == "" (
+    echo Unknown parameter specified. Try 'help [COMMAND]'.
+    goto :EOF
+)

Modified: trunk/tools/RosBE/RosBE.mac
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE.mac?rev=25427&am…
==============================================================================
--- trunk/tools/RosBE/RosBE.mac (original)
+++ trunk/tools/RosBE/RosBE.mac Thu Jan 11 23:07:24 2007
@@ -1,5 +1,5 @@
 BASEDIR = cd /d %_ROSSOURCEDIR%
-CLEAN   = %ROSBEBASEDIR%\Clean.cmd
-HELP    = %ROSBEBASEDIR%\Help.cmd
+CLEAN   = %ROSBEBASEDIR%\Clean.cmd $*
+HELP    = %ROSBEBASEDIR%\Help.cmd $*
 MAKE    = %ROSBEBASEDIR%\Build.cmd $*
 MAKEX   = %ROSBEBASEDIR%\Build-Multi.cmd $*