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

#3405 #3482 #3485

Browse Source
This commit is contained in:
Alex Fabijanic 2022-05-24 18:35:58 -05:00
parent ebeef47a8c
commit 6b87beb723
3 changed files with 361 additions and 343 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build_vs170.cmd Normal file
View File

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

2
buildwin.cmd
View File

@ -5,7 +5,7 @@ rem
rem buildwin.cmd rem buildwin.cmd
rem rem
rem POCO C++ Libraries command-line build script rem POCO C++ Libraries command-line build script
rem for MS Visual Studio 2015 to 2019 rem for MS Visual Studio 2015 to 2022
rem rem
rem Copyright (c) 2006-2020 by Applied Informatics Software Engineering GmbH rem Copyright (c) 2006-2020 by Applied Informatics Software Engineering GmbH
rem and Contributors. rem and Contributors.

24
buildwin.ps1
View File

@ -4,7 +4,7 @@
# Usage: # Usage:
# ------ # ------
# buildwin.ps1 [-poco_base dir] # buildwin.ps1 [-poco_base dir]
# [-vs 140 | 150 | 160] # [-vs 140 | 150 | 160| 170]
# [-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]
@ -25,7 +25,7 @@ Param
[string] $poco_base, [string] $poco_base,
[Parameter()] [Parameter()]
[ValidateSet(140, 150, 160)] [ValidateSet(140, 150, 160, 170)]
[int] $vs = 140, [int] $vs = 140,
[Parameter()] [Parameter()]
@ -89,6 +89,10 @@ function Add-VSCOMNTOOLS([int] $vsver)
{ {
$range='[16.0,17.0)' $range='[16.0,17.0)'
} }
if ($vsver -eq 170)
{
$range='[17.0,18.0)'
}
$installationPath = Get-VSSetupInstance | Select-VSSetupInstance -Version $range -Latest -Require Microsoft.VisualStudio.Component.VC.Tools.x86.x64 | select InstallationPath $installationPath = Get-VSSetupInstance | Select-VSSetupInstance -Version $range -Latest -Require Microsoft.VisualStudio.Component.VC.Tools.x86.x64 | select InstallationPath
$vscomntools = $installationPath.psobject.properties.Value; $vscomntools = $installationPath.psobject.properties.Value;
@ -102,7 +106,11 @@ function Add-VSCOMNTOOLS([int] $vsver)
set-item -force -path "ENV:VS160COMNTOOLS" -value "$vscomntools\Common7\Tools\" set-item -force -path "ENV:VS160COMNTOOLS" -value "$vscomntools\Common7\Tools\"
Write-Host "`nVS160COMNTOOLS=$env:VS160COMNTOOLS" -ForegroundColor Yellow Write-Host "`nVS160COMNTOOLS=$env:VS160COMNTOOLS" -ForegroundColor Yellow
} }
if ($vsver -eq 170)
{
set-item -force -path "ENV:VS170COMNTOOLS" -value "$vscomntools\Common7\Tools\"
Write-Host "`nVS170COMNTOOLS=$env:VS170COMNTOOLS" -ForegroundColor Yellow
}
} }
} }
@ -169,9 +177,17 @@ function Set-Environment
$script:msbuild_exe = Resolve-Path "$($vsdir)\..\..\MSBuild\Current\Bin\MSBuild.exe" $script:msbuild_exe = Resolve-Path "$($vsdir)\..\..\MSBuild\Current\Bin\MSBuild.exe"
} }
else else
{
if ($vs -eq 170)
{
$Command = Resolve-Path "$($vsdir)\..\..\VC\Auxiliary\Build\vcvarsall.bat"
$script:msbuild_exe = Resolve-Path "$($vsdir)\..\..\MSBuild\Current\Bin\MSBuild.exe"
}
else
{ {
$Command = Resolve-Path "$($vsdir)\..\..\VC\vcvarsall.bat" $Command = Resolve-Path "$($vsdir)\..\..\VC\vcvarsall.bat"
$script:msbuild_exe = "MSBuild.exe" $script:msbuild_exe = "MSBuild.exe"
}
}} }}
$tempFile = [IO.Path]::GetTempFileName() $tempFile = [IO.Path]::GetTempFileName()
@ -193,7 +209,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 140 | 150 | 160]' Write-Host ' [-vs 140 | 150 | 160 | 170]'
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]'