From 944ebf5ea9bb4437b677c511e5154b3052e8fd3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B6nke=20Ludwig?= Date: Sat, 3 Mar 2018 19:34:27 +0100 Subject: [PATCH] Adjust for changed LDC download URLs. --- appveyor.yml | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index ae3f898..fa5a45f 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -108,11 +108,20 @@ install: } $env:toolchain = "msvc"; $version = $env:DVersion; - Invoke-WebRequest "https://github.com/ldc-developers/ldc/releases/download/v$($version)/ldc2-$($version)-win64-msvc.zip" -OutFile "c:\ldc.zip"; - echo "finished."; - pushd c:\\; - 7z x ldc.zip > $null; - popd; + if ([System.Version]$version -lt [System.Version]"1.7.0") { + Invoke-WebRequest "https://github.com/ldc-developers/ldc/releases/download/v$($version)/ldc2-$($version)-win64-msvc.zip" -OutFile "c:\ldc.zip"; + echo "finished."; + pushd c:\\; + 7z x ldc.zip > $null; + popd; + } + else { + Invoke-WebRequest "https://github.com/ldc-developers/ldc/releases/download/v$($version)/ldc2-$($version)-windows-multilib.7z" -OutFile "c:\ldc.7z"; + echo "finished."; + pushd c:\\; + 7z x ldc.7z > $null; + popd; + } } } - ps: SetUpDCompiler @@ -139,7 +148,11 @@ before_build: } elseif($env:DC -eq "ldc"){ $version = $env:DVersion; - $env:PATH += ";C:\ldc2-$($version)-win64-msvc\bin"; + if ([System.Version]$version -lt [System.Version]"1.7.0") { + $env:PATH += ";C:\ldc2-$($version)-win64-msvc\bin"; + } else { + $env:PATH += ";C:\ldc2-$($version)-windows-multilib\bin"; + } $env:DC = "ldc2"; } - ps: $env:compilersetup = "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall";