Improve make.bat final message
[blender.git] / make.bat
index 046baf55e0fbc1efd746a95a35bf6df70ef99475..8c41308eb0a48128f2e4cf7b2082e2edc71a086d 100644 (file)
--- a/make.bat
+++ b/make.bat
@@ -2,15 +2,53 @@
 REM This batch file does an out-of-source CMake build in ../build_windows
 REM This is for users who like to configure & build Blender with a single command.
 
+setlocal ENABLEEXTENSIONS
 set BLENDER_DIR=%~dp0
 set BUILD_DIR=%BLENDER_DIR%..\build_windows
 set BUILD_TYPE=Release
+set BUILD_CMAKE_ARGS=
+
+REM Detect MSVC Installation
+if DEFINED VisualStudioVersion goto msvc_detect_finally
+set VALUE_NAME=ProductDir
+REM Check 64 bits
+set KEY_NAME="HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\VisualStudio\12.0\Setup\VC"
+for /F "usebackq skip=2 tokens=1-2*" %%A IN (`REG QUERY %KEY_NAME% /v %VALUE_NAME% 2^>nul`) DO set MSVC_VC_DIR=%%C
+if DEFINED MSVC_VC_DIR goto msvc_detect_finally
+REM Check 32 bits
+set KEY_NAME="HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\12.0\Setup\VC"
+for /F "usebackq skip=2 tokens=1-2*" %%A IN (`REG QUERY %KEY_NAME% /v %VALUE_NAME% 2^>nul`) DO set MSVC_VC_DIR=%%C
+if DEFINED MSVC_VC_DIR goto msvc_detect_finally
+:msvc_detect_finally
+if DEFINED MSVC_VC_DIR call "%MSVC_VC_DIR%\vcvarsall.bat"
+
+
+REM Sanity Checks
+where /Q msbuild
+if %ERRORLEVEL% NEQ 0 (
+       echo Error: "MSBuild" command not in the PATH.
+       echo You must have MSVC installed and run this from the "Developer Command Prompt"
+       echo ^(available from Visual Studio's Start menu entry^), aborting!
+       goto EOF
+)
+where /Q cmake
+if %ERRORLEVEL% NEQ 0 (
+       echo Error: "CMake" command not in the PATH.
+       echo You must have CMake installed and added to your PATH, aborting!
+       goto EOF
+)
+if NOT EXIST %BLENDER_DIR%..\lib\nul (
+       echo Error: Path to libraries not found "%BLENDER_DIR%..\lib\"
+       echo This is needed for building, aborting!
+       goto EOF
+)
+
 
 :argv_loop
 if NOT "%1" == "" (
 
        REM Help Message
-       if "%1" == "--help" (
+       if "%1" == "help" (
                echo.
                echo Convenience targets
                echo - debug
@@ -21,6 +59,7 @@ if NOT "%1" == "" (
                echo - bpy
                echo.
                echo Utilities ^(not associated with building^)
+               echo - clean
                echo - update
                goto EOF
        )
@@ -34,23 +73,23 @@ if NOT "%1" == "" (
        ) else if "%1" == "full" (
                set BUILD_DIR=%BUILD_DIR%_full
                set BUILD_CMAKE_ARGS=%BUILD_CMAKE_ARGS% ^
-                   -C"%BLENDER_DIR%\blender\build_files\cmake\config\blender_full.cmake"
+                   -C"%BLENDER_DIR%\build_files\cmake\config\blender_full.cmake"
        ) else if "%1" == "lite" (
                set BUILD_DIR=%BUILD_DIR%_lite
                set BUILD_CMAKE_ARGS=%BUILD_CMAKE_ARGS% ^
-                   -C"%BLENDER_DIR%\blender\build_files\cmake\config\blender_lite.cmake"
-       ) else if "%1" == "cycles_standalone" (
+                   -C"%BLENDER_DIR%\build_files\cmake\config\blender_lite.cmake"
+       ) else if "%1" == "cycles" (
                set BUILD_DIR=%BUILD_DIR%_cycles
                set BUILD_CMAKE_ARGS=%BUILD_CMAKE_ARGS% ^
-                   -C"%BLENDER_DIR%\blender\build_files\cmake\config\cycles_standalone.cmake"
+                   -C"%BLENDER_DIR%\build_files\cmake\config\cycles_standalone.cmake"
        ) else if "%1" == "headless" (
                set BUILD_DIR=%BUILD_DIR%_headless
                set BUILD_CMAKE_ARGS=%BUILD_CMAKE_ARGS% ^
-                   -C"%BLENDER_DIR%\blender\build_files\cmake\config\blender_headless.cmake"
+                   -C"%BLENDER_DIR%\build_files\cmake\config\blender_headless.cmake"
        ) else if "%1" == "bpy" (
                set BUILD_DIR=%BUILD_DIR%_bpy
                set BUILD_CMAKE_ARGS=%BUILD_CMAKE_ARGS% ^
-                   -C"%BLENDER_DIR%\blender\build_files\cmake\config\bpy_module.cmake"
+                   -C"%BLENDER_DIR%\build_files\cmake\config\bpy_module.cmake"
 
        REM Non-Build Commands
        ) else if "%1" == "update" (
@@ -58,6 +97,16 @@ if NOT "%1" == "" (
                git pull --rebase
                git submodule foreach git pull --rebase origin master
                goto EOF
+       ) else if "%1" == "clean" (
+               msbuild ^
+                       %BUILD_DIR%\Blender.sln ^
+                       /target:clean ^
+                       /property:Configuration=%BUILD_TYPE% ^
+                       /verbosity:minimal
+               if %ERRORLEVEL% NEQ 0 (
+                       echo Cleaned "%BUILD_DIR%"
+               )
+               goto EOF
        ) else (
                echo Command "%1" unknown, aborting!
                goto EOF
@@ -73,24 +122,48 @@ if "%PROCESSOR_ARCHITECTURE%" == "x86" (
        set WINDOWS_ARCH=Win64
 )
 
-set BUILD_CMAKE_ARGS=-G "Visual Studio 12 2013 %WINDOWS_ARCH%"
-mkdir %BUILD_DIR%
+set BUILD_CMAKE_ARGS=%BUILD_CMAKE_ARGS% -G "Visual Studio 12 2013 %WINDOWS_ARCH%"
+if NOT EXIST %BUILD_DIR%\nul (
+       mkdir %BUILD_DIR%
+)
 
-cmake ^
-       %BUILD_CMAKE_ARGS% ^
-       -H%BLENDER_DIR% ^
-       -B%BUILD_DIR% ^
-       %BUILD_CMAKE_ARGS%
+REM Only configure on first run
+if NOT EXIST %BUILD_DIR%\Blender.sln (
+       cmake ^
+               %BUILD_CMAKE_ARGS% ^
+               -H%BLENDER_DIR% ^
+               -B%BUILD_DIR% ^
+               %BUILD_CMAKE_ARGS%
 
-if %ERRORLEVEL% NEQ 0 (
-       ECHO "CMake Failed"
-       GOTO :EOF
+       if %ERRORLEVEL% NEQ 0 (
+               echo "Configuration Failed"
+               goto EOF
        )
+)
 
 msbuild ^
        %BUILD_DIR%\Blender.sln ^
        /target:build ^
-       /property:Configuration=%BUILD_TYPE%
+       /property:Configuration=%BUILD_TYPE% ^
+       /maxcpucount ^
+       /verbosity:minimal
+
+if %ERRORLEVEL% NEQ 0 (
+       echo "Build Failed"
+       goto EOF
+)
+
+msbuild ^
+       %BUILD_DIR%\INSTALL.vcxproj ^
+       /property:Configuration=%BUILD_TYPE% ^
+       /verbosity:minimal
+
+echo.
+echo At any point you can optionally modify your build configuration by editing:
+echo "%BUILD_DIR%\CMakeCache.txt", then run "make" again to build with the changes applied.
+echo.
+echo Blender successfully built, run from: "%BUILD_DIR%\bin\%BUILD_TYPE%"
+echo.
 
 :EOF