[ros-diffs] [dreimer] 40887: Fix support for commands like: "make bootcd livecd install" Fix tee command in PS

Author: dreimer
Date: Mon May 11 22:01:29 2009
New Revision: 40887

URL: http://svn.reactos.org/svn/reactos?rev=40887&view=rev
Log:
Fix support for commands like: "make bootcd livecd install"
Fix tee command in PS

Modified:
    trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1
    trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd

Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 [iso-8859-1] Mon May 11 22:01:29
2009
@@ -90,11 +90,11 @@
 if ($_ROSBE_WRITELOG -eq 1) {
     $sw.Start()
     $file =
"$_ROSBE_LOGDIR\BuildLog-$_ROSBE_TARGET_GCCVERSION-$DATENAME-$TIMENAME.txt"
-    IEX "&'$_ROSBE_MINGWMAKE' -j $MAKE_JOBS $($args)" | tee-object
$file
+    &{IEX "&'$_ROSBE_MINGWMAKE' -j $MAKE_JOBS $($args)"}
2>&1 | tee-object $file
     $sw.Stop()
 } else {
     $sw.Start()
-    IEX "&'$_ROSBE_MINGWMAKE' -j $MAKE_JOBS $($args)"
+    &{IEX "&'$_ROSBE_MINGWMAKE' -j $MAKE_JOBS $($args)"}
     $sw.Stop()
 }
 write-host "Total Build Time:" $sw.Elapsed.ToString()

Modified: trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Bui…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd [iso-8859-1] Mon May 11 22:01:29 2009
@@ -50,10 +50,10 @@
 if "%1" == "multi" (
     shift
     set MAKE_JOBS=%_ROSBE_MAKEX_JOBS%
-    set TITLE_COMMAND=makex %2
+    set TITLE_COMMAND=makex %2%3%4%5%6%7%8%9 
 ) else (
     set MAKE_JOBS=1
-    set TITLE_COMMAND=make %1
+    set TITLE_COMMAND=make %*
 )
 
 title '%TITLE_COMMAND%' build started: %TIMERAW%   (%ROS_ARCH%)
@@ -66,9 +66,9 @@
 )
 
 if %_ROSBE_WRITELOG% == 1 (
-    %BUILDTIME_COMMAND% "%_ROSBE_MINGWMAKE%" -j %MAKE_JOBS% %1 2>&1 |
"%_ROSBE_BASEDIR%\Tools\tee.exe"
"%_ROSBE_LOGDIR%\BuildLog-%_ROSBE_TARGET_GCCVERSION%-%datename%-%timename%.txt"
+    %BUILDTIME_COMMAND% "%_ROSBE_MINGWMAKE%" -j %MAKE_JOBS% %1 %2 %3 %4 %5 %6
%7 %8 %9 2>&1 | "%_ROSBE_BASEDIR%\Tools\tee.exe"
"%_ROSBE_LOGDIR%\BuildLog-%_ROSBE_TARGET_GCCVERSION%-%datename%-%timename%.txt"
 ) else (
-    %BUILDTIME_COMMAND% "%_ROSBE_MINGWMAKE%" -j %MAKE_JOBS% %1
+    %BUILDTIME_COMMAND% "%_ROSBE_MINGWMAKE%" -j %MAKE_JOBS% %1 %2 %3 %4 %5 %6
%7 %8 %9
 )
 
 :EOC