[CONSRV]

[reactos.git] / configure.cmd

diff --git a/configure.cmd b/configure.cmd
index 514047b..b4b5908 100755 (executable)
--- a/configure.cmd
+++ b/configure.cmd
@@ -1,5 +1,24 @@
 @echo off\r
 \r
+:: This is needed so as to avoid static expansion of environment variables\r
+:: inside if (...) conditionals.\r
+:: See http://stackoverflow.com/questions/305605/weird-scope-issue-in-bat-file\r
+:: for more explanation.\r
+:: Precisely needed for configuring Visual Studio Environment.\r
+setlocal enabledelayedexpansion\r
+\r
+:: Special case %1 = arm_hosttools %2 = vcvarsall.bat %3 = %CMAKE_GENERATOR%\r
+if /I "%1" == "arm_hosttools" (\r
+    echo Configuring x86 host tools for ARM cross build\r
+\r
+    :: This launches %VSINSTALLDIR%VS\vcvarsall.bat\r
+    call %2 x86\r
+\r
+    :: Configure host tools for x86\r
+    cmake -G %3 -DARCH=i386 %~dp0\r
+    exit\r
+)\r
+\r
 :: Get the source root directory\r
 set REACTOS_SOURCE_DIR=%~dp0\r
 set USE_NMAKE=0\r
@@ -16,6 +35,8 @@ if defined ROS_ARCH (
         set CMAKE_GENERATOR="CodeBlocks - MinGW Makefiles"\r
     ) else if /I "%1" == "Eclipse" (\r
         set CMAKE_GENERATOR="Eclipse CDT4 - MinGW Makefiles"\r
+    ) else if /I "%1" == "Ninja" (\r
+        set CMAKE_GENERATOR="Ninja"\r
     ) else (\r
         set CMAKE_GENERATOR="MinGW Makefiles"\r
     )\r
