From 15850d51fa749a6495918e1d172fca906d486aa4 Mon Sep 17 00:00:00 2001
From: Daniel Reimer <reimer.daniel@freenet.de>
Date: Tue, 5 Jun 2007 21:40:49 +0000
Subject: [PATCH] I did not see that there were changes done by GedMurphy and
 Colin Finck. Readded again. Sry...

svn path=/trunk/tools/RosBE-Windows/; revision=211
---
 RosBE-Windows/Root/Build-Shared.cmd | 33 ++++++++++++++++++++++++++
 RosBE-Windows/Root/Build.cmd        | 36 ++++++-----------------------
 2 files changed, 40 insertions(+), 29 deletions(-)
 create mode 100644 RosBE-Windows/Root/Build-Shared.cmd

diff --git a/RosBE-Windows/Root/Build-Shared.cmd b/RosBE-Windows/Root/Build-Shared.cmd
new file mode 100644
index 0000000..7a2fefd
--- /dev/null
+++ b/RosBE-Windows/Root/Build-Shared.cmd
@@ -0,0 +1,33 @@
+:: Shared actions for "Build.cmd" and "Build-Multi.cmd"
+
+::
+:: Check if config.template.rbuild is newer than config.rbuild,
+:: if it is then abort the build and inform the user.
+::
+if exist "%_ROSSOURCEDIR%\config.rbuild" (
+    "%ROSBEBASEDIR%\Tools\test.exe" "%_ROSSOURCEDIR%\config.template.rbuild" -nt "%_ROSSOURCEDIR%\config.rbuild"
+    if not errorlevel 1 (
+        echo.
+        echo *** config.template.rbuild is newer than config.rbuild ***
+        echo *** aborting build. Please check for changes and       ***
+        echo *** update your config.rbuild.                         ***
+        echo.
+        goto :EOF
+    )
+)
+
+::
+:: Get the current date and time for use in
+:: in our build log's file name.
+::
+call %ROSBEBASEDIR%\TimeDate.cmd
+
+::
+:: Execute the Build command
+::
+call "%ROSBEBASEDIR%\Tools\buildtime.exe" %MAKE_COMMAND% 2>&1 | "%ROSBEBASEDIR%\Tools\tee.exe" "%_ROSBELOGDIR%\BuildLog-%_MINGWVERSION%-%DATENAME%-%TIMENAME%.txt"
+
+::
+:: highlight the fact that building has ended
+::
+call "%ROSBEBASEDIR%\Tools\flash.exe"
diff --git a/RosBE-Windows/Root/Build.cmd b/RosBE-Windows/Root/Build.cmd
index 0d7de93..5407594 100644
--- a/RosBE-Windows/Root/Build.cmd
+++ b/RosBE-Windows/Root/Build.cmd
@@ -1,37 +1,15 @@
-:: Copyright (c) Peter Ward and Daniel Reimer. All rights reserved.
+:: Copyright (c) Peter Ward.  All rights reserved.
+::      (Inspired by Dazzle from TinyKRNL)
 ::
-:: Perform the build of ReactOS.
-::
-title Building...
-
+::    Perform the build of ReactOS.
 @echo off
 
 ::
-:: Get the current date and time for use in in our build log's file name.
+:: Set the build command
 ::
-call "%ROSBEBASEDIR%\TimeDate.cmd"
+set MAKE_COMMAND="%_MINGWMAKE%" %*
 
 ::
-:: Check if config.template.rbuild is newer than config.rbuild,
-:: if it is then abort the build and inform the user.
+:: Execute the shared build commands
 ::
-if exist "%_ROSSOURCEDIR%\config.rbuild" (
-    "%ROSBEBASEDIR%\Tools\test.exe" "%_ROSSOURCEDIR%\config.template.rbuild" -nt "%_ROSSOURCEDIR%\config.rbuild"
-    if not errorlevel 1 (
-        echo.
-        echo *** config.template.rbuild is newer than config.rbuild ***
-        echo *** aborting build. Please check for changes and       ***
-        echo *** update your config.rbuild.                         ***
-        echo.
-        goto :EOF
-    )
-)
-
-::
-:: Now use mingw32-make to build ReactOS, passing along options, if any.
-::
-if "%1" == "" (
-    %ROSBEBASEDIR%\Tools\buildtime.exe %_MINGWMAKE% 2>&1 | %ROSBEBASEDIR%\Tools\tee.exe %_ROSBELOGDIR%\BuildLog-%_MINGWVERSION%-%DATENAME%-%TIMENAME%.txt
-) else (
-    %ROSBEBASEDIR%\Tools\buildtime.exe %_MINGWMAKE% %* 2>&1 | %ROSBEBASEDIR%\Tools\tee.exe %_ROSBELOGDIR%\BuildLog-%_MINGWVERSION%-%DATENAME%-%TIMENAME%.txt
-)
+call "%ROSBEBASEDIR%\Build-Shared.cmd"