generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-03-03 12:58:03 +01:00
Code Issues Projects Releases Wiki Activity

fix(buildwin): add ARM64 and fix formatting and code style

Browse Source
This commit is contained in:
Aleksandar Fabijanic 2023-11-06 11:01:18 +01:00
parent 05645bff15
commit 6317398162
1 changed files with 40 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
buildwin.ps1
View File

@ -41,7 +41,7 @@ Param
[string] $config = 'release',
[Parameter()]
[ValidateSet('Win32', 'x64', 'WinCE', 'WEC2013')]
[ValidateSet('Win32', 'x64', 'ARM64', 'WinCE', 'WEC2013')]
[string] $platform = 'x64',
[switch] $tests = $false,
@ -94,7 +94,7 @@ function Add-VSCOMNTOOLS([int] $vsver)
$range='[17.0,18.0)'
}
$installationPath = Get-VSSetupInstance | Select-VSSetupInstance -Version $range -product * -Latest -Require Microsoft.VisualStudio.Component.VC.Tools.x86.x64 | select InstallationPath
$installationPath = Get-VSSetupInstance | Select-VSSetupInstance -Version $range -product * -Latest -Require Microsoft.VisualStudio.Component.VC.Tools.x86.x64 | Select-Object InstallationPath
$vscomntools = $installationPath.psobject.properties.Value;
if ($vsver -eq 150)
{
@ -420,7 +420,7 @@ function Build-Components([string] $extension, [string] $type)
$suffix = "_vs$vs"
$omitArray = @()
$omit.Split(',') | ForEach {
$omit.Split(',') | ForEach-Object {
$omitArray += $_.Trim()
}
@ -476,13 +476,13 @@ function Build-Components([string] $extension, [string] $type)
if ($platform -eq 'x64')
{
Get-Childitem "$poco_base\$($componentDir)" -Recurse |`
Where {$_.Extension -Match $extension -And $_.DirectoryName -Like "*samples*" -And $_.BaseName -Like "*$($suffix)" } `
Where-Object {$_.Extension -Match $extension -And $_.DirectoryName -Like "*samples*" -And $_.BaseName -Like "*$($suffix)" } `
| Build-samples "$_"
}
else
{
Get-Childitem "$poco_base\$($componentDir)" -Recurse |`
Where {$_.Extension -Match $extension -And $_.DirectoryName -Like "*samples*" -And $_.BaseName -Like "*$($suffix)" -And $_.BaseName -NotLike "*_x64_*" } `
Where-Object {$_.Extension -Match $extension -And $_.DirectoryName -Like "*samples*" -And $_.BaseName -Like "*$($suffix)" -And $_.BaseName -NotLike "*_x64_*" } `
| Build-samples "$_"
}
}
@ -504,8 +504,6 @@ function Build
if ($vs -lt 100) { $extension = 'vcproj' }
else { $extension = 'vcxproj' }
Build-Components $extension "lib"
Build-Components $extension "test"
Build-Components $extension "sample"