[ros-diffs] [dreimer] 48354: oops, forgot to rename make to mingw32-make again to make cmake happy. Started the PS Part of this Support Update.

Author: dreimer
Date: Thu Jul 29 13:52:49 2010
New Revision: 48354

URL: http://svn.reactos.org/svn/reactos?rev=48354&view=rev
Log:
oops, forgot to rename make to mingw32-make again to make cmake happy.
Started the PS Part of this Support Update.

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

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] Thu Jul 29 13:52:49
2010
@@ -58,9 +58,9 @@
         New-Item -path "$_ROSBE_LOGDIR" -type directory
     }
     $file = "$_ROSBE_LOGDIR\BuildLog-$ENV:ROS_ARCH-$DATENAME-$TIMENAME.txt"
-    &{IEX "&'make.exe' -j $MAKE_JOBS $($args)"} $($args)
2>&1 | tee-object $file
+    &{IEX "&'mingw32-make.exe' -j $MAKE_JOBS $($args)"}
$($args) 2>&1 | tee-object $file
 } else {
-    &{IEX "&'make.exe' -j $MAKE_JOBS $($args)"} $($args)
+    &{IEX "&'mingw32-make.exe' -j $MAKE_JOBS $($args)"}
$($args)
 }
 if ($_ROSBE_SHOWTIME -eq 1) {
     $sw.Stop()

Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] Thu Jul 29 13:52:49
2010
@@ -125,8 +125,21 @@
     }
 
     set-alias HELP "$_ROSBE_BASEDIR\Help.ps1" -scope Global