@@ -32,9 +53,10 @@ if defined ROS_ARCH (
     set USE_WDK_HEADERS=0\r
 \r
 ) else if defined VCINSTALLDIR (\r
-    :: VS command prompt does not put this in enviroment vars\r
+    :: VS command prompt does not put this in environment vars\r
     cl 2>&1 | find "x86" > NUL && set ARCH=i386\r
     cl 2>&1 | find "x64" > NUL && set ARCH=amd64\r
+    cl 2>&1 | find "ARM" > NUL && set ARCH=arm\r
     cl 2>&1 | find "14." > NUL && set BUILD_ENVIRONMENT=VS8\r
     cl 2>&1 | find "15." > NUL && set BUILD_ENVIRONMENT=VS9\r
     cl 2>&1 | find "16." > NUL && set BUILD_ENVIRONMENT=VS10\r
@@ -44,29 +66,31 @@ if defined ROS_ARCH (
         exit /b\r
     )\r
 \r
-    echo Detected Visual Studio Environment %BUILD_ENVIRONMENT%-%ARCH%\r
+    echo Detected Visual Studio Environment !BUILD_ENVIRONMENT!-!ARCH!\r
     if /I "%1" == "VSSolution" (\r
-        if "%BUILD_ENVIRONMENT%" == "VS8" (\r
-            if "%ARCH%" == "amd64" (\r
+        if "!BUILD_ENVIRONMENT!" == "VS8" (\r
+            if "!ARCH!" == "amd64" (\r
                 set CMAKE_GENERATOR="Visual Studio 8 2005 Win64"\r
             ) else (\r
                 set CMAKE_GENERATOR="Visual Studio 8 2005"\r
             )\r
-        ) else if "%BUILD_ENVIRONMENT%" == "VS9" (\r
-            if "%ARCH%" == "amd64" (\r
+        ) else if "!BUILD_ENVIRONMENT!" == "VS9" (\r
+            if "!ARCH!" == "amd64" (\r
                 set CMAKE_GENERATOR="Visual Studio 9 2008 Win64"\r
             ) else (\r
                 set CMAKE_GENERATOR="Visual Studio 9 2008"\r
             )\r
-        ) else if "%BUILD_ENVIRONMENT%" == "VS10" (\r
-            if "%ARCH%" == "amd64" (\r
+        ) else if "!BUILD_ENVIRONMENT!" == "VS10" (\r
+            if "!ARCH!" == "amd64" (\r
                 set CMAKE_GENERATOR="Visual Studio 10 Win64"\r
             ) else (\r
                 set CMAKE_GENERATOR="Visual Studio 10"\r
             )\r
-        ) else if "%BUILD_ENVIRONMENT%" == "VS11" (\r
-            if "%ARCH%" == "amd64" (\r
+        ) else if "!BUILD_ENVIRONMENT!" == "VS11" (\r
+            if "!ARCH!" == "amd64" (\r
                 set CMAKE_GENERATOR="Visual Studio 11 Win64"\r
+            ) else if "!ARCH!" == "arm" (\r
+                set CMAKE_GENERATOR="Visual Studio 11 ARM"\r
             ) else (\r
                 set CMAKE_GENERATOR="Visual Studio 11"\r
             )\r
@@ -94,7 +118,7 @@ if defined ROS_ARCH (
 \r
 :: Checkpoint\r
 if not defined ARCH (\r
-    echo unknown build architecture\r
+    echo Unknown build architecture\r
     exit /b\r
 )\r
 \r
@@ -106,6 +130,8 @@ if %USE_NMAKE% == 1 (
         set CMAKE_GENERATOR="Eclipse CDT4 - NMake Makefiles"\r
     ) else if /I "%1" == "JOM" (\r
         set CMAKE_GENERATOR="NMake Makefiles JOM"\r
+    ) else if /I "%1" == "Ninja" (\r
+        set CMAKE_GENERATOR="Ninja"\r
     ) else (\r
         set CMAKE_GENERATOR="NMake Makefiles"\r
     )\r
@@ -136,7 +162,14 @@ if EXIST CMakeCache.txt (
 )\r
 set REACTOS_BUILD_TOOLS_DIR=%CD%\r
 \r
-cmake -G %CMAKE_GENERATOR% -DARCH=%ARCH% %REACTOS_SOURCE_DIR%\r
+:: Use x86 for ARM host tools\r
+if "%ARCH%" == "arm" (\r
+    :: Launch new script instance for x86 host tools configuration\r
+    start "Preparing host tools for ARM cross build..." /I /B /WAIT %~dp0configure.cmd arm_hosttools "%VSINSTALLDIR%VC\vcvarsall.bat" %CMAKE_GENERATOR%\r
+) else (\r
+    cmake -G %CMAKE_GENERATOR% -DARCH=%ARCH% "%REACTOS_SOURCE_DIR%"\r
+)\r
+\r
 cd..\r
 \r
 echo Preparing reactos...\r
@@ -146,11 +179,11 @@ if EXIST CMakeCache.txt (
 )\r
 \r
 if "%BUILD_ENVIRONMENT%" == "MinGW" (\r
-    cmake -G %CMAKE_GENERATOR% -DENABLE_CCACHE=0 -DPCH=0 -DCMAKE_TOOLCHAIN_FILE=toolchain-gcc.cmake -DARCH=%ARCH% -DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%" %REACTOS_SOURCE_DIR%\r
+    cmake -G %CMAKE_GENERATOR% -DENABLE_CCACHE=0 -DPCH=0 -DCMAKE_TOOLCHAIN_FILE=toolchain-gcc.cmake -DARCH=%ARCH% -DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%" "%REACTOS_SOURCE_DIR%"\r
 ) else if "%BUILD_ENVIRONMENT%" == "WDK" (\r
-    cmake -G %CMAKE_GENERATOR% -DCMAKE_TOOLCHAIN_FILE=toolchain-msvc.cmake -DUSE_WDK_HEADERS=%USE_WDK_HEADERS% -DARCH=%ARCH% -DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%" %REACTOS_SOURCE_DIR%\r
+    cmake -G %CMAKE_GENERATOR% -DCMAKE_TOOLCHAIN_FILE=toolchain-msvc.cmake -DUSE_WDK_HEADERS=%USE_WDK_HEADERS% -DARCH=%ARCH% -DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%" "%REACTOS_SOURCE_DIR%"\r
 ) else (\r
-    cmake -G %CMAKE_GENERATOR% -DCMAKE_TOOLCHAIN_FILE=toolchain-msvc.cmake -DARCH=%ARCH% -DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%" %REACTOS_SOURCE_DIR%\r
+    cmake -G %CMAKE_GENERATOR% -DCMAKE_TOOLCHAIN_FILE=toolchain-msvc.cmake -DARCH=%ARCH% -DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%" "%REACTOS_SOURCE_DIR%"\r
 )\r
 \r
 cd..\r