authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2019-10-16 19:08:41-04:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2019-10-16 19:08:41-04:00
logc03dc6665f55bbb16a62a74eae6b258863ac0a05
tree4b803fbe267894c0d7546afa50dfbd2f0abe0cfd
parent63ecded3ce57614ce142e50b6351c65a3c5fa074
signaturelock-open Commit is signed but in an unrecognized format.

update CI script for windows static builds

2 files changed, 5 insertions(+), 6 deletions(-)

ci/azure/windows_install+2-2
...@@ -6,5 +6,5 @@ set -e...@@ -6,5 +6,5 @@ set -e
6pacman -Su --needed --noconfirm6pacman -Su --needed --noconfirm
7pacman -S --needed --noconfirm wget p7zip python3-pip7pacman -S --needed --noconfirm wget p7zip python3-pip
8pip install s3cmd8pip install s3cmd
9wget -nv "https://ziglang.org/deps/llvm%2bclang-9.0.0-win64-msvc-release.tar.xz"9wget -nv "https://ziglang.org/deps/llvm%2bclang-9.0.0-win64-msvc-mt.tar.xz"
10tar xf llvm+clang-9.0.0-win64-msvc-release.tar.xz10tar xf llvm+clang-9.0.0-win64-msvc-mt.tar.xz
ci/azure/windows_script.bat+3-4
...@@ -11,15 +11,14 @@ SET "MSYSTEM=%PREVMSYSTEM%"...@@ -11,15 +11,14 @@ SET "MSYSTEM=%PREVMSYSTEM%"
1111
12SET "ZIGBUILDDIR=%SRCROOT%\build"12SET "ZIGBUILDDIR=%SRCROOT%\build"
13SET "ZIGINSTALLDIR=%ZIGBUILDDIR%\dist"13SET "ZIGINSTALLDIR=%ZIGBUILDDIR%\dist"
14SET "ZIGPREFIXPATH=%SRCROOT%\llvm+clang-9.0.0-win64-msvc-release"14SET "ZIGPREFIXPATH=%SRCROOT%\llvm+clang-9.0.0-win64-msvc-mt"
1515
16call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x6416call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
1717
18mkdir %ZIGBUILDDIR%18mkdir %ZIGBUILDDIR%
19cd %ZIGBUILDDIR%19cd %ZIGBUILDDIR%
20REM Here we use MinSizeRel instead of Release to work around https://github.com/ziglang/zig/issues/302420cmake.exe .. -Thost=x64 -G"Visual Studio 16 2019" -A x64 "-DCMAKE_INSTALL_PREFIX=%ZIGINSTALLDIR%" "-DCMAKE_PREFIX_PATH=%ZIGPREFIXPATH%" -DCMAKE_BUILD_TYPE=Release -DZIG_FORCE_EXTERNAL_LLD=ON || exit /b
21cmake.exe .. -Thost=x64 -G"Visual Studio 16 2019" -A x64 "-DCMAKE_INSTALL_PREFIX=%ZIGINSTALLDIR%" "-DCMAKE_PREFIX_PATH=%ZIGPREFIXPATH%" -DCMAKE_BUILD_TYPE=MinSizeRel || exit /b21msbuild /maxcpucount /p:Configuration=Release INSTALL.vcxproj || exit /b
22msbuild /maxcpucount /p:Configuration=MinSizeRel INSTALL.vcxproj || exit /b
2322
24"%ZIGINSTALLDIR%\bin\zig.exe" build test || exit /b23"%ZIGINSTALLDIR%\bin\zig.exe" build test || exit /b
2524