generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2024-12-14 11:06:57 +01:00
Code Issues Projects Releases Wiki Activity

modified build scripts for vs150

Browse Source
This commit is contained in:
Guenter Obiltschnig 2017-02-20 16:55:18 +01:00
parent f453dd145c
commit 4f2f7c61d7
3 changed files with 50 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build_vs150.cmd Normal file
View File

@ -0,0 +1,2 @@
@echo off
buildwin 150 build shared both Win32 samples tests devenv

71
buildwin.cmd
View File

@ -10,7 +10,7 @@ rem for MS Visual Studio 2008 to 2013
rem rem
rem $Id: //poco/1.4/dist/buildwin.cmd#2 $ rem $Id: //poco/1.4/dist/buildwin.cmd#2 $
rem rem
rem Copyright (c) 2006-2014 by Applied Informatics Software Engineering GmbH rem Copyright (c) 2006-2017 by Applied Informatics Software Engineering GmbH
rem and Contributors. rem and Contributors.
rem rem
rem Original version by Aleksandar Fabijanic. rem Original version by Aleksandar Fabijanic.
@ -19,7 +19,7 @@ rem
rem Usage: rem Usage:
rem ------ rem ------
rem buildwin VS_VERSION [ACTION] [LINKMODE] [CONFIGURATION] [PLATFORM] [SAMPLES] [TESTS] [TOOL] [ENV] [VERBOSITY [LOGGER] ] ] rem buildwin VS_VERSION [ACTION] [LINKMODE] [CONFIGURATION] [PLATFORM] [SAMPLES] [TESTS] [TOOL] [ENV] [VERBOSITY [LOGGER] ] ]
rem VS_VERSION: 90|100|110|120|140 rem VS_VERSION: 90|100|110|120|140|150
rem ACTION: build|rebuild|clean rem ACTION: build|rebuild|clean
rem LINKMODE: static_mt|static_md|shared|all rem LINKMODE: static_mt|static_md|shared|all
rem CONFIGURATION: release|debug|both rem CONFIGURATION: release|debug|both
@ -36,35 +36,14 @@ rem VS_VERSION is required argument. Default is build all.
set POCO_BASE=%CD% set POCO_BASE=%CD%
set PATH=%POCO_BASE%\bin64;%POCO_BASE%\bin;%PATH% set PATH=%POCO_BASE%\bin64;%POCO_BASE%\bin;%PATH%
rem VS_VERSION {90 | 100 | 110 | 120 | 140} rem VS_VERSION {90 | 100 | 110 | 120 | 140 | 150}
if "%1"=="" goto usage if "%1"=="" goto usage
set VS_VERSION=vs%1 set VS_VERSION=vs%1
set VS_64_BIT_ENV=VC\bin\x86_amd64\vcvarsx86_amd64.bat if %VS_VERSION%==vs150 (
set VS_VARSALL=..\..\VC\Auxiliary\Build\vcvarsall.bat
shift /1 ) else (
rem ACTION [build|rebuild|clean] set VS_VARSALL=..\..\VC\vcvarsall.bat
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] rem PLATFORM [Win32|x64|WinCE|WEC2013]
set PLATFORM=%3 set PLATFORM=%3
if "%PLATFORM%"=="" (set PLATFORM=Win32) if "%PLATFORM%"=="" (set PLATFORM=Win32)
@ -89,37 +68,45 @@ if "%TESTS%"=="" (set TESTS=notests)
if not defined VCINSTALLDIR ( if not defined VCINSTALLDIR (
if %VS_VERSION%==vs90 ( if %VS_VERSION%==vs90 (
if %PLATFORM%==x64 ( if %PLATFORM%==x64 (
call "%VS90COMNTOOLS%..\..\%VS_64_BIT_ENV%" call "%VS90COMNTOOLS%%VS_VARSALL%" amd64
) else ( ) else (
call "%VS90COMNTOOLS%vsvars32.bat" call "%VS90COMNTOOLS%%VS_VARSALL%" x86
) )
) else ( ) else (
if %VS_VERSION%==vs100 ( if %VS_VERSION%==vs100 (
if %PLATFORM%==x64 ( if %PLATFORM%==x64 (
call "%VS100COMNTOOLS%..\..\%VS_64_BIT_ENV%" call "%VS100COMNTOOLS%%VS_VARSALL%" amd64
) else ( ) else (
call "%VS100COMNTOOLS%vsvars32.bat" call "%VS100COMNTOOLS%%VS_VARSALL%" x86
) )
) else ( ) else (
if %VS_VERSION%==vs110 ( if %VS_VERSION%==vs110 (
if %PLATFORM%==x64 ( if %PLATFORM%==x64 (
call "%VS110COMNTOOLS%..\..\%VS_64_BIT_ENV%" call "%VS110COMNTOOLS%%VS_VARSALL%" amd64
) else ( ) else (
call "%VS110COMNTOOLS%vsvars32.bat" call "%VS110COMNTOOLS%%VS_VARSALL%" x86
) )
) else ( ) else (
if %VS_VERSION%==vs120 ( if %VS_VERSION%==vs120 (
if %PLATFORM%==x64 ( if %PLATFORM%==x64 (
call "%VS120COMNTOOLS%..\..\%VS_64_BIT_ENV%" call "%VS120COMNTOOLS%%VS_VARSALL%" amd64
) else ( ) else (
call "%VS120COMNTOOLS%vsvars32.bat call "%VS120COMNTOOLS%%VS_VARSALL%" x86
) )
) else ( ) else (
if %VS_VERSION%==vs140 ( if %VS_VERSION%==vs140 (
if %PLATFORM%==x64 ( if %PLATFORM%==x64 (
call "%VS140COMNTOOLS%..\..\%VS_64_BIT_ENV%" call "%VS140COMNTOOLS%%VS_VARSALL%" amd64
) else ( ) else (
call "%VS140COMNTOOLS%vsvars32.bat call "%VS140COMNTOOLS%%VS_VARSALL%" x86
)
) else (
if %VS_VERSION%==vs150 (
if %PLATFORM%==x64 (
call "%VS150COMNTOOLS%%VS_VARSALL%" amd64
) else (
call "%VS150COMNTOOLS%%VS_VARSALL%" x86
)
) )
) )
) )
@ -140,6 +127,7 @@ if %VS_VERSION%==vs100 (set VCPROJ_EXT=vcxproj)
if %VS_VERSION%==vs110 (set VCPROJ_EXT=vcxproj) if %VS_VERSION%==vs110 (set VCPROJ_EXT=vcxproj)
if %VS_VERSION%==vs120 (set VCPROJ_EXT=vcxproj) if %VS_VERSION%==vs120 (set VCPROJ_EXT=vcxproj)
if %VS_VERSION%==vs140 (set VCPROJ_EXT=vcxproj) if %VS_VERSION%==vs140 (set VCPROJ_EXT=vcxproj)
if %VS_VERSION%==vs150 (set VCPROJ_EXT=vcxproj)
rem ENV env|noenv rem ENV env|noenv
@ -166,6 +154,7 @@ if "%VS_VERSION%"=="vs100" (set BUILD_TOOL=msbuild)
if "%VS_VERSION%"=="vs110" (set BUILD_TOOL=msbuild) if "%VS_VERSION%"=="vs110" (set BUILD_TOOL=msbuild)
if "%VS_VERSION%"=="vs120" (set BUILD_TOOL=msbuild) if "%VS_VERSION%"=="vs120" (set BUILD_TOOL=msbuild)
if "%VS_VERSION%"=="vs140" (set BUILD_TOOL=msbuild) if "%VS_VERSION%"=="vs140" (set BUILD_TOOL=msbuild)
if "%VS_VERSION%"=="vs150" (set BUILD_TOOL=msbuild)
:use_custom :use_custom
if "%BUILD_TOOL%"=="msbuild" ( if "%BUILD_TOOL%"=="msbuild" (
set ACTIONSW=/t: set ACTIONSW=/t:
@ -197,6 +186,7 @@ if "%VS_VERSION%"=="vs100" (goto msbuildok)
if "%VS_VERSION%"=="vs110" (goto msbuildok) if "%VS_VERSION%"=="vs110" (goto msbuildok)
if "%VS_VERSION%"=="vs120" (goto msbuildok) if "%VS_VERSION%"=="vs120" (goto msbuildok)
if "%VS_VERSION%"=="vs140" (goto msbuildok) if "%VS_VERSION%"=="vs140" (goto msbuildok)
if "%VS_VERSION%"=="vs150" (goto msbuildok)
if "%BUILD_TOOL%"=="msbuild" ( if "%BUILD_TOOL%"=="msbuild" (
echo "Cannot use msbuild with Visual Studio 2008 or earlier." echo "Cannot use msbuild with Visual Studio 2008 or earlier."
exit /b 2 exit /b 2
@ -214,6 +204,7 @@ set USEENV=
if %VS_VERSION%==vs110 (set EXTRASW=/m /p:VisualStudioVersion=11.0) if %VS_VERSION%==vs110 (set EXTRASW=/m /p:VisualStudioVersion=11.0)
if %VS_VERSION%==vs120 (set EXTRASW=/m /p:VisualStudioVersion=12.0) if %VS_VERSION%==vs120 (set EXTRASW=/m /p:VisualStudioVersion=12.0)
if %VS_VERSION%==vs140 (set EXTRASW=/m /p:VisualStudioVersion=14.0) if %VS_VERSION%==vs140 (set EXTRASW=/m /p:VisualStudioVersion=14.0)
if %VS_VERSION%==vs150 (set EXTRASW=/m /p:VisualStudioVersion=15.0)
) )
@ -581,7 +572,7 @@ exit /b 1
echo Usage: echo Usage:
echo ------ echo ------
echo buildwin VS_VERSION [ACTION] [LINKMODE] [CONFIGURATION] [PLATFORM] [SAMPLES] [TESTS] [TOOL] {ENV] [VERBOSITY] echo buildwin VS_VERSION [ACTION] [LINKMODE] [CONFIGURATION] [PLATFORM] [SAMPLES] [TESTS] [TOOL] {ENV] [VERBOSITY]
echo VS_VERSION: "90|100|110|120|140" echo VS_VERSION: "90|100|110|120|140|150"
echo ACTION: "build|rebuild|clean" echo ACTION: "build|rebuild|clean"
echo LINKMODE: "static_mt|static_md|shared|all" echo LINKMODE: "static_mt|static_md|shared|all"
echo CONFIGURATION: "release|debug|both" echo CONFIGURATION: "release|debug|both"

25
buildwin.ps1
View File

@ -4,7 +4,7 @@
# Usage: # Usage:
# ------ # ------
# buildwin.ps1 [-poco_base dir] # buildwin.ps1 [-poco_base dir]
# [-vs_version 140 | 120 | 110 | 100 | 90] # [-vs_version 150 | 140 | 120 | 110 | 100 | 90]
# [-action build | rebuild | clean] # [-action build | rebuild | clean]
# [-linkmode shared | static_mt | static_md | all] # [-linkmode shared | static_mt | static_md | all]
# [-config release | debug | both] # [-config release | debug | both]
@ -23,7 +23,7 @@ Param
[string] $poco_base, [string] $poco_base,
[Parameter()] [Parameter()]
[ValidateSet(90, 100, 110, 120, 140)] [ValidateSet(90, 100, 110, 120, 140, 150)]
[int] $vs_version, [int] $vs_version,
[Parameter()] [Parameter()]
@ -78,7 +78,8 @@ function Set-Environment
if ($vs_version -eq 0) if ($vs_version -eq 0)
{ {
if ($Env:VS140COMNTOOLS -ne '') { $script:vs_version = 140 } if ($Env:VS150COMNTOOLS -ne '') { $script:vs_version = 150 }
elseif ($Env:VS140COMNTOOLS -ne '') { $script:vs_version = 140 }
elseif ($Env:VS120COMNTOOLS -ne '') { $script:vs_version = 120 } elseif ($Env:VS120COMNTOOLS -ne '') { $script:vs_version = 120 }
elseif ($Env:VS110COMNTOOLS -ne '') { $script:vs_version = 110 } elseif ($Env:VS110COMNTOOLS -ne '') { $script:vs_version = 110 }
elseif ($Env:VS100COMNTOOLS -ne '') { $script:vs_version = 100 } elseif ($Env:VS100COMNTOOLS -ne '') { $script:vs_version = 100 }
@ -117,17 +118,25 @@ function Set-Environment
$vsct = "VS$($vs_version)COMNTOOLS" $vsct = "VS$($vs_version)COMNTOOLS"
$vsdir = (Get-Item Env:$vsct).Value $vsdir = (Get-Item Env:$vsct).Value
$Command = '' $Command = ''
$CommandArg = ''
if ($platform -eq 'x64') if ($platform -eq 'x64')
{ {
$Command = "$($vsdir)..\..\VC\bin\x86_amd64\vcvarsx86_amd64.bat" $CommandArg = "amd64"
} }
else else
{ {
$Command = "$($vsdir)vsvars32.bat" $CommandArg = "x86"
}
if ($vs_version -ge 150)
{
$Command = "$($vsdir)..\..\VC\Auxiliary\Build\vcvarsall.bat"
}
else
{
$Command = "$($vsdir)..\..\VC\vcvarsall.bat"
} }
$tempFile = [IO.Path]::GetTempFileName() $tempFile = [IO.Path]::GetTempFileName()
cmd /c " `"$Command`" && set > `"$tempFile`" " cmd /c " `"$Command`" $CommandArg && set > `"$tempFile`" "
Get-Content $tempFile | Foreach-Object { Get-Content $tempFile | Foreach-Object {
if($_ -match "^(.*?)=(.*)$") if($_ -match "^(.*?)=(.*)$")
{ {
@ -145,7 +154,7 @@ function Process-Input
Write-Host 'Usage:' Write-Host 'Usage:'
Write-Host '------' Write-Host '------'
Write-Host 'buildwin.ps1 [-poco_base dir]' Write-Host 'buildwin.ps1 [-poco_base dir]'
Write-Host ' [-vs_version 140 | 120 | 110 | 100 | 90]' Write-Host ' [-vs_version 150 | 140 | 120 | 110 | 100 | 90]'
Write-Host ' [-action build | rebuild | clean]' Write-Host ' [-action build | rebuild | clean]'
Write-Host ' [-linkmode shared | static_mt | static_md | all]' Write-Host ' [-linkmode shared | static_mt | static_md | all]'
Write-Host ' [-config release | debug | both]' Write-Host ' [-config release | debug | both]'