Merge branch '215-cygwin-appveyor-fail' into 'master'

Update Appveyor CI build to build with VS2019 image

Closes #215

See merge request libtiff/libtiff!154

1 files changed, 24 insertions, 22 deletions

diff --git a/.appveyor.yml b/.appveyor.yml
index bcc0d1a0..04369ec6 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -14,34 +14,31 @@ environment:
       configuration: Debug
       generator: Unix Makefiles
       shared: OFF
-    - compiler: mingw64-cmake
+    - compiler: mingw-cmake
       configuration: Release
-      generator: Unix Makefiles
+      generator: MinGW Makefiles
       shared: ON
-    - compiler: mingw64-cmake
+    - compiler: mingw-cmake
       configuration: Debug
-      generator: Unix Makefiles
+      generator: MinGW Makefiles
       shared: OFF
     - compiler: vc14-cmake
       configuration: Release
-      generator: Visual Studio 14 2015 Win64
+      generator: Visual Studio 16 2019
       shared: ON
     - compiler: vc14-cmake
       configuration: Debug
-      generator: Visual Studio 14 2015 Win64
+      generator: Visual Studio 16 2019
       shared: OFF
     - compiler: vc14-nmake
       configuration: Release
-    - compiler: vc9-cmake
-      configuration: Debug
-      generator: Visual Studio 9 2008
-      shared: ON
+
 
 cache:
-  - 'c:\projects\download -> appveyor.yml'
+  #- 'c:\projects\download -> appveyor.yml'
 
 # Operating system (build VM template)
-os: 'Visual Studio 2015'
+os: 'Visual Studio 2019'
 
 # clone directory
 clone_folder: 'c:\projects\libtiff'
@@ -53,32 +50,37 @@ init:
   - git config --global core.autocrlf input
 
 before_build:
-  - 'FOR /F "tokens=* USEBACKQ" %%F IN (`C:\cygwin64\bin\cygpath -u %AV_TIFF_SOURCE%`) DO SET AV_TIFF_CYG_SOURCE=%%F'
-  - 'FOR /F "tokens=* USEBACKQ" %%F IN (`C:\cygwin64\bin\cygpath -u %AV_TIFF_INSTALL%`) DO SET AV_TIFF_CYG_INSTALL=%%F'
+  - 'FOR /F "tokens=* USEBACKQ" %%F IN (`C:\Cygwin64\bin\cygpath -u %AV_TIFF_SOURCE%`) DO SET AV_TIFF_CYG_SOURCE=%%F'
+  - 'FOR /F "tokens=* USEBACKQ" %%F IN (`C:\Cygwin64\bin\cygpath -u %AV_TIFF_INSTALL%`) DO SET AV_TIFF_CYG_INSTALL=%%F'
   - 'if %compiler%==cygwin-cmake C:\Cygwin64\setup-x86_64 -q -R C:\Cygwin64 -s http://cygwin.mirror.constant.com -l %AV_TIFF_DOWNLOAD%\cygwin -P cmake,libjpeg-devel,zlib-devel'
   - 'if %compiler%==cygwin-cmake set "PATH=C:\Cygwin64\bin;%PATH%"'
-  - 'if %compiler%==mingw64-cmake set "PATH=C:\mingw-w64\x86_64-6.3.0-posix-seh-rt_v5-rev1\mingw64\bin;%PATH%"'
+  - set
+  - 'if %compiler%==cygwin-cmake dir C:\Cygwin64\bin'
+  - 'if %compiler%==cygwin-cmake dir C:\Cygwin64\bin\cmake.exe'
+  - 'if %compiler%==cygwin-cmake C:\Cygwin64\bin\cmake.exe --version || echo CMake not found'
+  - 'if %compiler%==cygwin-cmake C:\Cygwin64\bin\cmake --version || echo CMake not found'
+  - 'if %compiler%==cygwin-cmake cygpath --version || echo cygpath not found'
+  - 'if %compiler%==cygwin-cmake cmake --version || echo CMake not found'
+  - set "AV_CMAKE_ARGS=-DBUILD_SHARED_LIBS:BOOL=%shared%"
   - set "AV_CMAKE_ARGS=-DBUILD_SHARED_LIBS:BOOL=%shared%"
