AppVeyor: cache zlib build
This commit is contained in:
parent
74d5eee573
commit
ad451bd201
15
appveyor.yml
15
appveyor.yml
@ -54,11 +54,11 @@ install:
|
||||
C:\WinOpenSSL.exe /SILENT /VERYSILENT /SP- /SUPPRESSMSGBOXES /NORESTART
|
||||
}
|
||||
$env:NMAKE_EXTRA="OPENSSL_DEF=/DENABLE_OPENSSL ${env:NMAKE_EXTRA}"
|
||||
If (!(Test-Path zlib.zip )) {
|
||||
If (!(Test-Path C:\zlib )) {
|
||||
appveyor DownloadFile "https://github.com/madler/zlib/archive/v${env:ZLIB_VER_DOT}.zip" -FileName zlib.zip
|
||||
}
|
||||
7z x zlib.zip -oC:\
|
||||
Rename-Item -path "c:\zlib-${env:ZLIB_VER_DOT}" -newName "zlib"
|
||||
}
|
||||
If (!(Test-Path openpace.zip )) {
|
||||
appveyor DownloadFile "https://github.com/frankmorgner/openpace/archive/${env:OPENPACE_VER}.zip" -FileName openpace.zip
|
||||
}
|
||||
@ -76,15 +76,18 @@ install:
|
||||
build_script:
|
||||
- ps: >-
|
||||
if (!($env:Configuration -Like "*Light*")) {
|
||||
If (!(Test-Path -Path "C:\zlib-${env:OPENSSL_PF}" )) {
|
||||
# build zlib.lib as a static library
|
||||
cd C:\zlib
|
||||
xcopy C:\zlib C:\zlib-${env:OPENSSL_PF} /e /i /y /s
|
||||
cd C:\zlib-${env:OPENSSL_PF}
|
||||
(Get-Content win32/Makefile.msc).replace('-MD', '-MT') | Set-Content win32/Makefile.msc
|
||||
If ($env:Platform -Match "x86") {
|
||||
nmake -f win32/Makefile.msc LOC="-DASMV -DASMINF" OBJA="inffas32.obj match686.obj" zlib.lib
|
||||
} Else {
|
||||
nmake -f win32/Makefile.msc AS=ml64 LOC="-DASMV -DASMINF -I." OBJA="inffasx64.obj gvmat64.obj inffas8664.obj" zlib.lib
|
||||
}
|
||||
$env:NMAKE_EXTRA="ZLIBSTATIC_DEF=/DENABLE_ZLIB_STATIC ${env:NMAKE_EXTRA}"
|
||||
}
|
||||
$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}"
|
||||
# build libeac.lib as a static library
|
||||
cd C:\openpace\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
|
||||
@ -110,7 +113,9 @@ build_script:
|
||||
cache:
|
||||
- C:\OpenSSL-Win32 -> appveyor.yml
|
||||
- C:\OpenSSL-Win64 -> appveyor.yml
|
||||
- zlib.zip -> appveyor.yml
|
||||
- C:\zlib -> appveyor.yml
|
||||
- C:\zlib-Win32 -> appveyor.yml
|
||||
- C:\zlib-Win64 -> appveyor.yml
|
||||
|
||||
deploy:
|
||||
- provider: GitHub
|
||||
|
@ -64,12 +64,20 @@ CANDLEFLAGS = -dOpenSSL="$(OPENSSL_DIR)" $(CANDLEFLAGS)
|
||||
#ZLIB_DEF = /DENABLE_ZLIB
|
||||
!IF "$(ZLIBSTATIC_DEF)" == "/DENABLE_ZLIB_STATIC"
|
||||
ZLIB_DEF = /DENABLE_ZLIB
|
||||
!IF "$(ZLIB_INCL_DIR)" == ""
|
||||
ZLIB_INCL_DIR = /IC:\zlib
|
||||
!ENDIF
|
||||
!IF "$(ZLIB_LIB)" == ""
|
||||
ZLIB_LIB = C:\zlib\zlib.lib
|
||||
!ENDIF
|
||||
OPENSC_FEATURES = $(OPENSC_FEATURES) zlib
|
||||
!ELSE IF "$(ZLIB_DEF)" == "/DENABLE_ZLIB"
|
||||
!ELSEIF "$(ZLIB_DEF)" == "/DENABLE_ZLIB"
|
||||
!IF "$(ZLIB_INCL_DIR)" == ""
|
||||
ZLIB_INCL_DIR = /IC:\zlib-dll\include
|
||||
!ENDIF
|
||||
!IF "$(ZLIB_LIB)" == ""
|
||||
ZLIB_LIB = C:\zlib-dll\lib\zdll.lib
|
||||
!ENDIF
|
||||
OPENSC_FEATURES = $(OPENSC_FEATURES) zlib
|
||||
CANDLEFLAGS = -dzlib="C:\zlib-dll" $(CANDLEFLAGS)
|
||||
!ENDIF
|
||||
|
Loading…
Reference in New Issue
Block a user