From fb8fccd7ba4e5c8971fc3dfb389982782e0f561c Mon Sep 17 00:00:00 2001
From: Frank Morgner <frankmorgner@gmail.com>
Date: Thu, 1 Jun 2017 10:10:56 +0200
Subject: [PATCH] AppVeyor: cache openpace build

---
 appveyor.yml         | 16 +++++++++++-----
 win32/Make.rules.mak |  2 ++
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 2aa94f03..6aa47b54 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -59,11 +59,11 @@ install:
           7z x zlib.zip -oC:\
           Rename-Item -path "c:\zlib-${env:ZLIB_VER_DOT}" -newName "zlib"
         }
-        If (!(Test-Path openpace.zip )) {
+        If (!(Test-Path C:\openpace )) {
           appveyor DownloadFile "https://github.com/frankmorgner/openpace/archive/${env:OPENPACE_VER}.zip" -FileName openpace.zip
+          7z x openpace.zip -oC:\
+          Rename-Item -path "c:\openpace-${env:OPENPACE_VER}" -newName "openpace"
         }
-        7z x openpace.zip -oC:\
-        Rename-Item -path "c:\openpace-${env:OPENPACE_VER}" -newName "openpace"
       }
   - ps: $env:VSCOMNTOOLS=(Get-Content ("env:VS" + "$env:VSVER" + "0COMNTOOLS"))
   - echo "Using Visual Studio %VSVER%.0 at %VSCOMNTOOLS%"
@@ -88,12 +88,15 @@ build_script:
           }
         }
         $env:NMAKE_EXTRA="ZLIBSTATIC_DEF=/DENABLE_ZLIB_STATIC ZLIB_INCL_DIR=/IC:\zlib-${env:OPENSSL_PF} ZLIB_LIB=C:\zlib-${env:OPENSSL_PF}\zlib.lib ${env:NMAKE_EXTRA}"
+        If (!(Test-Path -Path "C:\openpace-${env:OPENSSL_PF}" )) {
           # build libeac.lib as a static library
-          cd C:\openpace\src
+          xcopy C:\openpace C:\openpace-${env:OPENSSL_PF} /e /i /y /s
+          cd C:\openpace-${env:OPENSSL_PF}\src
           cl /IC:\OpenSSL-${env:OPENSSL_PF}\include /I. /DX509DIR=\`"/\`" /DCVCDIR=\`"/\`" /W3 /D_CRT_SECURE_NO_DEPRECATE /DWIN32_LEAN_AND_MEAN /GS /MT /c ca_lib.c cv_cert.c cvc_lookup.c x509_lookup.c eac_asn1.c eac.c eac_ca.c eac_dh.c eac_ecdh.c eac_kdf.c eac_lib.c eac_print.c eac_util.c misc.c pace.c pace_lib.c pace_mappings.c ri.c ri_lib.c ta.c ta_lib.c objects.c
           lib /out:libeac.lib ca_lib.obj cv_cert.obj cvc_lookup.obj x509_lookup.obj eac_asn1.obj eac.obj eac_ca.obj eac_dh.obj eac_ecdh.obj eac_kdf.obj eac_lib.obj eac_print.obj eac_util.obj misc.obj pace.obj pace_lib.obj pace_mappings.obj ri.obj ri_lib.obj ta.obj ta_lib.obj objects.obj
-          $env:NMAKE_EXTRA="OPENPACE_DEF=/DENABLE_OPENPACE ${env:NMAKE_EXTRA}"
           cd C:\projects\OpenSC
+        }
+        $env:NMAKE_EXTRA="OPENPACE_DEF=/DENABLE_OPENPACE OPENPACE_DIR=C:\openpace-${env:OPENSSL_PF} ${env:NMAKE_EXTRA}"
       }
   - bash -c "exec 0</dev/null && ./bootstrap"
   # disable features to speed up the script
@@ -116,6 +119,9 @@ cache:
   - C:\zlib -> appveyor.yml
   - C:\zlib-Win32 -> appveyor.yml
   - C:\zlib-Win64 -> appveyor.yml
+  - C:\openpace -> appveyor.yml
+  - C:\openpace-Win32 -> appveyor.yml
+  - C:\openpace-Win64 -> appveyor.yml
 
 deploy:
   - provider: GitHub
diff --git a/win32/Make.rules.mak b/win32/Make.rules.mak
index dc6608d9..8a009448 100644
--- a/win32/Make.rules.mak
+++ b/win32/Make.rules.mak
@@ -90,7 +90,9 @@ CANDLEFLAGS = -dzlib="C:\zlib-dll" $(CANDLEFLAGS)
 # - set the OPENPACE_LIB  below to your OpenPACE lib file
 #OPENPACE_DEF= /DENABLE_OPENPACE
 !IF "$(OPENPACE_DEF)" == "/DENABLE_OPENPACE"
+!IF "$(OPENPACE_DIR)" == ""
 OPENPACE_DIR = C:\openpace
+!ENDIF
 OPENPACE_INCL_DIR = /I$(OPENPACE_DIR)\src
 OPENPACE_LIB = $(OPENPACE_DIR)\src\libeac.lib
 CANDLEFLAGS = -dOpenPACE="$(OPENPACE_DIR)" $(CANDLEFLAGS)