Adjust for changed LDC download URLs.

This commit is contained in:
Sönke Ludwig 2018-03-03 19:34:27 +01:00
parent 27a80b6e0a
commit 944ebf5ea9

View file

@ -108,12 +108,21 @@ install:
} }
$env:toolchain = "msvc"; $env:toolchain = "msvc";
$version = $env:DVersion; $version = $env:DVersion;
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"; Invoke-WebRequest "https://github.com/ldc-developers/ldc/releases/download/v$($version)/ldc2-$($version)-win64-msvc.zip" -OutFile "c:\ldc.zip";
echo "finished."; echo "finished.";
pushd c:\\; pushd c:\\;
7z x ldc.zip > $null; 7z x ldc.zip > $null;
popd; 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 - ps: SetUpDCompiler
- powershell -Command Invoke-WebRequest https://code.dlang.org/files/dub-1.2.1-windows-x86.zip -OutFile dub.zip - powershell -Command Invoke-WebRequest https://code.dlang.org/files/dub-1.2.1-windows-x86.zip -OutFile dub.zip
@ -139,7 +148,11 @@ before_build:
} }
elseif($env:DC -eq "ldc"){ elseif($env:DC -eq "ldc"){
$version = $env:DVersion; $version = $env:DVersion;
if ([System.Version]$version -lt [System.Version]"1.7.0") {
$env:PATH += ";C:\ldc2-$($version)-win64-msvc\bin"; $env:PATH += ";C:\ldc2-$($version)-win64-msvc\bin";
} else {
$env:PATH += ";C:\ldc2-$($version)-windows-multilib\bin";
}
$env:DC = "ldc2"; $env:DC = "ldc2";
} }
- ps: $env:compilersetup = "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall"; - ps: $env:compilersetup = "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall";