sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[skip travis] fix relative path to get-boost-icu-version-from-sdk.ps1 (differs when called from windows-builds)

Browse source
This commit is contained in:
bergwerkgis 2016-09-05 14:00:17 +00:00
parent a79bd73105
commit 28162f0720
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
scripts/build-appveyor.bat
View file

@ -64,7 +64,9 @@ IF %ERRORLEVEL% NEQ 0 GOTO ERROR
ECHO looking for boost and icu versions in SDK ... ECHO looking for boost and icu versions in SDK ...
FOR /F "tokens=1,2 usebackq" %%i in (`powershell .\scripts\get-boost-icu-version-from-sdk.ps1`) DO SET %%i=%%j FOR /F "tokens=1,2 usebackq" %%i in (`powershell %APPVEYOR_BUILD_FOLDER%\scripts\get-boost-icu-version-from-sdk.ps1`) DO SET %%i=%%j
IF %ERRORLEVEL% NEQ 0 GOTO ERROR
ECHO BOOST_VERSION found in SDK^: %BOOST_VERSION% ECHO BOOST_VERSION found in SDK^: %BOOST_VERSION%
ECHO ICU_VERSION found in SDK^: %ICU_VERSION% ECHO ICU_VERSION found in SDK^: %ICU_VERSION%
ECHO ICU_VERSION2 found in SDK^: %ICU_VERSION2% ECHO ICU_VERSION2 found in SDK^: %ICU_VERSION2%

10
scripts/get-boost-icu-version-from-sdk.ps1
View file

@ -1,15 +1,21 @@
$ErrorActionPreference = 'Stop' $ErrorActionPreference = 'Stop'
$boost_version='0' $boost_version='0'
$icu_version='0' $icu_version='0'
$libdir=$PSScriptRoot+"\..\mapnik-gyp\mapnik-sdk\lib"
#get boost and icu versions directly from the files in the SDK #get boost and icu versions directly from the files in the SDK
#boost_python-vc140-mt-1_61.dll #boost_python-vc140-mt-1_61.dll
$boost_version=(Get-ChildItem ".\mapnik-gyp\mapnik-sdk\lib" -Filter *boost*.dll)[0].BaseName.split("_")[-1] $boost_version=(Get-ChildItem $libdir -Filter *boost*.dll)[0].BaseName.split("_")[-1]
#icuin56.dll #icuin56.dll
$icu_version=(Get-ChildItem ".\mapnik-gyp\mapnik-sdk\lib" -Filter icuin*.dll)[0].BaseName.split("icuin")[-1] $icu_version=(Get-ChildItem $libdir -Filter icuin*.dll)[0].BaseName.split("icuin")[-1]
Write-Host "BOOST_VERSION" $boost_version Write-Host "BOOST_VERSION" $boost_version
Write-Host "ICU_VERSION" $icu_version".1" Write-Host "ICU_VERSION" $icu_version".1"
Write-Host "ICU_VERSION2" $icu_version"_1" Write-Host "ICU_VERSION2" $icu_version"_1"
trap {
"Error: $_"
exit 1
}