diff options
| author | Kristian Evers <kristianevers@gmail.com> | 2018-03-05 18:17:42 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-05 18:17:42 +0100 |
| commit | 7d9a545d5052c3845a43c0bd96c124e93ed6d630 (patch) | |
| tree | 651268000718a475b4884aca56f4d282eca6e2b3 | |
| parent | cdab910c2fdd52a90f4001a7fd3e97db8d4d074e (diff) | |
| parent | 973886758abc62e762e1fb75c838599bf8de9552 (diff) | |
| download | PROJ-7d9a545d5052c3845a43c0bd96c124e93ed6d630.tar.gz PROJ-7d9a545d5052c3845a43c0bd96c124e93ed6d630.zip | |
Merge pull request #822 from sebastic/travis-proj-datumgrid
Update travis to use proj-datumgrid-1.7.
| -rw-r--r-- | appveyor.yml | 6 | ||||
| -rwxr-xr-x | travis/install.sh | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/appveyor.yml b/appveyor.yml index 1b56b7b7..e7e46265 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -59,10 +59,8 @@ test_script: - if "%BUILD_TYPE%" == "cmake" set PROJ_LIB=C:\projects\proj-4\nad - if "%BUILD_TYPE%" == "nmake" set PROJ_LIB=C:\PROJ\SHARE - cd %PROJ_LIB% - - 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 - - curl -O -k https://raw.githubusercontent.com/OSGeo/proj-datumgrid/master/BETA2007.gsb - - 7z e -aoa -y proj-datumgrid-1.6.zip + - curl -O http://download.osgeo.org/proj/proj-datumgrid-1.7.zip + - 7z e -aoa -y proj-datumgrid-1.7.zip - dir - cd .. - dir diff --git a/travis/install.sh b/travis/install.sh index ac30a931..06e1eeb2 100755 --- a/travis/install.sh +++ b/travis/install.sh @@ -3,11 +3,9 @@ set -e # Download grid files to nad/ -wget http://download.osgeo.org/proj/proj-datumgrid-1.6.zip +wget http://download.osgeo.org/proj/proj-datumgrid-1.7.zip cd nad -unzip -o ../proj-datumgrid-1.6.zip -wget http://download.osgeo.org/proj/vdatum/egm96_15/egm96_15.gtx -wget https://raw.githubusercontent.com/OSGeo/proj-datumgrid/master/BETA2007.gsb +unzip -o ../proj-datumgrid-1.7.zip GRIDDIR=`pwd` echo $GRIDDIR cd .. |