From 08e0771e36c0b4e4d83eaf5cf44e908e163f2cf1 Mon Sep 17 00:00:00 2001
From: Olly Betts <olly@survex.com>
Date: Fri, 13 Apr 2018 15:00:47 +1200
Subject: [PATCH] [ci] Appveyor build tweaks

Use new bootstrap --fetch-url-command option to use curl instead of wget.

Download zlib from github rather than zlib.net so we aren't reliant on
zlib.net being available (if github is offline then the CI won't even
get this far).
---
 .appveyor.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 02bc16514..227c5efe3 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -10,7 +10,6 @@ clone_folder: c:\projects\xapian
 environment:
   global:
     AUTOMATED_TESTING: 1
-    FETCH_URL_TOOL: curl -L
   matrix:
   - TOOLCHAIN: mingw
     platform: x86
@@ -20,7 +19,7 @@ environment:
     platform: x64
 # Fails trying to run apitest.exe etc for unknown reasons.
 #  - TOOLCHAIN: cygwin
-#   platform: x86
+#    platform: x86
   - TOOLCHAIN: cygwin
     platform: x64
   - TOOLCHAIN: msvc
@@ -77,10 +76,11 @@ install:
   - if "%TOOLCHAIN%"=="mingw64" bash -c 'pacman -Sy --noconfirm zlib-devel'
   - if "%TOOLCHAIN%-%Platform%"=="cygwin-x64" C:\cygwin64\setup-x86_64.exe -qnNdO -R C:/cygwin64 -s http://cygwin.mirror.constant.com -l C:/cygwin64/var/cache/setup -P zlib-devel
   - if "%TOOLCHAIN%-%Platform%"=="cygwin-x86" C:\cygwin64\setup-x86_64.exe -qnNdO -R C:/cygwin64 -s http://cygwin.mirror.constant.com -l C:/cygwin64/var/cache/setup -P cygwin32-zlib -P cygwin32-gcc-core -P cygwin32-gcc-g++
-  - bash -c 'time ./bootstrap xapian-core'
-  - if "%TOOLCHAIN%"=="msvc" call %VCVARS_BAT%
-  - if "%TOOLCHAIN%"=="msvc" bash -c 'wget https://zlib.net/zlib-1.2.11.tar.gz && tar -xf zlib-1.2.11.tar.gz && mv zlib-1.2.11 zlib'
+  - bash -c 'time ./bootstrap --fetch-url-command="curl -L" xapian-core'
+  - if defined VCVARS_BAT call %VCVARS_BAT%
+  - if "%TOOLCHAIN%"=="msvc" mkdir zlib
   - if "%TOOLCHAIN%"=="msvc" cd zlib
+  - if "%TOOLCHAIN%"=="msvc" bash -c 'curl -L https://github.com/xapian/xapian-dev-deps/releases/download/current/zlib-1.2.11.tar.gz|tar --strip-components=1 -zxf -'
   - if "%TOOLCHAIN%"=="msvc" nmake -nologo -f win32\Makefile.msc
   - if "%TOOLCHAIN%"=="msvc" cd ..
   # Fetch pre-built unicode-data.cc to avoid having to get working tclsh.
@@ -88,7 +88,7 @@ install:
   - ps: >-
       if ($env:TOOLCHAIN -eq "msvc") {
         $env:CC="cl -nologo"
-        $env:CXX="c:/projects/xapian/INST/share/automake-1.15/compile cl -nologo"
+        $env:CXX="c:/projects/xapian/INST/share/automake-1.16/compile cl -nologo"
         $env:CXXFLAGS="-EHsc"
         $env:CPPFLAGS="-Ic:/projects/xapian/zlib"
         $env:AR="lib"
-- 
2.11.4.GIT