From d9a7d634a725de5f806b8d38e942bbc7364580f7 Mon Sep 17 00:00:00 2001 From: bergwerkgis Date: Wed, 16 Mar 2016 10:24:16 +0000 Subject: [PATCH] [skip ci] [wip] new win build scripts --- appveyor.yml | 1 + scripts/build-local.bat | 6 +++++- scripts/parse-appveyor-yml.ps1 | 9 +++++---- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index f2360211b..c4be285a1 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,6 +1,7 @@ environment: msvs_toolset: 14 BOOST_VERSION: 59 + ICU_VERSION: 56 FASTBUILD: 1 matrix: - platform: x64 diff --git a/scripts/build-local.bat b/scripts/build-local.bat index 306e10c86..4a6417e9c 100644 --- a/scripts/build-local.bat +++ b/scripts/build-local.bat @@ -10,10 +10,14 @@ SET APPVEYOR=true SET LOCAL_BUILD_DONT_SKIP_TESTS=true SET FASTBUILD=1 -FOR /F "tokens=1 usebackq" %%i in (`powershell .\scripts\parse-appveyor-yml.ps1`) DO SET BOOST_VERSION=%%i +FOR /F "tokens=1 usebackq" %%i in (`powershell .\scripts\parse-appveyor-yml.ps1 "BOOST_VERSION: "`) DO SET BOOST_VERSION=%%i ECHO BOOST_VERSION found in appveyor.yml^: %BOOST_VERSION% IF "%BOOST_VERSION%"=="0" ECHO BOOST_VERSION not valid && SET ERRORLEVEL=1 && GOTO ERROR +FOR /F "tokens=1 usebackq" %%i in (`powershell .\scripts\parse-appveyor-yml.ps1 "ICU_VERSION: "`) DO SET ICU_VERSION=%%i +ECHO ICU_VERSION found in appveyor.yml^: %ICU_VERSION% +IF "%ICU_VERSION%"=="0" ECHO ICU_VERSION not valid && SET ERRORLEVEL=1 && GOTO ERROR + :: OVERRIDE PARAMETERS >>>>>>>> :NEXT-ARG diff --git a/scripts/parse-appveyor-yml.ps1 b/scripts/parse-appveyor-yml.ps1 index f87ae7e3a..d50462816 100644 --- a/scripts/parse-appveyor-yml.ps1 +++ b/scripts/parse-appveyor-yml.ps1 @@ -1,7 +1,8 @@ $ErrorActionPreference = 'Stop' -$boost_version='0' +$pattern=$args[0] +$version='0' Get-Content .\appveyor.yml | - foreach { - if ($_ -match "BOOST_VERSION: "){ $boost_version = $_.split()[-1] } + foreach { + if ($_ -match $pattern){ $version = $_.split()[-1] } } -Write-Host $boost_version +Write-Host $version