[ros-diffs] [dreimer] 44357: Wouldn't be me if I need two commits for getting this done, right? Just realized that starting make will call our script. Fixed this by renaming it to make.exe.

[dreimer at svn.reactos.org]

Author: dreimer
Date: Wed Dec  2 09:44:16 2009
New Revision: 44357

URL: http://svn.reactos.org/svn/reactos?rev=44357&view=rev
Log:
Wouldn't be me if I need two commits for getting this done, right?
Just realized that starting make will call our script. Fixed this by renaming it to make.exe.

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

Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1?rev=44357&r1=44356&r2=44357&view=diff
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 [iso-8859-1] Wed Dec  2 09:44:16 2009
@@ -60,9 +60,9 @@
         New-Item -path "$_ROSBE_LOGDIR" -type directory
     }
     $file = "$_ROSBE_LOGDIR\BuildLog-$_ROSBE_TARGET_GCCVERSION-$DATENAME-$TIMENAME.txt"
-    &{IEX "&'make' -j $MAKE_JOBS $($args)"} $($args) 2>&1 | tee-object $file
+    &{IEX "&'make.exe' -j $MAKE_JOBS $($args)"} $($args) 2>&1 | tee-object $file
 } else {
-    &{IEX "&'make' -j $MAKE_JOBS $($args)"} $($args)
+    &{IEX "&'make.exe' -j $MAKE_JOBS $($args)"} $($args)
 }
 if ($_ROSBE_SHOWTIME -eq 1) {
     $sw.Stop()

Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/version.ps1
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershell/version.ps1?rev=44357&r1=44356&r2=44357&view=diff
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Powershell/version.ps1 [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Powershell/version.ps1 [iso-8859-1] Wed Dec  2 09:44:16 2009
@@ -30,4 +30,4 @@
 & bison '--version' | select-string "GNU Bison"
 $fver = (& flex '--version') -replace ".*version ((\d|\.)+).*",'$1'
 "flex $fver"
-& make -v | & find "GNU Make"
+& make.exe -v | & find "GNU Make"

Modified: trunk/tools/RosBE/RosBE-Windows/Root/Build-Shared.cmd
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Build-Shared.cmd?rev=44357&r1=44356&r2=44357&view=diff
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Root/Build-Shared.cmd [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Root/Build-Shared.cmd [iso-8859-1] Wed Dec  2 09:44:16 2009
@@ -55,9 +55,9 @@
     if not exist "%_ROSBE_LOGDIR%\." (
         mkdir "%_ROSBE_LOGDIR%" 1> NUL 2> NUL
     )
-    %BUILDTIME_COMMAND% "make" -j %MAKE_JOBS% %* 2>&1 | "%_ROSBE_BASEDIR%\Tools\tee.exe" "%_ROSBE_LOGDIR%\BuildLog-%_ROSBE_TARGET_GCCVERSION%-%datename%-%timename%.txt"
+    %BUILDTIME_COMMAND% "make.exe" -j %MAKE_JOBS% %* 2>&1 | "%_ROSBE_BASEDIR%\Tools\tee.exe" "%_ROSBE_LOGDIR%\BuildLog-%_ROSBE_TARGET_GCCVERSION%-%datename%-%timename%.txt"
 ) else (
-    %BUILDTIME_COMMAND% "make" -j %MAKE_JOBS% %*
+    %BUILDTIME_COMMAND% "make.exe" -j %MAKE_JOBS% %*
 )
 
 :EOC

Modified: trunk/tools/RosBE/RosBE-Windows/Root/version.cmd
URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/version.cmd?rev=44357&r1=44356&r2=44357&view=diff
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Root/version.cmd [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Root/version.cmd [iso-8859-1] Wed Dec  2 09:44:16 2009
@@ -32,4 +32,4 @@
 :: Bison, Flex and Make
 bison --version | find "GNU Bison"
 flex --version
-make -v | find "GNU Make"
+make.exe -v | find "GNU Make"