Author: gedmurphy
Date: Wed Dec 2 10:16:10 2009
New Revision: 44358
URL: http://svn.reactos.org/svn/reactos?rev=44358&view=rev
Log:
Handle the upcoming name change from mingw32-make.exe to make.exe in the next
version of RosBE.
Modified:
trunk/reactos/rosbuild.bat
Modified: trunk/reactos/rosbuild.bat
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/rosbuild.bat?rev=44358&r1=44357&r2=44358&view=diff
==============================================================================
--- trunk/reactos/rosbuild.bat [iso-8859-1] (original)
+++ trunk/reactos/rosbuild.bat [iso-8859-1] Wed Dec 2 10:16:10 2009
@@ -1,5 +1,5 @@
::
-:: Call from Makefile command line within Visual Studio with the following
parameters:
+:: This script is called from the Makefile command line within Visual Studio
using the following parameters:
::
:: %1 - $(build)
:: %2 - $(target)
@@ -41,21 +41,28 @@
::echo RosBE insall path = %_ROSBE_FULL_PATH_%
:: Set the path which contains our build tools
-set _ROSBE_BIN_PATH=%_ROSBE_FULL_PATH_%\i386\bin
+set _ROSBE_BIN_PATH=%_ROSBE_FULL_PATH_%i386\bin
-:: Set the make.exe path
-set _MAKE_COMMAND=%_ROSBE_BIN_PATH%\mingw32-make.exe
+:: Add the path to the search path
+path=%path%;%_ROSBE_BIN_PATH%
+
+:: Set the make path
+set _MAKE_COMMAND=""
+if exist "%_ROSBE_BIN_PATH%\mingw32-make.exe" (
+ set _MAKE_COMMAND=mingw32-make.exe
+)
+if exist "%_ROSBE_BIN_PATH%\make.exe" (
+ set _MAKE_COMMAND=make.exe
+)
+if %_MAKE_COMMAND% == "" (
+ goto err_no_make
+)
:: This file is located in the source root
set _ROS_SOURCE_ROOT=%~dp0
-:: Add the path to the search path
-path=%path%;%_ROSBE_BIN_PATH%
-
:: Change the current dir to the source root
cd %_ROS_SOURCE_ROOT%
-
-
:: Run the requested build task
if "%1" == "build" (
@@ -89,6 +96,10 @@
goto :exit
+:err_no_make
+echo.
+echo Cannot find a make executable
+goto :err_no_rosbe
:err_no_rosbe
echo.
@@ -104,5 +115,3 @@
:exit
echo.
-echo done
-echo.