-    set-alias MAKE "$_ROSBE_BASEDIR\Build.ps1" -scope Global
-    function global:MAKEX {IEX "&'$_ROSBE_BASEDIR\Build.ps1' multi
$args"}
+    function global:MAKE {
+        if (Test-Path ".\CMakeLists.txt") {
+            IEX "&'$_ROSBE_BASEDIR\CBuild.ps1'"
+        } else {
+            IEX "&'$_ROSBE_BASEDIR\Build.ps1'"
+        }
+    }
+
+    function global:MAKEX {
+        if (Test-Path ".\CMakeLists.txt") {
+            IEX "&'$_ROSBE_BASEDIR\CBuild.ps1' multi $args"
+        } else {
+            IEX "&'$_ROSBE_BASEDIR\Build.ps1' multi $args"
+        }
+    }
 
     if (Test-Path "$_ROSBE_BASEDIR\playwav.ps1") {
         set-alias PLAYWAV "$_ROSBE_BASEDIR\playwav.ps1" -scope Global

Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/version.ps1
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Powershell/version.ps1 [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Powershell/version.ps1 [iso-8859-1] Thu Jul 29
13:52:49 2010
@@ -29,4 +29,4 @@
 & bison '--version' | select-string "GNU Bison"
 $fver = (& flex '--version') -replace ".*version
((\d|\.)+).*",'$1'
 "flex $fver"
-& make.exe -v | & find "GNU Make"
+& mingw32-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/Bui…
==============================================================================
--- 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] Thu Jul 29 13:52:49
2010
@@ -55,9 +55,9 @@
     if not exist "%_ROSBE_LOGDIR%\." (
         mkdir "%_ROSBE_LOGDIR%" 1> NUL 2> NUL
     )
-    %BUILDTIME_COMMAND% make.exe -j %MAKE_JOBS% %* 2>&1 | tee.exe
"%_ROSBE_LOGDIR%\BuildLog-%ROS_ARCH%-%datename%-%timename%.txt"
+    %BUILDTIME_COMMAND% mingw32-make.exe -j %MAKE_JOBS% %* 2>&1 | tee.exe
"%_ROSBE_LOGDIR%\BuildLog-%ROS_ARCH%-%datename%-%timename%.txt"
 ) else (
-    %BUILDTIME_COMMAND% make.exe -j %MAKE_JOBS% %*
+    %BUILDTIME_COMMAND% mingw32-make.exe -j %MAKE_JOBS% %*
 )
 
 :EOC

Modified: trunk/tools/RosBE/RosBE-Windows/Root/CMake-Shared.cmd
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/CMa…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Root/CMake-Shared.cmd [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Root/CMake-Shared.cmd [iso-8859-1] Thu Jul 29 13:52:49
2010
@@ -42,9 +42,9 @@
 cd build
 cmake.exe -G "MinGW Makefiles" ..\..\
 if %_ROSBE_WRITELOG% == 1 (
-    %BUILDTIME_COMMAND% make.exe -j %MAKE_JOBS% %* 2>&1 | tee.exe
"%_ROSBE_LOGDIR%\BuildToolLog-%ROS_ARCH%-%datename%-%timename%.txt"
+    %BUILDTIME_COMMAND% mingw32-make.exe -j %MAKE_JOBS% %* 2>&1 | tee.exe
"%_ROSBE_LOGDIR%\BuildToolLog-%ROS_ARCH%-%datename%-%timename%.txt"
 ) else (
-    %BUILDTIME_COMMAND% make.exe -j %MAKE_JOBS% %*
+    %BUILDTIME_COMMAND% mingw32-make.exe -j %MAKE_JOBS% %*
 )
 cd..
 
@@ -54,9 +54,9 @@
 cd build-ros
 cmake.exe -G "MinGW Makefiles" -DCMAKE_TOOLCHAIN_FILE=toolchain-mingw32.cmake
..\..\
 if %_ROSBE_WRITELOG% == 1 (
-    %BUILDTIME_COMMAND% make.exe -j %MAKE_JOBS% %* 2>&1 | tee.exe
"%_ROSBE_LOGDIR%\BuildROSLog-%ROS_ARCH%-%datename%-%timename%.txt"
+    %BUILDTIME_COMMAND% mingw32-make.exe -j %MAKE_JOBS% %* 2>&1 | tee.exe
"%_ROSBE_LOGDIR%\BuildROSLog-%ROS_ARCH%-%datename%-%timename%.txt"
 ) else (
-    %BUILDTIME_COMMAND% make.exe -j %MAKE_JOBS% %*
+    %BUILDTIME_COMMAND% mingw32-make.exe -j %MAKE_JOBS% %*
 )
 cd..
 

Modified: trunk/tools/RosBE/RosBE-Windows/Root/version.cmd
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/ver…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Root/version.cmd [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Root/version.cmd [iso-8859-1] Thu Jul 29 13:52:49
2010
@@ -32,4 +32,4 @@
 :: Bison, Flex and Make
 bison --version | find "GNU Bison"
 flex --version
-make.exe -v | find "GNU Make"
+mingw32-make.exe -v | find "GNU Make"

Modified: trunk/tools/RosBE/RosBE-Windows/RosBE.nsi
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/RosBE.ns…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/RosBE.nsi [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/RosBE.nsi [iso-8859-1] Thu Jul 29 13:52:49 2010
@@ -120,6 +120,7 @@
     File /r Root\LICENSE.txt
     File /r Root\Basedir.cmd
     File /r Root\Build-Shared.cmd
+    File /r Root\CMake-Shared.cmd
     File /r Root\charch.cmd
     File /r Root\chdefgcc.cmd
     File /r Root\Clean.cmd
@@ -276,6 +277,7 @@
     SetOutPath "$INSTDIR"
     SetOverwrite try
     File /r Components\Powershell\Build.ps1
+    File /r Components\Powershell\CBuild.ps1
     File /r Components\Powershell\RosBE.ps1
     File /r Components\Powershell\rosbe-gcc-env.ps1
     File /r Components\Powershell\Help.ps1
@@ -406,7 +408,9 @@
     NO_SHORTCUTS:
     Delete /REBOOTOK "$INSTDIR\Basedir.cmd"
     Delete /REBOOTOK "$INSTDIR\Build.ps1"
+    Delete /REBOOTOK "$INSTDIR\CBuild.ps1"
     Delete /REBOOTOK "$INSTDIR\Build-Shared.cmd"
+    Delete /REBOOTOK "$INSTDIR\CMake-Shared.cmd"
     Delete /REBOOTOK "$INSTDIR\chdefdir.cmd"
     Delete /REBOOTOK "$INSTDIR\chdefdir.ps1"
     Delete /REBOOTOK "$INSTDIR\charch.cmd"