- Simplified Build-Shared a bit.

- Updated ChangeLog.txt.
- Some Code modifications in sSVN for eye candy and future updates.
- Updated cutz workaround for supporting sSVN.

svn path=/trunk/tools/RosBE-Windows/; revision=340

RosBE-Windows/Root/Build-Shared.cmd

@@ -10,8 +10,6 @@
 ::
 @echo off
 
-title Building...
-
 ::
 :: Take over the 2nd parameter of Build.cmd, which enables/disables stripping
 ::
@@ -75,23 +73,21 @@ call "%ROSBEBASEDIR%\TimeDate.cmd"
 ::
 :: Now use mingw32-make to build ReactOS, passing along options, if any.
 ::
+title Started: %TIMERAW%, Building...
+
 if %ROSBE_SHOWTIME% == 1 (
     if %ROSBE_WRITELOG% == 1 (
-        title Started: %TIMERAW%, Building...
         call buildtime "%MAKE_COMMAND%" 2>&1 | tee "%_ROSBELOGDIR%\BuildLog-%_MINGWVERSION%-%DATENAME%-%TIMENAME%.txt"
     )
     if %ROSBE_WRITELOG% == 0 (
-        title Started: %TIMERAW%, Building...
         call buildtime "%MAKE_COMMAND%" 2>&1
     )
 )
 if %ROSBE_SHOWTIME% == 0 (
     if %ROSBE_WRITELOG% == 1 (
-        title Started: %TIMERAW%, Building...
         call "%MAKE_COMMAND%" 2>&1 | tee "%_ROSBELOGDIR%\BuildLog-%_MINGWVERSION%-%DATENAME%-%TIMENAME%.txt"
     )
     if %ROSBE_WRITELOG% == 0 (
-        title Started: %TIMERAW%, Building...
         call "%MAKE_COMMAND%" 2>&1
     )
 )
@@ -101,7 +97,5 @@ if %ROSBE_SHOWTIME% == 0 (
 ::
 call flash
 
-goto :EOB
-
 :EOB
 title ReactOS Build Environment %_VER%

RosBE-Windows/Root/ChangeLog.txt

@@ -1,11 +1,16 @@
 *** Oct XXth, 2007 - RosBE 0.3.8 Released
 
-- Added DrFred's Config Tool.
+- Added DrFred's Config Tool. (Daniel Reimer)
+
+*** Aug XXst, 2007 - RosBE 0.3.7.2 Released
+
+- Fixed the double \\ Bug introduced in 0.3.7. (Daniel Reimer)
+- Added Build Begin Time into Topic. (Daniel Reimer)
 
 *** July 26th, 2007 - RosBE 0.3.7.1 Released
 
-- Fixed: "No SVN Tree found" message in Vista.
+- Fixed: "No SVN Tree found" message in Vista. (Daniel Reimer)
-- All commands use the current dir now. SO you can use several SVN Source Trees now.
+- All commands use the current dir now. SO you can use several SVN Source Trees now. (Daniel Reimer)
 
 *** July 22nd, 2007 - RosBE 0.3.7 Released
 

RosBE-Windows/Root/sSVN.cmd

@@ -50,14 +50,25 @@ if "%1" == "create" (
 if "%1" == "status" (
     title Status
     call svn info "%CD%" > "%ROSBEBASEDIR%\x.tmp"
-    echo Recent Offline Revision:
+    call grep Revision: "%ROSBEBASEDIR%\x.tmp"|cutz svn > "%ROSBEBASEDIR%\offsvn.tmp"
-    call grep Revision: "%ROSBEBASEDIR%\x.tmp"|cut -d " " -f 2
+    set /P OFFSVN=< "%ROSBEBASEDIR%\offsvn.tmp"
-    del "%ROSBEBASEDIR%\x.tmp"
+    call svn info svn://svn.reactos.org/reactos/trunk/reactos > "%ROSBEBASEDIR%\y.tmp"
-
+    call grep Revision: "%ROSBEBASEDIR%\y.tmp"|cutz svn > "%ROSBEBASEDIR%\onsvn.tmp"
-    call svn info svn://svn.reactos.org/reactos/trunk/reactos > "%ROSBEBASEDIR%\x.tmp"
+    set /P ONSVN=< "%ROSBEBASEDIR%\onsvn.tmp"
-    echo Online HEAD Revision:
+    echo Recent Offline Revision: %OFFSVN%
-    call grep Revision: "%ROSBEBASEDIR%\x.tmp"|cut -d " " -f 2
+    echo Online HEAD Revision: %ONSVN%
+    del "%ROSBEBASEDIR%\offsvn.tmp"
+    del "%ROSBEBASEDIR%\onsvn.tmp"
     del "%ROSBEBASEDIR%\x.tmp"
+    del "%ROSBEBASEDIR%\y.tmp"
+    echo.
+    if %OFFSVN% LSS %ONSVN% (
+        echo Your Tree is not Up to date. Do you want to update it?
+        goto :UP
+    )
+    if %OFFSVN% EQU %ONSVN% (
+    echo Your Tree is Up to date.
+    )
     goto :ExitSVN
 )
 
@@ -66,5 +77,11 @@ if not "%1" == "" (
     goto :ExitSVN
 )
 
+:UP
+SET /P XY=(yes), (no)
+
+if /I "%XY%"=="yes" call %ROSBEBASEDIR%\ssvn update
+if /I "%XY%"=="no" goto :ExitSVN
+
 :ExitSVN
 title ReactOS Build Environment %_VER%

RosBE-Windows/Root/test.cmd

@@ -24,9 +24,9 @@ SET /P XY=
 goto :RUN
 
 :RUN
-grep \"%XY%\" "%ROSBEBASEDIR%\srclist.xml"|cutz > "%ROSBEBASEDIR%\aaa.tmp"
+grep \"%XY%\" "%ROSBEBASEDIR%\srclist.xml"|cutz dir > "%ROSBEBASEDIR%\aaa.tmp"
 set /P dir=< "%ROSBEBASEDIR%\aaa.tmp"
 del "%ROSBEBASEDIR%\aaa.tmp"
-cd %dir%
+cd /D %dir%
 
 title ReactOS Build Environment %_VER%

RosBE-Windows/Tools/cutz.cmd

@@ -7,4 +7,9 @@
 ::
 ::
 @echo off
-cut -d "\"" -f 4
+if "%1" == "dir" (
+    cut -d "\"" -f 4
+)
+if "%1" == "svn" (
+    cut -d " " -f 2
+)