Skip to content

Commit 6d1a5cd

Browse files
committed
Update/fix appveyor build
1 parent 7154cfa commit 6d1a5cd

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

appveyor.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
environment:
22
global:
33
BZIP2_VER: 1.0.8.0
4-
EXPAT_VER: 2.2.5
5-
PROJ4_VER: 4.9.3
4+
EXPAT_VER: 2.4.1
5+
PROJ_VER: 7.0.1
66
ZLIB_VER: 1.2.11
77
LUA_VER: 5.3.4
88
LUA_INCLUDE_DIR: C:\lua\include
@@ -13,15 +13,15 @@ environment:
1313
GETOPT_LIBRARY: C:\wingetopt\build\wingetopt.lib
1414
BZIP2_INCLUDE_DIR: C:\bzip2\dev
1515
BZIP2_LIBRARY: C:\bzip2\dll
16-
BOOST_PATH: C:\Libraries\boost_1_63_0
16+
BOOST_PATH: C:\Libraries\boost_1_77_0
1717
POSTGRESQL_VER: 11.2
1818
TESTS_POSTGRESQL_ROOT: C:\Progra~1\PostgreSQL\9.6
1919
POSTGIS_VER: 2.4.3
2020
POSTGIS_URL: "https://osm2pgsql.org/ci/winbuild/postgis-bundle-pg96-2.4.3x64.zip"
2121
PGUSER: postgres
2222
PGPASSWORD: Password12!
2323

24-
os: Visual Studio 2015
24+
os: Visual Studio 2019
2525

2626
services:
2727
- postgresql96
@@ -40,15 +40,15 @@ init:
4040
- set conda_library_path=C:\Miniconda36-x64\envs\osm2pgsql\Library
4141
- set lua_url=https://osm2pgsql.org/ci/winbuild/lua_x64.zip
4242
- set build_type=Release
43-
- '"C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall" %vcvarsall_arg%'
43+
- '"C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat"'
4444

4545
install:
4646
- set PATH=%TESTS_POSTGRESQL_ROOT%\bin;%python_path%;%PATH%;%conda_path%
4747
- cd c:\
4848
- conda config --set always_yes yes
4949
- conda create --name osm2pgsql
5050
- activate osm2pgsql
51-
- conda install expat=%EXPAT_VER% proj4=%PROJ4_VER% zlib=%ZLIB_VER% postgresql=%POSTGRESQL_VER%
51+
- conda install expat=%EXPAT_VER% proj=%PROJ_VER% zlib=%ZLIB_VER% postgresql=%POSTGRESQL_VER%
5252
- ps: if (!(Test-Path "C:\bzip2_dll_x64.zip")){(new-object net.webclient).DownloadFile($env:bz2_dll_url, "C:\bzip2_dll_x64.zip")}
5353
- 7z x -y C:\bzip2_dll_x64.zip -o%BZIP2_LIBRARY%
5454
- ps: if (!(Test-Path "C:\bzip2_dev_x64.zip")){(new-object net.webclient).DownloadFile($env:bz2_dev_url, "C:\bzip2_dev_x64.zip")}
@@ -74,7 +74,7 @@ build_script:
7474
- cd c:\osm2pgsql\build
7575
- >
7676
cmake .. -LA -G "NMake Makefiles" -DCMAKE_BUILD_TYPE=%build_type% -DBUILD_TESTS=ON
77-
-DLUA_INCLUDE_DIR=%LUA_INCLUDE_DIR% -DLUA_LIBRARIES=%LUA_LIBRARIES%
77+
-DLUA_INCLUDE_DIR=%LUA_INCLUDE_DIR% -DLUA_LIBRARIES=%LUA_LIBRARIES%
7878
-DGETOPT_INCLUDE_DIR=%GETOPT_INCLUDE_DIR% -DGETOPT_LIBRARY=%GETOPT_LIBRARY%
7979
-DBOOST_ROOT=%BOOST_PATH% -DBoost_USE_STATIC_LIBS=ON
8080
-DBZIP2_INCLUDE_DIR=%BZIP2_INCLUDE_DIR%
@@ -108,7 +108,7 @@ before_test:
108108
- |
109109
psql -c "CREATE TABLESPACE tablespacetest LOCATION 'c:/temp'"
110110
- set PATH=c:\osm2pgsql\build\osm2pgsql-bin;%PATH%
111-
- set PROJ_LIB=%conda_library_path%\share
111+
- set PROJ_LIB=%conda_library_path%\share\proj
112112

113113
test_script:
114114
- cd c:\osm2pgsql\build

0 commit comments

Comments
 (0)