diff options
| author | Chris Wilson <chris+github@qwirx.com> | 2016-04-06 16:24:56 +0100 |
|---|---|---|
| committer | Chris Wilson <chris+github@qwirx.com> | 2016-04-06 16:24:56 +0100 |
| commit | 338c4ed8eb79193e1df36b97cb810374eb42c9a3 (patch) | |
| tree | 4fd172e86fff1674b22712785e7c2e158edd038b /appveyor.yml | |
| parent | 3d81fee4b6a5aecc115ee8b4d9d448298ce389de (diff) | |
Make PCRE version a variable, and cache the downloaded file, trying to avoid timeouts
Diffstat (limited to 'appveyor.yml')
| -rw-r--r-- | appveyor.yml | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/appveyor.yml b/appveyor.yml index 6b2cfc06..88406c8a 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -20,15 +20,17 @@ environment: VisualStudioVersion: 10.0 Generator: Visual Studio 10 OPENSSL_VERSION: 1.0.2f + PCRE_VERSION: 8.38 cache: - '..\zlib-1.2.8' - '..\zlib-%PLATFORM%' - '..\openssl-%OPENSSL_VERSION%' - '..\openssl-%PLATFORM%' - - '..\pcre-8.38' + - '..\pcre-%PCRE_VERSION%' - '..\pcre-%PLATFORM%' - 'infrastructure\cmake\build' + - '..\pcre-%PCRE_VERSION%.zip' init: # Uncomment the following two lines to enable RDP access to the virtual machine for debugging. @@ -77,10 +79,10 @@ install: - nmake /s /f ms\nt.mak install - cd %APPVEYOR_BUILD_FOLDER%\.. - - ps: Start-FileDownload 'http://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-8.38.zip' - - 7za x -aoa pcre-8.38.zip + - ps: Start-FileDownload "http://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-$($env:PCRE_VERSION).zip" + - 7za x -aoa pcre-%PCRE_VERSION%.zip - cd %APPVEYOR_BUILD_FOLDER%\.. - - cd pcre-8.38 + - cd pcre-%PCRE_VERSION% - cmake -G "%Generator%" -A %PLATFORM% -DCMAKE_INSTALL_PREFIX="..\pcre-%PLATFORM%" . - dir # We need to build both versions, debug and release, because cmake requires both to be @@ -106,7 +108,7 @@ install: - dir %APPVEYOR_BUILD_FOLDER%\..\zlib-%PLATFORM% - dir %APPVEYOR_BUILD_FOLDER%\..\openssl-%OPENSSL_VERSION% - dir %APPVEYOR_BUILD_FOLDER%\..\openssl-%PLATFORM% - - dir %APPVEYOR_BUILD_FOLDER%\..\pcre-8.38 + - dir %APPVEYOR_BUILD_FOLDER%\..\pcre-%PCRE_VERSION% - dir %APPVEYOR_BUILD_FOLDER%\..\pcre-%PLATFORM% test_script: |