From 02aa57afa543b295777335e0f462b814fe33b69a Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Mon, 8 Apr 2019 00:14:01 +0200
Subject: [PATCH] CI/AppVeyor: build deps out-of-tree

appveyor.yml: set cache to an absolute path.

Desperate attempt to get AppVeyor cache to work.

My assumption in a7a56293aad9 #9852 that that different jobs were
overwriting each other's cache is probably wrong: AppVeyor
docs/discussions hint that the cache is per-config (though I haven't
found a clear, unambiguous statement as such).
---
 appveyor.yml | 10 ++++++----
 ci/build.ps1 | 20 +++++++++++---------
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 23d3a2649a..2b974adefb 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,6 +1,8 @@
 version: '{build}'
 environment:
   APPVEYOR_CACHE_ENTRY_ZIP_ARGS: "-t7z -m0=lzma -mx=9"
+  DEPS_BUILD_DIR: "C:/projects/nvim-deps"
+  DEPS_PREFIX: "C:/projects/nvim-deps/usr"
 image: Visual Studio 2017
 configuration:
 - MSVC_64
@@ -15,6 +17,8 @@ init:
       $env:APPVEYOR_CACHE_SKIP_SAVE = "true"
       Exit-AppVeyorBuild
     }
+# RDP
+#- ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
 matrix:
   allow_failures:
     - configuration: MINGW_64-gcov
@@ -25,10 +29,8 @@ build_script:
 - powershell ci\build.ps1
 cache:
 - C:\msys64\var\cache\pacman\pkg -> ci\build.ps1
-- deps-MINGW  -> ci\build.ps1
-- deps-MSVC   -> ci\build.ps1
-- deps-MINGW  -> third-party\**
-- deps-MSVC   -> third-party\**
+- C:\projects\nvim-deps -> ci\build.ps1
+- C:\projects\nvim-deps -> third-party\**
 artifacts:
 - path: build/Neovim.zip
 - path: build/bin/nvim.exe
diff --git a/ci/build.ps1 b/ci/build.ps1
index cd470439f0..ea1acfac00 100644
--- a/ci/build.ps1
+++ b/ci/build.ps1
@@ -6,15 +6,15 @@ $compiler = $Matches.compiler
 $compileOption = $Matches.option
 $bits = $Matches.bits
 $cmakeBuildType = 'RelWithDebInfo'
-$depsDir = [System.IO.Path]::GetFullPath("deps-$($compiler)")
+$buildDir = [System.IO.Path]::GetFullPath("$(pwd)")
 $depsCmakeVars = @{
   CMAKE_BUILD_TYPE = $cmakeBuildType;
 }
 $nvimCmakeVars = @{
   CMAKE_BUILD_TYPE = $cmakeBuildType;
   BUSTED_OUTPUT_TYPE = 'nvim';
-  DEPS_BUILD_DIR=$depsDir;
-  DEPS_PREFIX="$($depsDir)/usr";
+  DEPS_BUILD_DIR=$(if ($env:DEPS_BUILD_DIR -ne $null) {$env:DEPS_BUILD_DIR} else {".deps"});
+  DEPS_PREFIX=$(if ($env:DEPS_PREFIX -ne $null) {$env:DEPS_PREFIX} else {".deps/usr"});
 }
 $uploadToCodeCov = $false
 
@@ -25,6 +25,11 @@ function exitIfFailed() {
   }
 }
 
+if (-Not (Test-Path -PathType container $nvimCmakeVars["DEPS_BUILD_DIR"])) {
+  write-host "cache not restored (deps dir not found): $($nvimCmakeVars['DEPS_BUILD_DIR'])"
+  mkdir $nvimCmakeVars["DEPS_BUILD_DIR"]
+}
+
 if ($compiler -eq 'MINGW') {
   if ($bits -eq 32) {
     $arch = 'i686'
@@ -87,13 +92,10 @@ function convertToCmakeArgs($vars) {
   return $vars.GetEnumerator() | foreach { "-D$($_.Key)=$($_.Value)" }
 }
 
-if (-Not (Test-Path -PathType container $depsDir)) {
-  mkdir "$depsDir"
-}
-cd "$depsDir"
-cmake -G $cmakeGenerator $(convertToCmakeArgs($depsCmakeVars)) ..\third-party\ ; exitIfFailed
+cd $nvimCmakeVars["DEPS_BUILD_DIR"]
+cmake -G $cmakeGenerator $(convertToCmakeArgs($depsCmakeVars)) "$buildDir/third-party/" ; exitIfFailed
 cmake --build . --config $cmakeBuildType -- $cmakeGeneratorArgs ; exitIfFailed
-cd ..
+cd $buildDir
 
 # Build Neovim
 mkdir build