diff options
| -rw-r--r-- | appveyor.yml | 10 | ||||
| -rwxr-xr-x | travis/install.sh | 7 |
2 files changed, 12 insertions, 5 deletions
diff --git a/appveyor.yml b/appveyor.yml index e1d23025..68568e82 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -46,10 +46,16 @@ build_script: test_script: - echo test_script - - if "%BUILD_TYPE%" == "nmake" cd C:\PROJ\bin - - if "%BUILD_TYPE%" == "cmake" cd C:\projects\proj-4\bin + - if "%BUILD_TYPE%" == "nmake" set PROJDIR=C:\PROJ\bin + - if "%BUILD_TYPE%" == "cmake" set PROJDIR= C:\projects\proj-4\bin + - cd %PROJDR%\nad + - curl -O http://download.osgeo.org/proj/proj-datumgrid-1.6.zip + - curl -O http://download.osgeo.org/proj/vdatum/egm96_15/egm96_15.gtx + - 7z e proj-datumgrid-1.6.zip + - cd %PROJDIR%\bin - echo "Contents of current directory:" - dir + - set PROJ_LIB=%PROJDIR%\nad - proj.exe -VC deploy: off diff --git a/travis/install.sh b/travis/install.sh index 41f9fcb6..b9764612 100755 --- a/travis/install.sh +++ b/travis/install.sh @@ -43,9 +43,10 @@ cd .. # cd .. # Now with grids -wget http://download.osgeo.org/proj/proj-datumgrid-1.5.zip +wget http://download.osgeo.org/proj/proj-datumgrid-1.6.zip cd nad -unzip -o ../proj-datumgrid-1.5.zip +unzip -o ../proj-datumgrid-1.6.zip +wget http://download.osgeo.org/proj/vdatum/egm96_15/egm96_15.gtx cd .. # cmake build with grids mkdir build_cmake_nad @@ -77,7 +78,7 @@ if [ $TRAVIS_OS_NAME == "osx" ]; then fi make -j3 make check -./src/proj -VC +PROJ_LIB=../nad ./src/proj -VC # install & run the working GIGS test # create locations that pyproj understands |