Skip to content

Commit

Permalink
switch on more conda-based stuff for appveyor
Browse files Browse the repository at this point in the history
  • Loading branch information
hobu committed Oct 22, 2018
1 parent 84b5392 commit 3fe3099
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 25 deletions.
2 changes: 1 addition & 1 deletion appveyor.yml
Expand Up @@ -52,7 +52,7 @@ install:
# - C:\temp\conda-install.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,proj4dll,zlib,python3-core,python3-devel,python3-numpy,oci,oci-devel,laz-perf,jsoncpp,xz-devel,zstd -R %OSGEO4W_ROOT% > NUL
# - 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
- call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
# - set PATH=%PATH%;C:\Program Files (x86)\CMake\bin
# - ps: (new-object net.webclient).DownloadFile("http://curl.haxx.se/ca/cacert.pem", "c:\osgeo4w64\bin\curl-ca-bundle.crt")
- call scripts\\appveyor\\config.cmd
Expand Down
20 changes: 10 additions & 10 deletions scripts/appveyor/config.cmd
Expand Up @@ -16,24 +16,24 @@ pushd build

cmake -G "NMake Makefiles" ^
-DBUILD_PLUGIN_CPD=OFF ^
-DBUILD_PLUGIN_GREYHOUND=%PDAL_OPTIONAL_COMPONENTS% ^
-DBUILD_PLUGIN_HEXBIN=%PDAL_OPTIONAL_COMPONENTS% ^
-DBUILD_PLUGIN_GREYHOUND=ON ^
-DBUILD_PLUGIN_HEXBIN=ON ^
-DBUILD_PLUGIN_ICEBRIDGE=OFF ^
-DBUILD_PLUGIN_MRSID=OFF ^
-DBUILD_PLUGIN_NITF=%PDAL_OPTIONAL_COMPONENTS% ^
-DBUILD_PLUGIN_PCL=%PDAL_OPTIONAL_COMPONENTS% ^
-DBUILD_PLUGIN_PGPOINTCLOUD=%PDAL_OPTIONAL_COMPONENTS% ^
-DBUILD_PLUGIN_SQLITE=%PDAL_OPTIONAL_COMPONENTS% ^
-DBUILD_PLUGIN_I3S=%PDAL_OPTIONAL_COMPONENTS% ^
-DBUILD_PLUGIN_NITF=ON ^
-DBUILD_PLUGIN_PCL=ON ^
-DBUILD_PLUGIN_PGPOINTCLOUD=ON ^
-DBUILD_PLUGIN_SQLITE=ON ^
-DBUILD_PLUGIN_I3S=ON ^
-DLIBLZMA_LIBRARY=%CONDA_ROOT%\Library\lib\liblzma.lib ^
-DBUILD_PLUGIN_RIVLIB=OFF ^
-DBUILD_PLUGIN_PYTHON=%PDAL_OPTIONAL_COMPONENTS% ^
-DBUILD_PLUGIN_PYTHON=ON ^
-DENABLE_CTEST=OFF ^
-DWITH_LAZPERF=ON ^
-DWITH_LAZPERF=OFF ^
-DLazperf_DIR=%CONDA_ROOT% ^
-DWITH_LZMA=ON ^
-DWITH_LASZIP=ON ^
-DWITH_TESTS=%PDAL_BUILD_TESTS% ^
-DWITH_TESTS=ON ^
-DPDAL_PLUGIN_INSTALL_PATH=%PDAL_PLUGIN_INSTALL_PATH% ^
-DGDAL_INCLUDE_DIR=%CONDA_ROOT%/include ^
-DGDAL_LIBRARY=%CONDA_ROOT%/Library/lib/gdal_i.lib ^
Expand Down
26 changes: 13 additions & 13 deletions scripts/appveyor/install.cmd
@@ -1,21 +1,21 @@
@echo off

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
REM call %OSGEO4W_ROOT%\bin\o4w_env.bat
REM call %OSGEO4W_ROOT%\bin\py3_env.bat
REM call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
REM
REM 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\

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\
REM pushd c:\projects\pdal\build

pushd c:\projects\pdal\build
REM nmake /f Makefile install DESTDIR=C:\projects\pdal\install

nmake /f Makefile install DESTDIR=C:\projects\pdal\install
REM popd

popd
REM pushd c:\projects\pdal\install\osgeo4w64

pushd c:\projects\pdal\install\osgeo4w64
REM tar jcvf ..\pdal-%APPVEYOR_REPO_COMMIT%.tar.bz2 .
REM copy c:\pdal-%APPVEYOR_REPO_COMMIT%.tar.bz2 c:\projects\pdal
REM echo "OSGeo4W64 build will be uploaded to https://s3.amazonaws.com/pdal/osgeo4w/pdal-%APPVEYOR_REPO_COMMIT%.tar.bz2"

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"

popd
REM popd
1 change: 0 additions & 1 deletion scripts/appveyor/test.cmd
@@ -1,5 +1,4 @@
pushd build
set CURL_CA_INFO=C:\OSGeo4W64\bin\curl-ca-bundle.crt
ctest -V --output-on-failure

popd

0 comments on commit 3fe3099

Please sign in to comment.