[Git][debian-gis-team/osm2pgsql][upstream] New upstream version 1.2.2+ds
Bas Couwenberg
gitlab at salsa.debian.org
Sun Jun 28 16:45:36 BST 2020
Bas Couwenberg pushed to branch upstream at Debian GIS Project / osm2pgsql
Commits:
cd005df1 by Bas Couwenberg at 2020-06-28T17:36:01+02:00
New upstream version 1.2.2+ds
- - - - -
3 changed files:
- .travis.yml
- CMakeLists.txt
- appveyor.yml
Changes:
=====================================
.travis.yml
=====================================
@@ -58,7 +58,7 @@ matrix:
dist: trusty
compiler: "clang-3.8"
env: T="clang38_pg92_dbtest" LUAJIT_OPTION="OFF"
- CXXFLAGS="-pedantic -Wextra -Werror"
+ CXXFLAGS="-pedantic -Wextra -Werror -Wno-deprecated-declarations"
CC=clang-3.8 CXX=clang++-3.8
addons: *clang38_pg92
@@ -66,28 +66,17 @@ matrix:
dist: trusty
compiler: "clang-7"
env: T="clang7_pg96_dbtest_luajit" LUAJIT_OPTION="ON"
- CXXFLAGS="-pedantic -Wextra -Werror"
+ CXXFLAGS="-pedantic -Wextra -Werror -Wno-deprecated-declarations"
CC=clang-7 CXX=clang++-7
addons: *clang7_pg96
- # ---- OSX + CLANG ---------------------------
- - os: osx
- compiler: clang
- env: T="osx_clang_NoDB" LUAJIT_OPTION="OFF" TEST_NODB=1
- CXXFLAGS="-pedantic -Wextra -Werror"
- before_install:
- - brew install lua; brew install lua
- before_script:
- - xml2-config --version
- - proj | head -n1
- - lua -v
# ---- Linux + GCC ---------------------------
- os: linux
dist: trusty
compiler: "gcc-4.8"
env: T="gcc48_pg96_dbtest" LUAJIT_OPTION="OFF"
- CXXFLAGS="-pedantic -Wextra -Werror"
+ CXXFLAGS="-pedantic -Wextra -Werror -Wno-deprecated-declarations"
CC=gcc-4.8 CXX=g++-4.8
addons: *gcc48_pg96
@@ -95,7 +84,7 @@ matrix:
dist: trusty
compiler: gcc-8
env: T="gcc8_pg96_dbtest_luajit" LUAJIT_OPTION="ON"
- CXXFLAGS="-pedantic -Wextra -Werror"
+ CXXFLAGS="-pedantic -Wextra -Werror -Wno-deprecated-declarations"
CC=gcc-8 CXX=g++-8
addons: *gcc8_pg96
=====================================
CMakeLists.txt
=====================================
@@ -1,6 +1,6 @@
set(PACKAGE osm2pgsql)
set(PACKAGE_NAME osm2pgsql)
-set(PACKAGE_VERSION 1.2.1)
+set(PACKAGE_VERSION 1.2.2)
cmake_minimum_required(VERSION 2.8.7)
=====================================
appveyor.yml
=====================================
@@ -1,6 +1,6 @@
environment:
global:
- BZIP2_VER: 1.0.6
+ BZIP2_VER: 1.0.8.0
EXPAT_VER: 2.2.5
PROJ4_VER: 4.9.3
ZLIB_VER: 1.2.11
@@ -11,6 +11,8 @@ environment:
WINGETOPT_VER: v0.95
GETOPT_INCLUDE_DIR: C:\wingetopt\src
GETOPT_LIBRARY: C:\wingetopt\build\wingetopt.lib
+ BZIP2_INCLUDE_DIR: C:\bzip2\dev
+ BZIP2_LIBRARY: C:\bzip2\dll
BOOST_PATH: C:\Libraries\boost_1_63_0
POSTGRESQL_VER: 9.6.6
TESTS_POSTGRESQL_ROOT: C:\Progra~1\PostgreSQL\9.6
@@ -33,6 +35,8 @@ clone_depth: 1
init:
- git config --global core.autocrlf input
+ - set bz2_dll_url=https://github.com/philr/bzip2-windows/releases/download/v%BZIP2_VER%/bzip2-dll-%BZIP2_VER%-win-%arch%.zip
+ - set bz2_dev_url=https://github.com/philr/bzip2-windows/releases/download/v%BZIP2_VER%/bzip2-dev-%BZIP2_VER%-win-%arch%.zip
- if "%arch%"=="x86" (
set vcvarsall_arg=x86&&
set conda_path=C:\Miniconda36\Scripts&&
@@ -53,7 +57,11 @@ install:
- conda config --set always_yes yes
- conda create --name osm2pgsql
- activate osm2pgsql
- - conda install bzip2=%BZIP2_VER% expat=%EXPAT_VER% proj4=%PROJ4_VER% zlib=%ZLIB_VER% postgresql=%POSTGRESQL_VER%
+ - conda install expat=%EXPAT_VER% proj4=%PROJ4_VER% zlib=%ZLIB_VER% postgresql=%POSTGRESQL_VER%
+ - ps: if (!(Test-Path "C:\bzip2_dll_$env:arch.zip")){(new-object net.webclient).DownloadFile($env:bz2_dll_url, "C:\bzip2_dll_$env:arch.zip")}
+ - 7z x -y C:\bzip2_dll_%arch%.zip -o%BZIP2_LIBRARY%
+ - ps: if (!(Test-Path "C:\bzip2_dev_$env:arch.zip")){(new-object net.webclient).DownloadFile($env:bz2_dev_url, "C:\bzip2_dev_$env:arch.zip")}
+ - 7z x -y C:\bzip2_dev_%arch%.zip -o%BZIP2_INCLUDE_DIR%
- ps: if (!(Test-Path "C:\lua_$env:arch.zip")){(new-object net.webclient).DownloadFile($env:lua_url, "C:\lua_$env:arch.zip")}
- 7z x -y C:\lua_%arch%.zip -oC:\lua
- ps: if (!(Test-Path "C:\postgis.zip")){(new-object net.webclient).DownloadFile($env:POSTGIS_URL, "C:\postgis.zip")}
@@ -78,6 +86,8 @@ build_script:
-DLUA_INCLUDE_DIR=%LUA_INCLUDE_DIR% -DLUA_LIBRARIES=%LUA_LIBRARIES%
-DGETOPT_INCLUDE_DIR=%GETOPT_INCLUDE_DIR% -DGETOPT_LIBRARY=%GETOPT_LIBRARY%
-DBOOST_ROOT=%BOOST_PATH% -DBoost_USE_STATIC_LIBS=ON
+ -DBZIP2_INCLUDE_DIR=%BZIP2_INCLUDE_DIR%
+ -DBZIP2_LIBRARIES=%BZIP2_INCLUDE_DIR%\libbz2.lib
- nmake
after_build:
@@ -90,7 +100,7 @@ after_build:
- copy /y %conda_library_path%\bin\ssleay32.dll osm2pgsql-bin
- copy /y %conda_library_path%\bin\zlib.dll osm2pgsql-bin
- copy /y %conda_library_path%\bin\expat.dll osm2pgsql-bin
- - copy /y %conda_library_path%\bin\libbz2.dll osm2pgsql-bin
+ - copy /y %BZIP2_LIBRARY%\libbz2.dll osm2pgsql-bin
- copy /y %LUA_DLL% osm2pgsql-bin
- 7z a c:\osm2pgsql\osm2pgsql_%build_type%_%arch%.zip osm2pgsql-bin -tzip
@@ -114,4 +124,6 @@ artifacts:
cache:
- C:\lua_%arch%.zip -> appveyor.yml
+ - C:\bzip2_dev_%arch%.zip -> appveyor.yml
+ - C:\bzip2_dll_%arch%.zip -> appveyor.yml
- C:\postgis.zip -> appveyor.yml
View it on GitLab: https://salsa.debian.org/debian-gis-team/osm2pgsql/-/commit/cd005df1b1068cf7230d0de27b0ecf97c81de148
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/osm2pgsql/-/commit/cd005df1b1068cf7230d0de27b0ecf97c81de148
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20200628/bb57aa16/attachment-0001.html>
More information about the Pkg-grass-devel
mailing list