https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1815bdf3cc8ef0183ab7a4...
commit 1815bdf3cc8ef0183ab7a4519ba564be70ceb436 Author: Trevor Thompson tmt256@email.vccs.edu AuthorDate: Sun Dec 10 11:35:10 2017 +0100 Commit: Thomas Faber thomas.faber@reactos.org CommitDate: Wed Jan 31 11:06:11 2018 +0100
[CMAKE] Add some fool-proofing to configure.cmd related to MSVS:
-VSSolution switch now outputs to a dedicated folder if running from source directory. -Give an error if the user is trying to mix ninja and VSSolution in the same output directory. -In a MingW environment, give an error on VSSolution switch and give a warning on RTC switch. -Fix -DNEW_STYLE_BUILD=0 option. -Ensure the source path doesn't contain any spaces. -Issue a warning if passed an invalid switch. -Don't announce completion if there were errors. -Make end message specific for VSSolution. -Replace redundant exit commands with quit label, as suggested by HBelusca. --- configure.cmd | 91 +++++++++++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 79 insertions(+), 12 deletions(-)
diff --git a/configure.cmd b/configure.cmd index 8415ddaf15..4d550d5744 100755 --- a/configure.cmd +++ b/configure.cmd @@ -15,8 +15,7 @@ if /I "%1" == "/?" ( echo Syntax: path\to\source\configure.cmd [script-options] [Cmake-options] echo Available script-options: Codeblocks, Eclipse, Makefiles, clang, VSSolution, RTC echo Cmake-options: -DVARIABLE:TYPE=VALUE - endlocal - exit /b + goto quit )
REM Special case %1 = arm_hosttools %2 = vcvarsall.bat %3 = %CMAKE_GENERATOR% @@ -34,6 +33,16 @@ if /I "%1" == "arm_hosttools" ( REM Get the source root directory set REACTOS_SOURCE_DIR=%~dp0
+REM Ensure there's no spaces in the source path +echo %REACTOS_SOURCE_DIR%| find " " > NUL +if %ERRORLEVEL% == 0 ( + echo. && echo Your source path contains at least one space. + echo This will cause problems with building. + echo Please rename your folders so there are no spaces in the source path, + echo or move your source to a different folder. + goto quit +) + REM Set default generator set CMAKE_GENERATOR="Ninja" set CMAKE_GENERATOR_HOST=!CMAKE_GENERATOR! @@ -63,8 +72,7 @@ if defined ROS_ARCH ( cl 2>&1 | find "19.12." > NUL && set VS_VERSION=15 if not defined VS_VERSION ( echo Error: Visual Studio version too old or version detection failed. - endlocal - exit /b + goto quit ) set BUILD_ENVIRONMENT=VS set VS_SOLUTION=0 @@ -72,15 +80,13 @@ if defined ROS_ARCH ( echo Detected Visual Studio Environment !BUILD_ENVIRONMENT!!VS_VERSION!-!ARCH! ) else ( echo Error: Unable to detect build environment. Configure script failure. - endlocal - exit /b + goto quit )
REM Checkpoint if not defined ARCH ( echo Unknown build architecture - endlocal - exit /b + goto quit )
set NEW_STYLE_BUILD=1 @@ -88,7 +94,7 @@ set USE_CLANG_CL=0
REM Parse command line parameters :repeat - if /I "%1%" == "-DNEW_STYLE_BUILD" ( + if /I "%1" == "-DNEW_STYLE_BUILD" ( set NEW_STYLE_BUILD=%2 ) else if "%BUILD_ENVIRONMENT%" == "MinGW" ( if /I "%1" == "Codeblocks" ( @@ -97,6 +103,21 @@ REM Parse command line parameters set CMAKE_GENERATOR="Eclipse CDT4 - MinGW Makefiles" ) else if /I "%1" == "Makefiles" ( set CMAKE_GENERATOR="MinGW Makefiles" + ) else if /I "%1" == "VSSolution" ( + echo. && echo Error: Creation of VS Solution files is not supported in a MinGW environment. + echo Please run this command in a [Developer] Command Prompt for Visual Studio. + goto quit + ) else if /I "%1" == "RTC" ( + echo. && echo Warning: RTC switch is ignored outside of a Visual Studio environment. && echo. + ) else if /I "%1" NEQ "" ( + echo %1| find /I "-D" > NUL + if %ERRORLEVEL% == 0 ( + REM User is passing a switch to CMake + REM Ignore it, and ignore the next parameter that follows + Shift + ) else ( + echo. && echo Warning: Unrecognized switch "%1" && echo. + ) ) else ( goto continue ) @@ -168,6 +189,15 @@ REM Parse command line parameters ) else if /I "%1" == "RTC" ( echo Runtime checks enabled set VS_RUNTIME_CHECKS=1 + ) else if /I "%1" NEQ "" ( + echo %1| find /I "-D" > NUL + if %ERRORLEVEL% == 0 ( + REM User is passing a switch to CMake + REM Ignore it, and ignore the next parameter that follows + Shift + ) else ( + echo. && echo Warning: Unrecognized switch "%1" && echo. + ) ) else ( goto continue ) @@ -185,7 +215,13 @@ if "!CMAKE_GENERATOR!" == "Ninja" (
REM Create directories set REACTOS_OUTPUT_PATH=output-%BUILD_ENVIRONMENT%-%ARCH% + +if "%VS_SOLUTION%" == "1" ( + set REACTOS_OUTPUT_PATH=%REACTOS_OUTPUT_PATH%-sln +) + if "%REACTOS_SOURCE_DIR%" == "%CD%" ( + set CD_SAME_AS_SOURCE=1 echo Creating directories in %REACTOS_OUTPUT_PATH%
if not exist %REACTOS_OUTPUT_PATH% ( @@ -194,6 +230,21 @@ if "%REACTOS_SOURCE_DIR%" == "%CD%" ( cd %REACTOS_OUTPUT_PATH% )
+if "%VS_SOLUTION%" == "1" ( + + if exist build.ninja ( + echo. && echo Error: This directory has already been configured for ninja. + echo An output folder configured for ninja can't be reconfigured for VSSolution. + echo Use an empty folder or delete the contents of this folder, then try again. + goto quit + ) +) else if exist REACTOS.sln ( + echo. && echo Error: This directory has already been configured for Visual Studio. + echo An output folder configured for VSSolution can't be reconfigured for ninja. + echo Use an empty folder or delete the contents of this folder, then try again. && echo. + goto quit +) + if "%NEW_STYLE_BUILD%"=="0" (
if not exist host-tools ( @@ -251,11 +302,27 @@ if "%NEW_STYLE_BUILD%"=="0" ( cd.. )
-echo Configure script complete^^! Execute appropriate build commands (ex: ninja, make, nmake, etc...). -endlocal -exit /b +if %ERRORLEVEL% NEQ 0 ( + goto quit +) + +if "%CD_SAME_AS_SOURCE%" == "1" ( + set ENDV= from %REACTOS_OUTPUT_PATH% +) + +if "%VS_SOLUTION%" == "1" ( + set ENDV= You can now use msbuild or open REACTOS.sln%ENDV%. +) else ( + set ENDV= Execute appropriate build commands ^(ex: ninja, make, nmake, etc...^)%ENDV% +) + +echo. && echo Configure script complete^^!%ENDV% + +goto quit
:cmake_notfound echo Unable to find cmake, if it is installed, check your PATH variable. + +:quit endlocal exit /b
-
Trevor Thompson