From 55925b6e259b5453b8af29a5365d82378cb1d54b Mon Sep 17 00:00:00 2001
From: Andrew Kelley <andrew@ziglang.org>
Date: Sun, 22 Sep 2019 19:47:07 -0400
Subject: [PATCH] windows CI: fix name collision

Previously the CMAKE_BUILD_TYPE=Release was conflicting with the
"distribution" directory `release`. I renamed this to `dist` so that
it won't conflict with any build types.
---
 ci/azure/windows_script.bat |  2 +-
 ci/azure/windows_upload     | 13 ++++++-------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/ci/azure/windows_script.bat b/ci/azure/windows_script.bat
index f1a69202e0..5c44abcbe1 100644
--- a/ci/azure/windows_script.bat
+++ b/ci/azure/windows_script.bat
@@ -10,7 +10,7 @@ SET "PATH=%PREVPATH%"
 SET "MSYSTEM=%PREVMSYSTEM%"
 
 SET "ZIGBUILDDIR=%SRCROOT%\build"
-SET "ZIGINSTALLDIR=%ZIGBUILDDIR%\Release"
+SET "ZIGINSTALLDIR=%ZIGBUILDDIR%\dist"
 SET "ZIGPREFIXPATH=%SRCROOT%\llvm+clang-9.0.0-win64-msvc-release"
 
 call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
diff --git a/ci/azure/windows_upload b/ci/azure/windows_upload
index 266d1b57dd..d5527fa13a 100755
--- a/ci/azure/windows_upload
+++ b/ci/azure/windows_upload
@@ -6,16 +6,15 @@ set -e
 if [ "${BUILD_REASON}" != "PullRequest" ]; then
   cd "$ZIGBUILDDIR"
 
-  rm release/*.exe
-  mv ../LICENSE release/
-  mv ../zig-cache/langref.html release/
-  mv release/bin/zig.exe release/
-  rmdir release/bin
+  mv ../LICENSE dist/
+  mv ../zig-cache/langref.html dist/
+  mv dist/bin/zig.exe dist/
+  rmdir dist/bin
 
-  VERSION=$(release/zig.exe version)
+  VERSION=$(dist/zig.exe version)
   DIRNAME="zig-windows-x86_64-$VERSION"
   TARBALL="$DIRNAME.zip"
-  mv release "$DIRNAME"
+  mv dist "$DIRNAME"
   7z a "$TARBALL" "$DIRNAME"
 
   mv "$DOWNLOADSECUREFILE_SECUREFILEPATH" "$HOME/.s3cfg"