From 604872b56b78b14f4d1eea047f4278893ab4a69c Mon Sep 17 00:00:00 2001 From: Francis ANDRE Date: Wed, 14 Mar 2018 12:57:32 +0100 Subject: [PATCH] Backport from the develop branch --- buildwin.cmd | 255 ++++++++++++++++++++++++++++++++------------------- 1 file changed, 163 insertions(+), 92 deletions(-) diff --git a/buildwin.cmd b/buildwin.cmd index 742139542..c5616b5de 100644 --- a/buildwin.cmd +++ b/buildwin.cmd @@ -1,4 +1,5 @@ @echo off +setlocal enableextensions setlocal enabledelayedexpansion rem @@ -15,7 +16,7 @@ rem Modified by Guenter Obiltschnig. rem rem Usage: rem ------ -rem buildwin VS_VERSION [ACTION] [LINKMODE] [CONFIGURATION] [PLATFORM] [SAMPLES] [TESTS] [TOOL] +rem buildwin VS_VERSION [ACTION] [LINKMODE] [CONFIGURATION] [PLATFORM] [SAMPLES] [TESTS] [TOOL] [ENV] [VERBOSITY [LOGGER] ] rem VS_VERSION: 90|100|110|120|140|150 rem ACTION: build|rebuild|clean rem LINKMODE: static_mt|static_md|shared|all @@ -24,23 +25,12 @@ rem PLATFORM: Win32|x64|WinCE|WEC2013 rem SAMPLES: samples|nosamples rem TESTS: tests|notests rem TOOL: devenv|vcexpress|wdexpress|msbuild +rem ENV: env|noenv (active only with msbuild, defaulted to env) +rem VERBOSITY quiet|minimal|normal|detailed|diagnostic +rem LOGGER see msbuild /? rem rem VS_VERSION is required argument. Default is build all. -rem Change OPENSSL_DIR to match your setup -set OPENSSL_DIR=C:\OpenSSL -set OPENSSL_INCLUDE=%OPENSSL_DIR%\include -set OPENSSL_LIB=%OPENSSL_DIR%\lib;%OPENSSL_DIR%\lib\VC -set INCLUDE=%INCLUDE%;%OPENSSL_INCLUDE% -set LIB=%LIB%;%OPENSSL_LIB% - -rem Change MYSQL_DIR to match your setup -set MYSQL_DIR=C:\PROGRA~1\MySQL\MYSQLS~1.5 -set MYSQL_INCLUDE=%MYSQL_DIR%\include -set MYSQL_LIB=%MYSQL_DIR%\lib -set INCLUDE=%INCLUDE%;%MYSQL_INCLUDE% -set LIB=%LIB%;%MYSQL_LIB% - set POCO_BASE=%CD% set PATH=%POCO_BASE%\bin64;%POCO_BASE%\bin;%PATH% @@ -48,18 +38,62 @@ rem VS_VERSION {90 | 100 | 110 | 120 | 140 | 150} if "%1"=="" goto usage set VS_VERSION=vs%1 if %VS_VERSION%==vs150 ( + if "%VS150COMNTOOLS%"=="" ( + set VS150COMNTOOLS=C:\Program Files ^(x86^)\Microsoft Visual Studio\2017\Community\Common7\Tools\ + ) set VS_VARSALL=..\..\VC\Auxiliary\Build\vcvarsall.bat ) else ( set VS_VARSALL=..\..\VC\vcvarsall.bat ) + +shift /1 +rem ACTION [build|rebuild|clean] +set ACTION=%1 +if "%ACTION%"=="" (set ACTION=build) +if not "%ACTION%"=="build" ( +if not "%ACTION%"=="rebuild" ( +if not "%ACTION%"=="clean" goto usage)) + +shift /1 +rem LINKMODE [static_mt|static_md|shared|all] +set LINK_MODE=%1 +if "%LINK_MODE%"=="" (set LINK_MODE=all) +if not "%LINK_MODE%"=="static_mt" ( +if not "%LINK_MODE%"=="static_md" ( +if not "%LINK_MODE%"=="shared" ( +if not "%LINK_MODE%"=="all" goto usage))) + +rem CONFIGURATION [release|debug|both] +set CONFIGURATION=%2 +if "%CONFIGURATION%"=="" (set CONFIGURATION=both) +if not "%CONFIGURATION%"=="release" ( +if not "%CONFIGURATION%"=="debug" ( +if not "%CONFIGURATION%"=="both" goto usage)) + rem PLATFORM [Win32|x64|WinCE|WEC2013] -set PLATFORM=%5 +set PLATFORM=%3 if "%PLATFORM%"=="" (set PLATFORM=Win32) if not "%PLATFORM%"=="Win32" ( if not "%PLATFORM%"=="x64" ( if not "%PLATFORM%"=="WinCE" ( if not "%PLATFORM%"=="WEC2013" goto usage))) +if "%PLATFORM%"=="Win32" (set PLATFORM_SUFFIX=) else ( +if "%PLATFORM%"=="x64" (set PLATFORM_SUFFIX=_x64) else ( +if "%PLATFORM%"=="WinCE" (set PLATFORM_SUFFIX=_CE) else ( +if "%PLATFORM%"=="WEC2013" (set PLATFORM_SUFFIX=_WEC2013)))) + +if "%PLATFORM%"=="Win32" (set PLATFORMSW=/p:Platform=Win32) else ( +if "%PLATFORM%"=="x64" (set PLATFORMSW=/p:Platform=x64)) + +rem SAMPLES [samples|nosamples] +set SAMPLES=%4 +if "%SAMPLES%"=="" (set SAMPLES=samples) + +rem TESTS [tests|notests] +set TESTS=%5 +if "%TESTS%"=="" (set TESTS=notests) + if not defined VCINSTALLDIR ( if %VS_VERSION%==vs90 ( if %PLATFORM%==x64 ( @@ -114,7 +148,7 @@ if not defined VSINSTALLDIR ( echo Error: No Visual C++ environment found. echo Please run this script from a Visual Studio Command Prompt echo or run "%%VSnnCOMNTOOLS%%\vsvars32.bat" first. - goto :EOF + goto :buildfailed ) set VCPROJ_EXT=vcproj @@ -124,8 +158,24 @@ if %VS_VERSION%==vs120 (set VCPROJ_EXT=vcxproj) if %VS_VERSION%==vs140 (set VCPROJ_EXT=vcxproj) if %VS_VERSION%==vs150 (set VCPROJ_EXT=vcxproj) -if "%8"=="" goto use_devenv -set BUILD_TOOL=%8 + +rem ENV env|noenv +set USEENV=%7 +if "%USEENV%"=="" (set USEENV=env) +if not "%USEENV%"=="env" ( +if not "%USEENV%"=="noenv" goto usage) + +rem VERBOSITY quiet|minimal|normal|detailed +set VERBOSITY=%8 +if "%VERBOSITY%"=="" (set VERBOSITY=minimal) +if not "%VERBOSITY%"=="quiet" ( +if not "%VERBOSITY%"=="minimal" ( +if not "%VERBOSITY%"=="normal" ( +if not "%VERBOSITY%"=="detailed" ( +if not "%VERBOSITY%"=="diagnostic" goto usage)))) + +if "%6"=="" goto use_devenv +set BUILD_TOOL=%6 goto use_custom :use_devenv set BUILD_TOOL=devenv @@ -135,16 +185,32 @@ if "%VS_VERSION%"=="vs120" (set BUILD_TOOL=msbuild) if "%VS_VERSION%"=="vs140" (set BUILD_TOOL=msbuild) if "%VS_VERSION%"=="vs150" (set BUILD_TOOL=msbuild) :use_custom -if not "%BUILD_TOOL%"=="msbuild" (set USEENV=/useenv) if "%BUILD_TOOL%"=="msbuild" ( set ACTIONSW=/t: set CONFIGSW=/p:Configuration= set EXTRASW=/m set USEENV=/p:UseEnv=true + if "%USEENV%"=="noenv" set USEENV=/p:UseEnv=false + + set BUILD_TOOL_FLAGS=/clp:NoSummary + set BUILD_TOOL_FLAGS=!BUILD_TOOL_FLAGS! /nologo /v:%VERBOSITY% ) if not "%BUILD_TOOL%"=="msbuild" ( + set USEENV=/useenv set ACTIONSW=/ ) + + +rem LOGGER see msbuild /? +set LOGGER=%9 +if not "%LOGGER%"=="" ( + if "%BUILD_TOOL%"=="msbuild" ( + if not %LOGGER%X==X ( + set BUILD_TOOL_FLAGS=!BUILD_TOOL_FLAGS! /logger:%LOGGER% + ) + ) +) + if "%VS_VERSION%"=="vs100" (goto msbuildok) if "%VS_VERSION%"=="vs110" (goto msbuildok) if "%VS_VERSION%"=="vs120" (goto msbuildok) @@ -156,32 +222,6 @@ if "%BUILD_TOOL%"=="msbuild" ( ) :msbuildok -rem ACTION [build|rebuild|clean] -set ACTION=%2 -if "%ACTION%"=="" (set ACTION=build) -if not "%ACTION%"=="build" ( -if not "%ACTION%"=="rebuild" ( -if not "%ACTION%"=="clean" goto usage)) - -rem LINKMODE [static_mt|static_md|shared|all] -set LINK_MODE=%3 -if "%LINK_MODE%"=="" (set LINK_MODE=all) -if not "%LINK_MODE%"=="static_mt" ( -if not "%LINK_MODE%"=="static_md" ( -if not "%LINK_MODE%"=="shared" ( -if not "%LINK_MODE%"=="all" goto usage))) - -rem CONFIGURATION [release|debug|both] -set CONFIGURATION=%4 -if "%CONFIGURATION%"=="" (set CONFIGURATION=both) -if not "%CONFIGURATION%"=="release" ( -if not "%CONFIGURATION%"=="debug" ( -if not "%CONFIGURATION%"=="both" goto usage)) - -if "%PLATFORM%"=="Win32" (set PLATFORM_SUFFIX=) else ( -if "%PLATFORM%"=="x64" (set PLATFORM_SUFFIX=_x64) else ( -if "%PLATFORM%"=="WinCE" (set PLATFORM_SUFFIX=_CE) else ( -if "%PLATFORM%"=="WEC2013" (set PLATFORM_SUFFIX=_WEC2013)))) if "%PLATFORM%"=="WEC2013" ( if "%WEC2013_PLATFORM%"=="" ( @@ -196,15 +236,6 @@ if %VS_VERSION%==vs140 (set EXTRASW=/m /p:VisualStudioVersion=14.0) if %VS_VERSION%==vs150 (set EXTRASW=/m /p:VisualStudioVersion=15.0) ) -rem SAMPLES [samples|nosamples] -set SAMPLES=%6 -if "%SAMPLES%"=="" (set SAMPLES=samples) - -rem TESTS [tests|notests] -set TESTS=%7 -if "%TESTS%"=="" (set TESTS=notests) - - set DEBUG_SHARED=0 set RELEASE_SHARED=0 set DEBUG_STATIC_MT=0 @@ -299,6 +330,8 @@ echo #### echo ######################################################################## echo. echo. +echo buildwin %VS_VERSION% %ACTION% %LINK_MODE% %CONFIGURATION% %PLATFORM% %SAMPLES% %TESTS% !BUILD_TOOL! %VERBOSITY% +echo. echo The following configurations will be built: if %DEBUG_SHARED%==1 (echo debug_shared) @@ -315,6 +348,8 @@ for /f %%G in ('findstr /R "." components') do ( for /f "tokens=1,2,3,4 delims=/" %%Q in ("%%G") do ( set PROJECT_FILE=%%Q%PLATFORM_SUFFIX%_%VS_VERSION%.%VCPROJ_EXT% set TEST_PROJECT_FILE=testsuite/TestSuite%PLATFORM_SUFFIX%_%VS_VERSION%.%VCPROJ_EXT% + set TEST_APP_PROJECT_FILE=testsuite/TestApp%PLATFORM_SUFFIX%_%VS_VERSION%.%VCPROJ_EXT% + set TEST_LIB_PROJECT_FILE=testsuite/TestLibrary%PLATFORM_SUFFIX%_%VS_VERSION%.%VCPROJ_EXT% if exist !PROJECT_FILE! ( call :build %%G if ERRORLEVEL 1 goto buildfailed @@ -355,74 +390,108 @@ echo ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ echo. if %DEBUG_SHARED%==1 ( - !BUILD_TOOL! %USEENV% %EXTRASW% %ACTIONSW%%ACTION% %CONFIGSW%debug_shared %PLATFORMSW% !PROJECT_FILE! + !BUILD_TOOL! !BUILD_TOOL_FLAGS! %USEENV% %EXTRASW% %ACTIONSW%%ACTION% %CONFIGSW%debug_shared %PLATFORMSW% !PROJECT_FILE! if ERRORLEVEL 1 exit /b 1 - echo. && echo. && echo. + echo. && echo. if %TESTS%==tests ( if exist !TEST_PROJECT_FILE! ( - !BUILD_TOOL! %USEENV% %EXTRASW% %ACTIONSW%%ACTION% %CONFIGSW%debug_shared %PLATFORMSW% !TEST_PROJECT_FILE! + !BUILD_TOOL! !BUILD_TOOL_FLAGS! %USEENV% %EXTRASW% %ACTIONSW%%ACTION% %CONFIGSW%debug_shared %PLATFORMSW% !TEST_PROJECT_FILE! if ERRORLEVEL 1 exit /b 1 - echo. && echo. && echo. + if %1==Foundation ( + echo. + !BUILD_TOOL! !BUILD_TOOL_FLAGS! %USEENV% %EXTRASW% %ACTIONSW%%ACTION% %CONFIGSW%debug_shared %PLATFORMSW% !TEST_APP_PROJECT_FILE! + echo. + !BUILD_TOOL! !BUILD_TOOL_FLAGS! %USEENV% %EXTRASW% %ACTIONSW%%ACTION% %CONFIGSW%debug_shared %PLATFORMSW% !TEST_LIB_PROJECT_FILE! + if ERRORLEVEL 1 exit /b 1 + ) + echo. && echo. ) ) ) if %RELEASE_SHARED%==1 ( - !BUILD_TOOL! %USEENV% %EXTRASW% %ACTIONSW%%ACTION% %CONFIGSW%release_shared %PLATFORMSW% !PROJECT_FILE! + !BUILD_TOOL! !BUILD_TOOL_FLAGS! %USEENV% %EXTRASW% %ACTIONSW%%ACTION% %CONFIGSW%release_shared %PLATFORMSW% !PROJECT_FILE! if ERRORLEVEL 1 exit /b 1 - echo. && echo. && echo. + echo. && echo. if %TESTS%==tests ( if exist !TEST_PROJECT_FILE! ( - !BUILD_TOOL! %USEENV% %EXTRASW% %ACTIONSW%%ACTION% %CONFIGSW%release_shared %PLATFORMSW% !TEST_PROJECT_FILE! + !BUILD_TOOL! !BUILD_TOOL_FLAGS! %USEENV% %EXTRASW% %ACTIONSW%%ACTION% %CONFIGSW%release_shared %PLATFORMSW% !TEST_PROJECT_FILE! if ERRORLEVEL 1 exit /b 1 - echo. && echo. && echo. + if %1==Foundation ( + echo. + !BUILD_TOOL! !BUILD_TOOL_FLAGS! %USEENV% %EXTRASW% %ACTIONSW%%ACTION% %CONFIGSW%release_shared %PLATFORMSW% !TEST_APP_PROJECT_FILE! + echo. + !BUILD_TOOL! !BUILD_TOOL_FLAGS! %USEENV% %EXTRASW% %ACTIONSW%%ACTION% %CONFIGSW%release_shared %PLATFORMSW% !TEST_LIB_PROJECT_FILE! + if ERRORLEVEL 1 exit /b 1 + ) + echo. && echo. ) ) ) if %DEBUG_STATIC_MT%==1 ( - !BUILD_TOOL! %USEENV% %EXTRASW% %ACTIONSW%%ACTION% %CONFIGSW%debug_static_mt %PLATFORMSW% !PROJECT_FILE! + !BUILD_TOOL! !BUILD_TOOL_FLAGS! %USEENV% %EXTRASW% %ACTIONSW%%ACTION% %CONFIGSW%debug_static_mt %PLATFORMSW% !PROJECT_FILE! if ERRORLEVEL 1 exit /b 1 - echo. && echo. && echo. + echo. && echo. if %TESTS%==tests ( if exist !TEST_PROJECT_FILE! ( - !BUILD_TOOL! %USEENV% %EXTRASW% %ACTIONSW%%ACTION% %CONFIGSW%debug_static_mt %PLATFORMSW% !TEST_PROJECT_FILE! + !BUILD_TOOL! !BUILD_TOOL_FLAGS! %USEENV% %EXTRASW% %ACTIONSW%%ACTION% %CONFIGSW%debug_static_mt %PLATFORMSW% !TEST_PROJECT_FILE! if ERRORLEVEL 1 exit /b 1 - echo. && echo. && echo. + if %1==Foundation ( + echo. + !BUILD_TOOL! !BUILD_TOOL_FLAGS! %USEENV% %EXTRASW% %ACTIONSW%%ACTION% %CONFIGSW%debug_static_mt %PLATFORMSW% !TEST_APP_PROJECT_FILE! + if ERRORLEVEL 1 exit /b 1 + ) + echo. && echo. ) ) ) if %RELEASE_STATIC_MT%==1 ( - !BUILD_TOOL! %USEENV% %EXTRASW% %ACTIONSW%%ACTION% %CONFIGSW%release_static_mt %PLATFORMSW% !PROJECT_FILE! + !BUILD_TOOL! !BUILD_TOOL_FLAGS! %USEENV% %EXTRASW% %ACTIONSW%%ACTION% %CONFIGSW%release_static_mt %PLATFORMSW% !PROJECT_FILE! if ERRORLEVEL 1 exit /b 1 - echo. && echo. && echo. + echo. && echo. if %TESTS%==tests ( if exist !TEST_PROJECT_FILE! ( - !BUILD_TOOL! %USEENV% %EXTRASW% %ACTIONSW%%ACTION% %CONFIGSW%release_static_mt %PLATFORMSW% !TEST_PROJECT_FILE! + !BUILD_TOOL! !BUILD_TOOL_FLAGS! %USEENV% %EXTRASW% %ACTIONSW%%ACTION% %CONFIGSW%release_static_mt %PLATFORMSW% !TEST_PROJECT_FILE! if ERRORLEVEL 1 exit /b 1 - echo. && echo. && echo. + if %1==Foundation ( + echo. + !BUILD_TOOL! !BUILD_TOOL_FLAGS! %USEENV% %EXTRASW% %ACTIONSW%%ACTION% %CONFIGSW%release_static_mt %PLATFORMSW% !TEST_APP_PROJECT_FILE! + if ERRORLEVEL 1 exit /b 1 + ) + echo. && echo. ) ) ) if %DEBUG_STATIC_MD%==1 ( - !BUILD_TOOL! %USEENV% %EXTRASW% %ACTIONSW%%ACTION% %CONFIGSW%debug_static_md %PLATFORMSW% !PROJECT_FILE! + !BUILD_TOOL! !BUILD_TOOL_FLAGS! %USEENV% %EXTRASW% %ACTIONSW%%ACTION% %CONFIGSW%debug_static_md %PLATFORMSW% !PROJECT_FILE! if ERRORLEVEL 1 exit /b 1 - echo. && echo. && echo. + echo. && echo. if %TESTS%==tests ( if exist !TEST_PROJECT_FILE! ( - !BUILD_TOOL! %USEENV% %EXTRASW% %ACTIONSW%%ACTION% %CONFIGSW%debug_static_md %PLATFORMSW% !TEST_PROJECT_FILE! + !BUILD_TOOL! !BUILD_TOOL_FLAGS! %USEENV% %EXTRASW% %ACTIONSW%%ACTION% %CONFIGSW%debug_static_md %PLATFORMSW% !TEST_PROJECT_FILE! if ERRORLEVEL 1 exit /b 1 - echo. && echo. && echo. + if %1==Foundation ( + echo. + !BUILD_TOOL! !BUILD_TOOL_FLAGS! %USEENV% %EXTRASW% %ACTIONSW%%ACTION% %CONFIGSW%debug_static_md %PLATFORMSW% !TEST_APP_PROJECT_FILE! + if ERRORLEVEL 1 exit /b 1 + ) + echo. && echo. ) ) ) if %RELEASE_STATIC_MD%==1 ( - !BUILD_TOOL! %USEENV% %EXTRASW% %ACTIONSW%%ACTION% %CONFIGSW%release_static_md %PLATFORMSW% !PROJECT_FILE! + !BUILD_TOOL! !BUILD_TOOL_FLAGS! %USEENV% %EXTRASW% %ACTIONSW%%ACTION% %CONFIGSW%release_static_md %PLATFORMSW% !PROJECT_FILE! if ERRORLEVEL 1 exit /b 1 - echo. && echo. && echo. + echo. && echo. if %TESTS%==tests ( if exist !TEST_PROJECT_FILE! ( - !BUILD_TOOL! %USEENV% %EXTRASW% %ACTIONSW%%ACTION% %CONFIGSW%release_static_md %PLATFORMSW% !TEST_PROJECT_FILE! + !BUILD_TOOL! !BUILD_TOOL_FLAGS! %USEENV% %EXTRASW% %ACTIONSW%%ACTION% %CONFIGSW%release_static_md %PLATFORMSW% !TEST_PROJECT_FILE! if ERRORLEVEL 1 exit /b 1 - echo. && echo. && echo. + if %1==Foundation ( + echo. + !BUILD_TOOL! !BUILD_TOOL_FLAGS! %USEENV% %EXTRASW% %ACTIONSW%%ACTION% %CONFIGSW%release_static_md %PLATFORMSW% !TEST_APP_PROJECT_FILE! + if ERRORLEVEL 1 exit /b 1 + ) + echo. && echo. ) ) ) @@ -460,34 +529,34 @@ for /f %%G in ('findstr /R "." components') do ( set SOLUTION_FILE=samples%PLATFORM_SUFFIX%_%VS_VERSION%.sln if %DEBUG_SHARED%==1 ( - !BUILD_TOOL! %USEENV% %EXTRASW% %ACTIONSW%%ACTION% %CONFIGSW%debug_shared %PLATFORMSW% !SOLUTION_FILE! + !BUILD_TOOL! !BUILD_TOOL_FLAGS! %USEENV% %EXTRASW% %ACTIONSW%%ACTION% %CONFIGSW%debug_shared %PLATFORMSW% !SOLUTION_FILE! if ERRORLEVEL 1 goto buildfailed - echo. && echo. && echo. + echo. && echo. ) if %RELEASE_SHARED%==1 ( - !BUILD_TOOL! %USEENV% %EXTRASW% %ACTIONSW%%ACTION% %CONFIGSW%release_shared %PLATFORMSW% !SOLUTION_FILE! + !BUILD_TOOL! !BUILD_TOOL_FLAGS! %USEENV% %EXTRASW% %ACTIONSW%%ACTION% %CONFIGSW%release_shared %PLATFORMSW% !SOLUTION_FILE! if ERRORLEVEL 1 goto buildfailed - echo. && echo. && echo. + echo. && echo. ) if %DEBUG_STATIC_MT%==1 ( - !BUILD_TOOL! %USEENV% %EXTRASW% %ACTIONSW%%ACTION% %CONFIGSW%debug_static_mt %PLATFORMSW% !SOLUTION_FILE! + !BUILD_TOOL! !BUILD_TOOL_FLAGS! %USEENV% %EXTRASW% %ACTIONSW%%ACTION% %CONFIGSW%debug_static_mt %PLATFORMSW% !SOLUTION_FILE! if ERRORLEVEL 1 goto buildfailed - echo. && echo. && echo. + echo. && echo. ) if %RELEASE_STATIC_MT%==1 ( - !BUILD_TOOL! %USEENV% %EXTRASW% %ACTIONSW%%ACTION% %CONFIGSW%release_static_mt %PLATFORMSW% !SOLUTION_FILE! + !BUILD_TOOL! !BUILD_TOOL_FLAGS! %USEENV% %EXTRASW% %ACTIONSW%%ACTION% %CONFIGSW%release_static_mt %PLATFORMSW% !SOLUTION_FILE! if ERRORLEVEL 1 goto buildfailed - echo. && echo. && echo. + echo. && echo. ) if %DEBUG_STATIC_MD%==1 ( - !BUILD_TOOL! %USEENV% %EXTRASW% %ACTIONSW%%ACTION% %CONFIGSW%debug_static_md %PLATFORMSW% !SOLUTION_FILE! + !BUILD_TOOL! !BUILD_TOOL_FLAGS! %USEENV% %EXTRASW% %ACTIONSW%%ACTION% %CONFIGSW%debug_static_md %PLATFORMSW% !SOLUTION_FILE! if ERRORLEVEL 1 goto buildfailed - echo. && echo. && echo. + echo. && echo. ) if %RELEASE_STATIC_MD%==1 ( - !BUILD_TOOL! %USEENV% %EXTRASW% %ACTIONSW%%ACTION% %CONFIGSW%release_static_md %PLATFORMSW% !SOLUTION_FILE! + !BUILD_TOOL! !BUILD_TOOL_FLAGS! %USEENV% %EXTRASW% %ACTIONSW%%ACTION% %CONFIGSW%release_static_md %PLATFORMSW% !SOLUTION_FILE! if ERRORLEVEL 1 goto buildfailed - echo. && echo. && echo. + echo. && echo. ) cd "%POCO_BASE%" @@ -530,7 +599,7 @@ exit /b 1 :usage echo Usage: echo ------ -echo buildwin VS_VERSION [ACTION] [LINKMODE] [CONFIGURATION] [PLATFORM] [SAMPLES] [TESTS] [TOOL] +echo buildwin VS_VERSION [ACTION] [LINKMODE] [CONFIGURATION] [PLATFORM] [SAMPLES] [TESTS] [TOOL] [ENV] [VERBOSITY] echo VS_VERSION: "90|100|110|120|140|150" echo ACTION: "build|rebuild|clean" echo LINKMODE: "static_mt|static_md|shared|all" @@ -539,6 +608,8 @@ echo PLATFORM: "Win32|x64|WinCE|WEC2013" echo SAMPLES: "samples|nosamples" echo TESTS: "tests|notests" echo TOOL: "devenv|vcexpress|wdexpress|msbuild" +echo ENV: "env|noenv" (active only with msbuild, defaulted to env) +echo VERBOSITY: "quiet|minimal|normal|detailed|diagnostic" only for msbuild echo. echo Default is build all. endlocal