-  - 'if %compiler%==mingw64-cmake set "PATH=C:\mingw-w64\x86_64-6.3.0-posix-seh-rt_v5-rev1\mingw64\bin;%PATH%"'
-  - 'if %compiler%==mingw64-cmake set "AV_CMAKE_ARGS=%AV_CMAKE_ARGS% -DCMAKE_MAKE_PROGRAM=C:\mingw-w64\x86_64-6.3.0-posix-seh-rt_v5-rev1\mingw64\bin\mingw32-make"'
   - set "AV_TIFF_CMAKE_SOURCE=%AV_TIFF_SOURCE%"
   - set "AV_TIFF_CMAKE_INSTALL=%AV_TIFF_INSTALL%"
   - 'if %compiler%==cygwin-cmake set "AV_TIFF_CMAKE_SOURCE=%AV_TIFF_CYG_SOURCE%'
   - 'if %compiler%==cygwin-cmake set "AV_TIFF_CMAKE_INSTALL=%AV_TIFF_CYG_INSTALL%'
+  - 'if %compiler%==mingw-cmake set "PATH=C:\MinGW\bin;%PATH%"'
   - 'if %compiler%==vc14-nmake call "%VS140COMNTOOLS%..\..\VC\vcvarsall.bat" %platform%'
   - mkdir %AV_TIFF_BUILD%
   - cd %AV_TIFF_BUILD%
   - if NOT %compiler%==vc14-nmake echo Running cmake -G "%generator%" -DCMAKE_INSTALL_PREFIX=%AV_TIFF_CMAKE_INSTALL% -DCMAKE_BUILD_TYPE=%configuration% %AV_TIFF_CMAKE_SOURCE%
   - 'if %compiler%==cygwin-cmake bash -c "cmake -G \"%generator%\" -DCMAKE_INSTALL_PREFIX:PATH=%AV_TIFF_CMAKE_INSTALL% -DCMAKE_BUILD_TYPE=%configuration% %AV_CMAKE_ARGS% %AV_TIFF_CMAKE_SOURCE%"'
-  - 'if %compiler%==mingw64-cmake cmake -G "%generator%" -DCMAKE_INSTALL_PREFIX:PATH=%AV_TIFF_CMAKE_INSTALL% -DCMAKE_BUILD_TYPE=%configuration% %AV_CMAKE_ARGS% %AV_TIFF_CMAKE_SOURCE%'
-  - 'if %compiler%==vc14-cmake cmake -G "%generator%" -DCMAKE_INSTALL_PREFIX:PATH=%AV_TIFF_CMAKE_INSTALL% -DCMAKE_BUILD_TYPE=%configuration% %AV_CMAKE_ARGS% %AV_TIFF_CMAKE_SOURCE%'
-  - 'if %compiler%==vc9-cmake cmake -G "%generator%" -DCMAKE_INSTALL_PREFIX:PATH=%AV_TIFF_CMAKE_INSTALL% -DCMAKE_BUILD_TYPE=%configuration% %AV_CMAKE_ARGS% %AV_TIFF_CMAKE_SOURCE%'
+  - 'if %compiler%==mingw-cmake cmake -G "%generator%" -DCMAKE_INSTALL_PREFIX:PATH=%AV_TIFF_CMAKE_INSTALL% -DCMAKE_BUILD_TYPE=%configuration% %AV_CMAKE_ARGS% %AV_TIFF_CMAKE_SOURCE%'
+  - 'if %compiler%==vc14-cmake cmake -G "%generator%" -A x64 -DCMAKE_INSTALL_PREFIX:PATH=%AV_TIFF_CMAKE_INSTALL% -DCMAKE_BUILD_TYPE=%configuration% %AV_CMAKE_ARGS% %AV_TIFF_CMAKE_SOURCE%'
 
 build_script:
   - if NOT %compiler%==vc14-nmake cd %AV_TIFF_BUILD%
   - if %compiler%==vc14-nmake cd %AV_TIFF_SOURCE%
   - 'if %compiler%==cygwin-cmake bash -c "cmake --build . --config %configuration% --target install"'
-  - 'if %compiler%==mingw64-cmake cmake --build . --config %configuration% --target install'
+  - 'if %compiler%==mingw-cmake cmake --build . --config %configuration% --target install'
   - 'if %compiler%==vc14-cmake cmake --build . --config %configuration% --target install'
   - 'if %compiler%==vc9-cmake cmake --build . --config %configuration% --target install'
   - 'if %compiler%==vc14-nmake nmake /f Makefile.vc EXTRAFLAGS=/DHAVE_SNPRINTF=1'
@@ -104,7 +106,7 @@ after_build:
 before_test:
   - cd %AV_TIFF_BUILD%
   - 'if %compiler%==cygwin-cmake bash -c "ctest -V -C %configuration%"'
-  - 'if %compiler%==mingw64-cmake ctest -V -C %configuration%'
+  - 'if %compiler%==mingw-cmake ctest -V -C %configuration%'
   - 'if %compiler%==vc14-cmake ctest -V -C %configuration%'
   - 'if %compiler%==vc9-cmake ctest -V -C %configuration%'
 # vc14-nmake does not support unit tests