Add boost 1.83 and vc 14.3 to build CI scripts.
This commit is contained in:
Родитель
c0fdc49ea5
Коммит
82aefc3993
|
@ -2,7 +2,7 @@
|
|||
|
||||
set -eux
|
||||
|
||||
BOOST_VERSIONS=(1.61.0 1.62.0 1.63.0 1.64.0 1.65.1 1.66.0 1.67.0)
|
||||
BOOST_VERSIONS=(1.61.0 1.62.0 1.63.0 1.64.0 1.65.1 1.66.0 1.67.0 1.83.0)
|
||||
BOOST_LIBRARIES="chrono,date_time,python,system,test,thread"
|
||||
|
||||
BUILD_ROOT=/tmp/boosts
|
||||
|
|
|
@ -22,7 +22,7 @@ param
|
|||
[string]
|
||||
$Version,
|
||||
|
||||
[ValidateSet('12.0', '14.0', '14.1', '14.2')]
|
||||
[ValidateSet('12.0', '14.0', '14.1', '14.2', '14.3')]
|
||||
[string]
|
||||
$VcToolsetVer
|
||||
)
|
||||
|
|
|
@ -28,7 +28,7 @@ param
|
|||
[string]
|
||||
$Version,
|
||||
|
||||
[ValidateSet('12.0', '14.0', '14.1', '14.2')]
|
||||
[ValidateSet('12.0', '14.0', '14.1', '14.2', '14.3')]
|
||||
[string]
|
||||
$VcToolsetVer,
|
||||
|
||||
|
@ -123,13 +123,26 @@ function Install-BoostComponent([string]$Component)
|
|||
-InstallDir $workDir `
|
||||
-PackageVersion $Version
|
||||
|
||||
Move-Item `
|
||||
-Path ([System.IO.Path]::Combine($workDir, $packageId, 'lib', 'native', 'address-model-32', 'lib', '*')) `
|
||||
-Destination $lib32Dir
|
||||
if ($Version -gt 1.66)
|
||||
{
|
||||
$sourceFolder = ([System.IO.Path]::Combine($workDir, $packageId, 'lib', 'native'))
|
||||
$itemsToMove32 = Get-ChildItem -Path $sourceFolder | Where-Object { $_.Name -like "*x32*" }
|
||||
$itemsToMove64 = Get-ChildItem -Path $sourceFolder | Where-Object { $_.Name -like "*x64*" }
|
||||
|
||||
Move-Item `
|
||||
-Path ([System.IO.Path]::Combine($workDir, $packageId, 'lib', 'native', 'address-model-64', 'lib', '*')) `
|
||||
-Destination $lib64Dir
|
||||
$itemsToMove32 | ForEach-Object { Move-Item -Path $_.FullName -Destination $lib32Dir }
|
||||
$itemsToMove64 | ForEach-Object { Move-Item -Path $_.FullName -Destination $lib64Dir }
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
Move-Item `
|
||||
-Path ([System.IO.Path]::Combine($workDir, $packageId, 'lib', 'native', 'address-model-64', 'lib', '*')) `
|
||||
-Destination $lib64Dir
|
||||
|
||||
Move-Item `
|
||||
-Path ([System.IO.Path]::Combine($workDir, $packageId, 'lib', 'native', 'address-model-32', 'lib', '*')) `
|
||||
-Destination $lib32Dir
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче