Catch up AppVeyor updates to 1.6-maintenance

appveyor.yml

@@ -26,7 +26,7 @@ clone_depth: 5
 
 # on_finish:
 #  - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
-  
+
 install:
   # make a temp directory for downloading osgeo4w-setup.exe
   # this may not matter as much if part of the install step, as pdal has
@@ -39,22 +39,21 @@ install:
   # get the OSGeo installer
   - ps: (new-object net.webclient).DownloadFile("http://download.osgeo.org/osgeo4w/osgeo4w-setup-x86_64.exe", "C:\temp\osgeo4w-setup.exe")
   # and install our dependencies
-  - C:\temp\osgeo4w-setup.exe -q -k -r -A -s http://download.osgeo.org/osgeo4w/ -a x86_64 -P eigen,gdal,geos,hexer,iconv,laszip,libgeotiff,libpq,libtiff,libxml2,msys,nitro,laz-perf,proj,zlib,python3-core,python3-devel,python3-numpy,oci,oci-devel -R %OSGEO4W_ROOT% > NUL
+  - C:\temp\osgeo4w-setup.exe -q -k -r -A -s http://download.osgeo.org/osgeo4w/ -a x86_64 -P eigen,gdal,geos,hexer,iconv,laszip,libgeotiff,libpq,libtiff,libxml2,msys,nitro,laz-perf,proj,zlib,python3-core,python3-devel,python3-numpy,oci,oci-devel,laz-perf,jsoncpp,xz-devel,zstd -R %OSGEO4W_ROOT% > NUL
   # call our PDAL install script
   - call %OSGEO4W_ROOT%\bin\o4w_env.bat
   - call %OSGEO4W_ROOT%\bin\py3_env.bat
   - call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
   - set PATH=%PATH%;C:\Program Files (x86)\MSBuild\14.0\Bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Program Files\7-Zip;C:\Program Files\Microsoft Windows Performance Toolkit\;C:\Program Files (x86)\Windows Kits\8.1\Windows Performance Toolkit\;C:\Tools\GitVersion;C:\Program Files (x86)\CMake\bin;C:\Program Files\Git\cmd;C:\Program Files\Git\usr\bin;C:\Program Files\AppVeyor\BuildAgent\
   - call .\\scripts\\appveyor\\config.cmd
 
-build:
-  parallel: true
-  project: PDAL.sln
-  verbosity: minimal
+build_script:
+  - call .\\scripts\\appveyor\\build.cmd
 
 after_build:
   - call %OSGEO4W_ROOT%\bin\o4w_env.bat
-  - set PATH=C:\Program Files (x86)\MSBuild\14.0\Bin;%PATH%
+  - call %OSGEO4W_ROOT%\bin\py3_env.bat
+  - call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
   - set PATH=%PATH%;C:\Program Files (x86)\MSBuild\14.0\Bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Program Files\7-Zip;C:\Program Files\Microsoft Windows Performance Toolkit\;C:\Program Files (x86)\Windows Kits\8.1\Windows Performance Toolkit\;C:\Tools\GitVersion;C:\Program Files (x86)\CMake\bin;C:\Program Files\Git\cmd;C:\Program Files\Git\usr\bin;C:\Program Files\AppVeyor\BuildAgent\
   - call .\\scripts\\appveyor\\install.cmd
 
@@ -96,4 +95,4 @@ notifications:
     incoming_webhook:
       secure: KxbDvaPmsvNmYpsp0TH3m3hJr7PqQL1sxR8xILBzaF2Lbku03M3mJ/h787TvDGQGX3IlyZtfTP0wvSRqMl4nMmdvDQZoAe8+Gyfc7BOkYIg=
 
- 
+

scripts/appveyor/build.cmd

@@ -0,0 +1 @@
+nmake /f Makefile

scripts/appveyor/config.cmd

@@ -1,9 +1,11 @@
 @echo off
 
-REM If OSGEO4W_BUILD is set, we build an OSGeo4W64 tarball package and 
-REM and install it to C:\pdalbin before letting AppVeyor upload it as 
+REM If OSGEO4W_BUILD is set, we build an OSGeo4W64 tarball package and
+REM and install it to C:\pdalbin before letting AppVeyor upload it as
 REM an artifact to S3.
 
+SET PDAL_INSTALL_PREFIX="C:/OSGeo4W64/"
+
 if "%OSGEO4W_BUILD%"=="ON" (
 
 SET PDAL_OPTIONAL_COMPONENTS=ON
@@ -21,7 +23,7 @@ REM needed or else CMake won't find the Oracle library that OSGeo4W installs
 
 SET ORACLE_HOME="C:/OSGEO4W64/"
 
-cmake -G "Visual Studio 14 2015 Win64" ^
+cmake -G "NMake Makefiles" ^
     -DBUILD_PLUGIN_CPD=OFF ^
     -DBUILD_PLUGIN_GREYHOUND=%PDAL_OPTIONAL_COMPONENTS% ^
     -DBUILD_PLUGIN_HEXBIN=%PDAL_OPTIONAL_COMPONENTS% ^
@@ -51,11 +53,12 @@ cmake -G "Visual Studio 14 2015 Win64" ^
 	-DNUMPY_INCLUDE_DIR=%OSGEO4W_ROOT%/apps/python36/lib/site-packages/numpy/core/include ^
 	-DNUMPY_VERSION=1.12.0 ^
     -Dgtest_force_shared_crt=ON ^
-    -DCMAKE_INSTALL_PREFIX=C:\pdalbin ^
+    -DCMAKE_INSTALL_PREFIX=%PDAL_INSTALL_PREFIX% ^
     -DCMAKE_VERBOSE_MAKEFILE=OFF ^
     -DBUILD_PGPOINTCLOUD_TESTS=OFF ^
     -DBUILD_SQLITE_TESTS=OFF ^
+    -DCMAKE_BUILD_TYPE=RelWithDebInfo ^
     -DBUILD_OCI_TESTS=OFF ^
     .
-	
-	
+
+

scripts/appveyor/install.cmd

@@ -1,8 +1,10 @@
 @echo off
 
-cmake --build . --target install --config Release
-cd c:\pdalbin
-dir 
+REM cmake --build . --target install --config Release
+nmake /f Makefile install  DESTDIR=C:\projects\pdal\install
+
+cd c:\projects\pdal\install\osgeo4w64
+
 tar jcvf ..\pdal-%APPVEYOR_REPO_COMMIT%.tar.bz2 .
 copy c:\pdal-%APPVEYOR_REPO_COMMIT%.tar.bz2 c:\projects\pdal
 echo "OSGeo4W64 build will be uploaded to https://s3.amazonaws.com/pdal/osgeo4w/pdal-%APPVEYOR_REPO_COMMIT%.tar.bz2"