.clang-format

+---
+Language:        Cpp
+AccessModifierOffset: -2
+AlignAfterOpenBracket: Align
+AlignConsecutiveAssignments: false
+AlignConsecutiveDeclarations: false
+AlignEscapedNewlines: DontAlign
+AlignOperands:   true
+AlignTrailingComments: true
+AllowAllParametersOfDeclarationOnNextLine: false
+AllowShortBlocksOnASingleLine: true
+AllowShortCaseLabelsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: Inline
+AllowShortIfStatementsOnASingleLine: false
+AllowShortLoopsOnASingleLine: false
+AlwaysBreakAfterDefinitionReturnType: None
+AlwaysBreakAfterReturnType: TopLevelDefinitions
+AlwaysBreakBeforeMultilineStrings: true
+AlwaysBreakTemplateDeclarations: false
+BinPackArguments: false
+BinPackParameters: false
+BraceWrapping:
+  AfterClass:      false
+  AfterControlStatement: true
+  AfterEnum:       true
+  AfterFunction:   true
+  AfterNamespace:  false
+  AfterObjCDeclaration: false
+  AfterStruct:     false
+  AfterUnion:      false
+  AfterExternBlock: false
+  BeforeCatch:     true
+  BeforeElse:      true
+  IndentBraces:    false
+  SplitEmptyFunction: false
+  SplitEmptyRecord: false
+  SplitEmptyNamespace: false
+BreakBeforeBinaryOperators: None
+BreakBeforeBraces: Custom
+BreakBeforeInheritanceComma: false
+BreakBeforeTernaryOperators: true
+BreakConstructorInitializersBeforeComma: false
+BreakConstructorInitializers: BeforeColon
+BreakAfterJavaFieldAnnotations: false
+BreakStringLiterals: false
+ColumnLimit:    120
+CommentPragmas:  '^ IWYU pragma:'
+CompactNamespaces: false
+ConstructorInitializerAllOnOneLineOrOnePerLine: false
+ConstructorInitializerIndentWidth: 4
+ContinuationIndentWidth: 4
+Cpp11BracedListStyle: true
+DerivePointerAlignment: false
+DisableFormat:   false
+ExperimentalAutoDetectBinPacking: false
+FixNamespaceComments: true
+ForEachMacros:   
+  - foreach
+  - Q_FOREACH
+  - BOOST_FOREACH
+IncludeBlocks:   Preserve
+IncludeCategories: 
+  - Regex:           '^"(llvm|llvm-c|clang|clang-c)/'
+    Priority:        2
+  - Regex:           '^(<|"(gtest|gmock|isl|json)/)'
+    Priority:        3
+  - Regex:           '.*'
+    Priority:        1
+IncludeIsMainRegex: '(Test)?$'
+IndentCaseLabels: false
+IndentPPDirectives: None
+IndentWidth:     8
+IndentWrappedFunctionNames: false
+JavaScriptQuotes: Leave
+JavaScriptWrapImports: true
+KeepEmptyLinesAtTheStartOfBlocks: true
+MacroBlockBegin: ''
+MacroBlockEnd:   ''
+MaxEmptyLinesToKeep: 1
+NamespaceIndentation: None
+ObjCBlockIndentWidth: 2
+ObjCSpaceAfterProperty: false
+ObjCSpaceBeforeProtocolList: true
+PenaltyBreakAssignment: 2
+PenaltyBreakBeforeFirstCallParameter: 19
+PenaltyBreakComment: 300
+PenaltyBreakFirstLessLess: 120
+PenaltyBreakString: 1000
+PenaltyExcessCharacter: 1000000
+PenaltyReturnTypeOnItsOwnLine: 60
+PointerAlignment: Right
+ReflowComments:  true
+SortIncludes:    false
+SortUsingDeclarations: true
+SpaceAfterCStyleCast: false
+SpaceAfterTemplateKeyword: true
+SpaceBeforeAssignmentOperators: true
+SpaceBeforeParens: ControlStatements
+SpaceInEmptyParentheses: false
+SpacesBeforeTrailingComments: 1
+SpacesInAngles:  false
+SpacesInContainerLiterals: true
+SpacesInCStyleCastParentheses: false
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+Standard:        Cpp11
+TabWidth:        8
+UseTab:          ForContinuationAndIndentation
+...
+

.drone-1.0.yml

@@ -5,71 +5,30 @@
 # See https://git.osgeo.org/gitea/postgis/postgis-docker
 # todo: add docker images from https://hub.docker.com/r/postgis/postgis-build-env/tags/
 test-image: &test-image docker.kbt.io/postgis/build-test:trisquel2
+clone: &clone
+    image: plugins/git
+    depth: 20
+    recursive: false
+
 kind: pipeline
-name: pg-9.5
+name: build
+clone: *clone
 steps:
-  - name: build
+  - name: build-9.5
     image: *test-image
-    pull: true
+    pull: always
     commands:
-      - export PGVER=9.5
-      - service postgresql start $PGVER
-      - export PGPORT=`grep ^port /etc/postgresql/$PGVER/main/postgresql.conf | awk '{print $3}'`
-      - export PATH=/usr/lib/postgresql/$PGVER/bin:$PATH
-      - psql --version
-      - ./autogen.sh
-      - ./configure CFLAGS="-O0 -Wall -fno-omit-frame-pointer -Werror" --without-interrupt-tests
-      - make -j
-      # we should maybe wait for postgresql service to startup here...
-      - psql -c "select version()" template1
-      - make check RUNTESTFLAGS=-v
-      - make install
-      - utils/check_all_upgrades.sh
-        `grep '^POSTGIS_' Version.config | cut -d= -f2 | paste -sd '.'`
----
-test-image: &test-image docker.kbt.io/postgis/build-test:trisquel2
-kind: pipeline
-name: pg-9.6
-steps:
-  - name: build
+      - PGVER=9.5 sh ci/dronie/postgis_regress.sh
+
+  - name: build-9.6
     image: *test-image
-    pull: true
+    pull: always
     commands:
-      - export PGVER=9.6
-      - service postgresql start $PGVER
-      - export PGPORT=`grep ^port /etc/postgresql/$PGVER/main/postgresql.conf | awk '{print $3}'`
-      - export PATH=/usr/lib/postgresql/$PGVER/bin:$PATH
-      - psql --version
-      - ./autogen.sh
-      - ./configure CFLAGS="-O0 -Wall -fno-omit-frame-pointer -Werror" --without-interrupt-tests
-      - make -j
-      # we should maybe wait for postgresql service to startup here...
-      - psql -c "select version()" template1
-      - make check RUNTESTFLAGS=-v
-      - make install
-      - utils/check_all_upgrades.sh
-        `grep '^POSTGIS_' Version.config | cut -d= -f2 | paste -sd '.'`
----
-test-image: &test-image docker.kbt.io/postgis/build-test:trisquel2
-kind: pipeline
-name: pg-10
-steps:
-  - name: build
+      - PGVER=9.6 sh ci/dronie/postgis_regress.sh
+
+  - name: build-10
     image: *test-image
-    pull: true
+    pull: always
     commands:
-      - export PGVER=10
-      - service postgresql start $PGVER
-      - export PGPORT=`grep ^port /etc/postgresql/$PGVER/main/postgresql.conf | awk '{print $3}'`
-      - export PATH=/usr/lib/postgresql/$PGVER/bin:$PATH
-      - psql --version
-      - ./autogen.sh
-      - ./configure CFLAGS="-O0 -Wall -fno-omit-frame-pointer -Werror" --without-interrupt-tests
-      - make -j
-      # we should maybe wait for postgresql service to startup here...
-      - psql -c "select version()" template1
-      - make check RUNTESTFLAGS=-v
-      - make install
-      - utils/check_all_upgrades.sh
-        `grep '^POSTGIS_' Version.config | cut -d= -f2 | paste -sd '.'`
+      - PGVER=10 sh ci/dronie/postgis_regress.sh
 ...

.drone.yml

-# See http://readme.drone.io/0.5/usage/overview
-
-# See https://git.osgeo.org/gogs/postgis/postgis-docker
-test-image: &test-image docker.kbt.io/postgis/build-test:trisquel2
-
-matrix:
-  PGVER:
-    - 9.4
-    - 9.5
-    - 9.6
-    - 10
-
-pipeline:
-  clone:
-    image: plugins/git
-    depth: 20
-    recursive: false
-  build:
-    image: *test-image
-    pull: true
-    commands:
-      - service postgresql start $PGVER
-      - export PGPORT=`grep ^port /etc/postgresql/$PGVER/main/postgresql.conf | awk '{print $3}'`
-      - export PATH=/usr/lib/postgresql/$PGVER/bin:$PATH
-      - psql --version
-      - ./autogen.sh
-      - ./configure CFLAGS="-O0 -Wall -fno-omit-frame-pointer -Werror" --without-interrupt-tests
-      - make
-      # we should maybe wait for postgresql service to startup here...
-      - psql -c "select version()" template1
-      - make check RUNTESTFLAGS=-v
-      - make install
-      - utils/check_all_upgrades.sh
-        `grep '^POSTGIS_' Version.config | cut -d= -f2 | paste -sd '.'`

.editorconfig

@@ -14,13 +14,18 @@ insert_final_newline = true
 trim_trailing_whitespace = false
 
 # C files want tab indentation
-[*.{c,h}]
+[*.{c,h,h.in}]
 indent_style = tab
 
 # Perl files want tab indentation
 [*.pl]
 indent_style = tab
 
+# Exception: utils/postgis_proc_upgrade.pl uses 4-spaces indent
+[utils/postgis_proc_upgrade.pl]
+indent_style = space
+indent_size = 4
+
 # SQL files want tab indentation
 [*.{sql,sql.in}]
 indent_style = tab

.github/codecov.yml

@@ -7,3 +7,5 @@ coverage:
             default:
                 threshold: 0.2%
 comment: false
+ignore:
+  - "deps/wagyu/include/**/*" # Ignore wagyu library files

.github/codecov_env.bash

+#!/usr/bin/env bash
+
+# Apache License Version 2.0, January 2004
+# https://github.com/codecov/codecov-bash/blob/master/LICENSE
+
+set -e +o pipefail
+
+VERSION="0b37652"
+
+add(){
+  if [ ! -z "$1" ];
+  then
+    echo -n "-e $1 "
+  fi
+}
+
+add "CODECOV_ENV"
+add "CODECOV_TOKEN"
+add "CODECOV_URL"
+add "CODECOV_SLUG"
+add "VCS_COMMIT_ID"
+add "VCS_BRANCH_NAME"
+add "VCS_PULL_REQUEST"
+add "VCS_SLUG"
+add "VCS_TAG"
+add "CI_BUILD_URL"
+add "CI_BUILD_ID"
+add "CI_JOB_ID"
+
+if [ "$JENKINS_URL" != "" ];
+then
+  add "JENKINS_URL"
+  add "ghprbSourceBranch"
+  add "GIT_BRANCH"
+  add "ghprbActualCommit"
+  add "GIT_COMMIT"
+  add "CHANGE_ID"
+  add "BRANCH_NAME"
+  add "BUILD_NUMBER"
+  add "ghprbPullId"
+  add "BUILD_URL"
+
+elif [ "$CI" = "true" ] && [ "$TRAVIS" = "true" ] && [ "$SHIPPABLE" != "true" ];
+then
+  add "CI"
+  add "TRAVIS"
+  add "SHIPPABLE"
+  add "TRAVIS_BRANCH"
+  add "TRAVIS_COMMIT"
+  add "TRAVIS_JOB_NUMBER"
+  add "TRAVIS_PULL_REQUEST"
+  add "TRAVIS_JOB_ID"
+  add "TRAVIS_REPO_SLUG"
+  add "TRAVIS_TAG"
+  add "TRAVIS_OS_NAME"
+
+elif [ "$CI" = "true" ] && [ "$CI_NAME" = "codeship" ];
+then
+  add "CI"
+  add "CI_NAME"
+  add "CI_BRANCH"
+  add "CI_BUILD_NUMBER"
+  add "CI_BUILD_URL"
+  add "CI_COMMIT_ID"
+
+elif [ "$TEAMCITY_VERSION" != "" ];
+then
+  add "TEAMCITY_VERSION"
+  add "TEAMCITY_BUILD_BRANCH"
+  add "TEAMCITY_BUILD_ID"
+  add "TEAMCITY_BUILD_URL"
+  add "TEAMCITY_BUILD_COMMIT"
+  add "TEAMCITY_BUILD_COMMIT"
+  add "BUILD_VCS_NUMBER"
+  add "TEAMCITY_BUILD_REPOSITORY"
+
+elif [ "$CI" = "true" ] && [ "$CIRCLECI" = "true" ];
+then
+  add "CI"
+  add "CIRCLECI"
+  add "CIRCLE_BRANCH"
+  add "CIRCLE_BUILD_NUM"
+  add "CIRCLE_NODE_INDEX"
+  add "CIRCLE_PROJECT_USERNAME"
+  add "CIRCLE_PROJECT_REPONAME"
+  add "CIRCLE_REPOSITORY_URL"
+  add "CIRCLE_PR_NUMBER"
+  add "CIRCLE_SHA1"
+  add "CIRCLE_ARTIFACTS"
+  add "CIRCLE_TEST_REPORTS"
+
+elif [ "$BUDDYBUILD_BRANCH" != "" ];
+then
+  add "BUDDYBUILD_BRANCH"
+  add "BUDDYBUILD_BUILD_NUMBER"
+  add "BUDDYBUILD_BUILD_ID"
+  add "BUDDYBUILD_APP_ID"
+
+elif [ "${bamboo_planRepository_revision}" != "" ];
+then
+  add "bamboo_planRepository_revision"
+  add "bamboo_planRepository_branch"
+  add "bamboo_buildNumber"
+  add "bamboo_buildResultsUrl"
+  add "bamboo_planRepository_repositoryUrl"
+
+elif [ "$CI" = "true" ] && [ "$BITRISE_IO" = "true" ];
+then
+  add "CI"
+  add "BITRISE_IO"
+  add "BITRISE_GIT_BRANCH"
+  add "BITRISE_BUILD_NUMBER"
+  add "BITRISE_BUILD_URL"
+  add "BITRISE_PULL_REQUEST"
+  add "BITRISE_GIT_COMMIT"
+
+elif [ "$CI" = "true" ] && [ "$SEMAPHORE" = "true" ];
+then
+  add "CI"
+  add "SEMAPHORE"
+  add "BRANCH_NAME"
+  add "SEMAPHORE_BUILD_NUMBER"
+  add "SEMAPHORE_CURRENT_THREAD"
+  add "PULL_REQUEST_NUMBER"
+  add "SEMAPHORE_REPO_SLUG"
+  add "REVISION"
+  add "SEMAPHORE_TRIGGER_SOURCE"
+
+elif [ "$CI" = "true" ] && [ "$BUILDKITE" = "true" ];
+then
+  add "CI"
+  add "BUILDKITE"
+  add "BUILDKITE_BRANCH"
+  add "BUILDKITE_BUILD_NUMBER"
+  add "BUILDKITE_JOB_ID"
+  add "BUILDKITE_BUILD_URL"
+  add "BUILDKITE_PROJECT_SLUG"
+  add "BUILDKITE_COMMIT"
+
+elif [ "$CI" = "drone" ];
+then
+  add "CI"
+  add "DRONE_BRANCH"
+  add "DRONE_BUILD_NUMBER"
+  add "DRONE_BUILD_LINK"
+  add "DRONE_PULL_REQUEST"
+  add "DRONE_JOB_NUMBER"
+  add "DRONE_TAG"
+  add "CI_BUILD_URL"
+
+elif [ "$HEROKU_TEST_RUN_BRANCH" != "" ];
+then
+  add "HEROKU_TEST_RUN_BRANCH"
+  add "HEROKU_TEST_RUN_ID"
+
+elif [ "$CI" = "True" ] && [ "$APPVEYOR" = "True" ];
+then
+  add "CI"
+  add "APPVEYOR"
+  add "APPVEYOR_REPO_BRANCH"
+  add "APPVEYOR_JOB_ID"
+  add "APPVEYOR_PULL_REQUEST_NUMBER"
+  add "APPVEYOR_ACCOUNT_NAME"
+  add "APPVEYOR_PROJECT_SLUG"
+  add "APPVEYOR_BUILD_VERSION"
+  add "APPVEYOR_REPO_NAME"
+  add "APPVEYOR_REPO_COMMIT"
+
+elif [ "$CI" = "true" ] && [ "$WERCKER_GIT_BRANCH" != "" ];
+then
+  add "CI"
+  add "WERCKER_GIT_BRANCH"
+  add "WERCKER_MAIN_PIPELINE_STARTED"
+  add "WERCKER_GIT_OWNER"
+  add "WERCKER_GIT_REPOSITORY"
+  add "WERCKER_GIT_COMMIT"
+
+elif [ "$CI" = "true" ] && [ "$MAGNUM" = "true" ];
+then
+  add "CI"
+  add "MAGNUM"
+  add "CI_BRANCH"
+  add "CI_BUILD_NUMBER"
+  add "CI_COMMIT"
+
+elif [ "$SHIPPABLE" = "true" ];
+then
+  add "SHIPPABLE"
+  add "HEAD_BRANCH"
+  add "BRANCH"
+  add "BUILD_NUMBER"
+  add "BUILD_URL"
+  add "PULL_REQUEST"
+  add "REPO_FULL_NAME"
+  add "COMMIT"
+
+elif [ "$TDDIUM" != "" ];
+then
+  add "TDDIUM"
+  add "TDDIUM_CURRENT_COMMIT"
+  add "TDDIUM_CURRENT_BRANCH"
+  add "TDDIUM_TID"
+  add "TDDIUM_PR_ID"
+
+elif [ "$GREENHOUSE" = "true" ];
+then
+  add "GREENHOUSE"
+  add "GREENHOUSE_BRANCH"
+  add "GREENHOUSE_BUILD_NUMBER"
+  add "GREENHOUSE_BUILD_URL"
+  add "GREENHOUSE_PULL_REQUES"
+  add "GREENHOUSE_COMMIT"
+  add "GREENHOUSE_EXPORT_DIR"
+
+elif [ "$GITLAB_CI" != "" ];
+then
+  add "GITLAB_CI"
+  add "CI_BUILD_REF_NAME"
+  add "CI_BUILD_ID"
+  add "CI_BUILD_REPO"
+  add "CI_BUILD_REF"
+
+fi

.gitignore

@@ -24,6 +24,7 @@ de9i*.png
 doc/html/image_src/generator
 doc/html/image_src/Makefile
 doc/html/*.html
+doc/html/docbook.css
 doc/Makefile
 doc/Makefile.comments
 doc/po/*/*.xml
@@ -53,6 +54,9 @@ extensions/postgis/Makefile
 extensions/postgis/postgis.control
 extensions/postgis/sql/
 extensions/postgis/sql_bits/*.sql
+extensions/postgis_raster/Makefile
+extensions/postgis_raster/postgis_raster.control
+extensions/postgis_raster/sql/
 extensions/postgis_sfcgal/Makefile
 extensions/postgis_sfcgal/postgis_sfcgal.control
 extensions/postgis_sfcgal/sql/
@@ -106,9 +110,9 @@ postgis/legacy.sql
 postgis/postgis.sql
 postgis/postgis_proc_set_search_path.sql
 postgis/postgis_for_extension.sql
+postgis/postgis_upgrade.sql*
 postgis/postgis_upgrade_for_extension.sql
 postgis/postgis_upgrade_for_extension.sql.in
-postgis/postgis_upgrade.sql*
 postgis/sfcgal_upgrade.sql*
 postgis/sqldefines.h
 postgis/uninstall_legacy.sql
@@ -125,10 +129,10 @@ raster/rt_pg/rtpostgis.sql
 raster/rt_pg/rtpostgis_drop.sql
 raster/rt_pg/rtpostgis_legacy.sql
 raster/rt_pg/rtpostgis_proc_set_search_path.sql
-raster/rt_pg/rtpostgis_upgrade.sql.in
 raster/rt_pg/rtpostgis_for_extension.sql
-raster/rt_pg/rtpostgis_upgrade_for_extension.sql.in
+raster/rt_pg/rtpostgis_upgrade.sql.in
 raster/rt_pg/rtpostgis_upgrade*.sql
+raster/rt_pg/rtpostgis_upgrade_for_extension.sql.in
 raster/rt_pg/uninstall_rtpostgis.sql
 raster/scripts/Makefile
 raster/scripts/python/Makefile
@@ -140,8 +144,11 @@ raster/test/cunit/cu_tester
 raster/test/Makefile
 raster/test/regress/Makefile
 raster/test/regress/rtpostgis.sql
+raster/test/regress/loader/TiledAutoSkipNoData.tif
 regress/00-regress-install/
 regress/Makefile
+regress/core/Makefile
+regress/sfcgal/Makefile
 regress/postgis.sql
 regress/postgis_garden_result.txt
 regress/raster_garden_result.txt
@@ -177,3 +184,6 @@ postgis/uninstall_sfcgal.sql
 # LLVM JIT
 *.bc
 *.ll
+
+deps/Makefile
+deps/wagyu/Makefile

.gitlab-ci.yml

-image: debian:stretch
 test:
+  image: debian:buster
   script:
     - apt-get update -qq && apt-get install -y
-        postgresql-9.6 postgresql-server-dev-9.6
+        bison flex
+        postgresql-11 postgresql-server-dev-11
         build-essential autoconf libtool libcunit1-dev
         xsltproc docbook-xsl docbook-mathml dblatex
         libproj-dev libgdal-dev libgeos-dev libjson-c-dev
@@ -11,10 +12,13 @@ test:
     - service postgresql start
     - su -l postgres -c "createuser -s `whoami`"
     - ./autogen.sh
+    - ./configure
+    - make maintainer-clean
+    - ./autogen.sh
     - ./configure CFLAGS="-Wall -fno-omit-frame-pointer -Werror"
     - make
-    - make check RUNTESTFLAGS=-v
-    - make check RUNTESTFLAGS="-v --dumprestore"
+    - RUNTESTFLAGS=-v make check
+    - RUNTESTFLAGS="-v --dumprestore" make check
     - make install
-    - make installcheck RUNTESTFLAGS=-v
-    - make installcheck RUNTESTFLAGS="-v --dumprestore"
+    - RUNTESTFLAGS=-v make installcheck
+    - RUNTESTFLAGS="-v --dumprestore" make installcheck

.mailmap

+Sandro Santilli <strk@kbt.io> <strk@keybit.net>
+Bborie Park <dustymugs@gmail.com> <dustymugs at gmail.com>
+Bborie Park <dustymugs@gmail.com> <bkpark at ucdavis.edu>

.travis.yml

-env:
-  matrix:
-    - CFLAGS="-g -Og" MATRIX_EVAL="touch check-no-trailing-blanks"
-    - CFLAGS="-g -O2 -fstack-protector -Wformat -Werror=format-security" LDFLAGS="-Wl,-Bsymbolic-functions -Wl,-z,relro"
-    - CFLAGS="-g -O3 -mtune=generic -fno-omit-frame-pointer -Werror -Wall -Wextra -Wno-unused-parameter"
-    - CFLAGS="-g -O0 --coverage -fprofile-arcs -ftest-coverage" LDFLAGS="--coverage -fprofile-arcs -ftest-coverage" CONFIGURE_FLAGS="--enable-debug"
-
-addons:
-  postgresql: "9.6"
-
-before_install:
-  - eval "${MATRIX_EVAL}"
-  - curl -sSfL https://github.com/mapbox/logbt/archive/v2.0.3.tar.gz | sudo tar --gunzip --extract --strip-components=1 --exclude="*md" --exclude="test*" --directory=/usr/local
-  - curl -sSfL https://raw.githubusercontent.com/mapbox/logbt/30c554dd37b6c96c23fc424f75910fc6d6696f00/bin/logbt | sudo tee /usr/local/bin/logbt > /dev/null
-  - sudo logbt --setup
-  - sudo service postgresql stop 9.6
-  - sudo chown -hRL --from=postgres travis:travis /etc /var /tmp
-  - sudo usermod -u 1000 postgres
-  - sudo adduser travis ssl-cert
-  - sudo service postgresql start 9.6
-  - sudo add-apt-repository --yes ppa:ubuntugis/ppa
-  - sudo add-apt-repository --yes ppa:ubuntugis/ubuntugis-unstable
-  - sudo apt-get update -qq
-  - mkdir -p /home/travis/deb && touch /home/travis/deb/__ && sudo cp -n /home/travis/deb/* /var/cache/apt/archives || true
-  - sudo apt-get install -y --allow-unauthenticated --no-install-recommends --no-install-suggests libsfcgal1 libsfcgal-dev postgresql-server-dev-9.6 libxml2-utils libcunit1-dev xsltproc docbook-xsl docbook-mathml dblatex libgeos-dev libjson0-dev libgdal-dev gdb libc6-dbg
-  - sudo sh -c "echo deb http://archive.ubuntu.com/ubuntu/ bionic main restricted universe multiverse >> /etc/apt/sources.list"
-  - sudo apt-get update -qq
-  - sudo apt-get install -y --allow-unauthenticated --no-install-recommends --no-install-suggests binutils libproj-dev libprotobuf-c-dev protobuf-c-compiler
-  - cp -n /var/cache/apt/archives/* /home/travis/deb || true
-  - ls -la /home/travis/deb/
-  - sudo ldconfig
-  - ./autogen.sh
-
-after_failure:
-  - sudo head -n1000 /var/log/postgresql/postgresql-9.6-main.log
-
-after_success:
-  - bash .github/codecov.bash
+services:
+  - docker
 
 language: c
 
-compiler: gcc
-
-dist: xenial
+env:
+  # Use the last stable release to run more tests
+  - tag=pg12-geos37-gdal30-proj611 mode=garden
+  - tag=pg12-geos37-gdal30-proj611 mode=tests
+  - tag=pg12-geos37-gdal30-proj611 mode=debug
+  - tag=pg12-geos37-gdal30-proj611 mode=coverage
+  - tag=pg12-geos37-gdal30-proj611 mode=usan_gcc
+  - tag=pg12-clang-geos37-gdal30-proj611 mode=usan_clang
+  - tag=pg12-geos37-gdal30-proj611 mode=nowagyu
+
+  # Run tests with different dependecy combinations
+  - tag=latest mode=tests
+  - tag=pg11-geos37-gdal24-proj52 mode=tests
+  - tag=pg10-geos36-gdal23-proj49 mode=tests
+  - tag=pg96-geos36-gdal22-proj49 mode=tests
+  - tag=pg95-geos36-gdal21-proj48 mode=tests
 
-cache:
-  ccache: true
-  directories:
-    - /home/travis/deb
+matrix:
+  allow_failures:
+    - env: tag=latest mode=tests
+  include:
+    - name: "Lint: python3 -m flake8 . --select=E9,F63,F72,F82"
+      language: python
+      script:
+        - pip install flake8  # lint Python code for syntax errors
+        - flake8 . --count --select=E9,F63,F72,F82 --show-source --statistics
 
 script:
-  - ./configure CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" $CONFIGURE_FLAGS || cat config.log
-  - make -j
-  - chmod 755 /home/travis
-  - logbt -- make check "RUNTESTFLAGS=--verbose"
-  - logbt -- make check "RUNTESTFLAGS='--dumprestore --verbose'"
-  - sudo make install
-  - logbt -- make installcheck "RUNTESTFLAGS=--verbose"
-  - logbt -- make installcheck "RUNTESTFLAGS=--dumprestore --verbose"
+  - echo "/tmp/logbt-coredumps/core.%p.%E" | sudo tee /proc/sys/kernel/core_pattern
+  - echo "FROM postgis/postgis-build-env:${tag}" > Dockerfile
+  - echo "ADD --chown=postgres:postgres . /src/postgis" >> Dockerfile
+  - echo "CMD bash ci/travis/run_${mode}.sh" >> Dockerfile
+  - docker build -t pgtest .
+  - ci_env=`bash .github/codecov_env.bash`
+  - docker run $ci_env --name pgtest-${TRAVIS_BUILD_NUMBER} pgtest
+
+after_success:
+  - docker rm pgtest-${TRAVIS_BUILD_NUMBER}
 
 notifications:
   email: false

GNUmakefile.in

@@ -6,13 +6,17 @@
 
 SUBDIRS = liblwgeom
 ifeq (@LIBLWGEOM_ONLY@,no)
-SUBDIRS += libpgcommon postgis regress @RASTER@ @TOPOLOGY@ loader utils doc @EXTENSIONS@
+SUBDIRS += libpgcommon postgis regress @RASTER@ @TOPOLOGY@ loader utils doc @EXTENSIONS@ @DEPS_SUBDIR@
 endif
 
+POSTGIS_MAJOR_VERSION=@POSTGIS_MAJOR_VERSION@
+POSTGIS_MINOR_VERSION=@POSTGIS_MINOR_VERSION@
+POSTGIS_MICRO_VERSION=@POSTGIS_MICRO_VERSION@
+
 PERL = @PERL@
 
 # todo: add more rules here, like uninstall, clean...
-all install uninstall noop clean distclean check:
+all install uninstall noop clean distclean check-unit check-regress:
 	for s in $(SUBDIRS); do \
 		echo "---- Making $@ in $${s}"; \
 		$(MAKE) -C $${s} $@ || exit 1; \
@@ -35,18 +39,39 @@ clean-local:
 # TODO: drop 'test' target..
 test: check
 
-check: all docs-check check-no-trailing-blanks
+check: check-no-trailing-blanks check-unit check-regress docs-check
+
+check-unit check-regress docs-check: all
 
 check-no-trailing-blanks:
 	! find . -name '*.c' -o -name '*.h' -o -name '*.proto' | \
 		grep -v lwin_wkt_lex.c | \
 		grep -v lwin_wkt_parse | \
+		grep -v lookup3 | \
 		grep -v vector_tile.pb-c | \
 		grep -v postgis/sqldefines.h | \
 		xargs grep -n '[[:space:]]$$'
 
-installcheck:
-	RUNTESTFLAGS="$(RUNTESTFLAGS) --extension" $(MAKE) check
+installcheck: installcheck-base installcheck-upgrade
+
+installcheck-base:
+	RUNTESTFLAGS="$(RUNTESTFLAGS) --extension" $(MAKE) check-regress
+
+# only run upgrade test if RUNTESTFLAGS was not already doing that
+installcheck-upgrade: installcheck-upgrade-byfunc
+	if test -z `echo "$(RUNTESTFLAGS)" | grep -- --upgrade`; then \
+		RUNTESTFLAGS="$(RUNTESTFLAGS) --extension \
+			--upgrade-path unpackaged--$(POSTGIS_MAJOR_VERSION).$(POSTGIS_MINOR_VERSION).$(POSTGIS_MICRO_VERSION)" \
+			$(MAKE) check-regress; \
+	fi
+
+# only run upgrade test if RUNTESTFLAGS was not already doing that
+installcheck-upgrade-byfunc:
+	if test -z `echo "$(RUNTESTFLAGS)" | grep -- --upgrade`; then \
+		RUNTESTFLAGS="$(RUNTESTFLAGS) --extension \
+			--upgrade-path unpackaged--$(POSTGIS_MAJOR_VERSION).$(POSTGIS_MINOR_VERSION).$(POSTGIS_MICRO_VERSION)!" \
+			$(MAKE) check-regress; \
+	fi
 
 distclean: distclean-local
 

README.md

 Debbie:
-   [![Build Status](https://debbie.postgis.net/buildStatus/icon?job=PostGIS_2.5)](https://debbie.postgis.net/view/PostGIS/job/PostGIS_2.5/)
+   [![Build Status](https://debbie.postgis.net/buildStatus/icon?job=PostGIS_3.0)](https://debbie.postgis.net/view/PostGIS/job/PostGIS_3.0/)
 Winnie:
- [![Build Status](https://debbie.postgis.net:444/buildStatus/icon?job=PostGIS_2.5)](https://debbie.postgis.net:444/view/PostGIS/job/PostGIS_2.5/)
+ [![Build Status](https://winnie.postgis.net:444/buildStatus/icon?job=PostGIS_3.0)](https://winnie.postgis.net:444/view/PostGIS/job/PostGIS_3.0/)
 Dronie:
- [![Build Status](https://dronie.osgeo.org/api/badges/postgis/postgis/status.svg?ref=refs/heads/svn-2.5)](https://dronie.osgeo.org/postgis/postgis?branch=svn-2.5)
+ [![Build Status](https://dronie.osgeo.org/api/badges/postgis/postgis/status.svg?branch=svn-3.0)](https://dronie.osgeo.org/postgis/postgis?branch=svn-3.0)
+ 
 Travis:
- [![Build Status](https://secure.travis-ci.org/postgis/postgis.svg)](http://travis-ci.org/postgis/postgis)
+ [![Build Status](https://api.travis-ci.org/postgis/postgis.svg?branch=svn-3.0,svn-3.0,svn-2.5,svn-2.4,svn-2.3)](http://travis-ci.org/postgis/postgis)
 GitLab-CI:
- [![Gitlab-CI](https://gitlab.com/postgis/postgis/badges/svn-2.5/build.svg)](https://gitlab.com/postgis/postgis/commits/svn-2.5)
+ [![Gitlab-CI](https://gitlab.com/postgis/postgis/badges/svn-3.0/build.svg)](https://gitlab.com/postgis/postgis/commits/svn-3.0)
+Drone.io:
+ [![Build Status](https://cloud.drone.io/api/badges/postgis/postgis/status.svg?branch=svn-3.0)](https://cloud.drone.io/postgis/postgis?branch=svn-3.0)
+
+
+Bessie:
+ [![Build Status](https://debbie.postgis.net/buildStatus/icon?job=PostGIS_Worker_Run%2Flabel%3Dbessie)](https://debbie.postgis.net/view/PostGIS/job/PostGIS_Worker_Run/label=bessie/) 
+Bessie32:
+ [![Build Status](https://debbie.postgis.net/buildStatus/icon?job=PostGIS_Worker_Run%2Flabel%3Dbessie32)](https://debbie.postgis.net/view/PostGIS/job/PostGIS_Worker_Run/label=bessie32/) 
+Berrie:
+ [![Build Status](https://debbie.postgis.net/buildStatus/icon?job=PostGIS_Worker_Run%2Flabel%3Dberrie)](https://debbie.postgis.net/view/PostGIS/job/PostGIS_Worker_Run/label=berrie/)
+
 
 This file is here to play nicely with modern code repository facilities.
 Actual readme is [here](README.postgis).
@@ -20,7 +32,7 @@ https://trac.osgeo.org/postgis/
 Official chat room is the #postgis channel on the
 [freenode](https://freenode.net) network.
 
-To partecipate, point your preferred
+To participate, point your preferred
 [IRC client](https://en.wikipedia.org/wiki/Comparison_of_Internet_Relay_Chat_clients)
 to:
 

README.postgis

 PostGIS - Geographic Information Systems Extensions to PostgreSQL
 =================================================================
 
-:Version: 2.5.2
-:Date: 2019-03-11
-:Website: http://postgis.net
+:Version: 3.0.0
+:Date: 2019-10-20
+:Website: https://postgis.net
 
 This distribution contains a module which implements GIS simple features, ties
 the features to R-tree indexing, and provides many spatial functions for
@@ -12,10 +12,12 @@ accessing and analyzing geographic data.
 Directory structure::
 
   ./            Build scripts and install directions
+  ./deps        Extra dependencies
   ./doc         PostGIS Documentation
   ./extensions  Support for the PostgreSQL Extensions framework
   ./extras      Various pieces that didn't belong to mainstream
-                (package management specfiles, WFS_locks, sample WKB parser)
+                (package management specfiles, WFS_locks
+                  , sample WKB parser, postgis_tiger_geocoder)
   ./liblwgeom   LWGEOM geometry library
   ./libpgcommon PostGIS library to bridge LWGEOM to PostgreSQL
   ./loader      A program to convert ESRI Shape files into SQL text suitable
@@ -31,7 +33,7 @@ Directory structure::
 REQUIREMENTS
 ------------
 
-PostGIS is compatible with PostgreSQL 9.4-11.
+PostGIS is compatible with PostgreSQL 9.5 and above.
 
 You *must* have the full PostgreSQL - including server headers - installed for
 this to work.
@@ -43,8 +45,7 @@ this to work.
 
     http://trac.osgeo.org/proj/
 
-* GEOS (Required, Version 3.5 or higher)
-  - 3.6+ is strongly recommended to expose most GEOS features
+* GEOS (Required, Version 3.6 or higher)
   - 3.7+ is needed just for the ST_FrechetDistance function
 
   The GEOS library provides support for exact topological tests such as
@@ -79,10 +80,10 @@ this to work.
 * GDAL (Optional, Version 1.8.0 or higher 1.9+ is strongly recommended)
 
   GDAL (http://gdal.org) is *required* if you want to compile PostGIS
-  with raster or extension support. To compile without raster support you
-  must ``./configure --without-raster`` (also disables extension)
+  with raster support. To compile without raster support you
+  must ``./configure --without-raster``
 
-* CGAL 4.1+ and SFCGAL (Optional) needed for advanced 3D support
+* CGAL 4.1+ and SFCGAL 1.3.1+ (Optional) needed for advanced 3D support
 
   https://github.com/Oslandia/SFCGAL
 

Version.config

@@ -3,9 +3,9 @@
 
 # See HOWTO_RELEASE file in SVN for definitions of those three.
 
-POSTGIS_MAJOR_VERSION=2
-POSTGIS_MINOR_VERSION=5
-POSTGIS_MICRO_VERSION=3
+POSTGIS_MAJOR_VERSION=3
+POSTGIS_MINOR_VERSION=0
+POSTGIS_MICRO_VERSION=0
 
 # Liblwgeom interface versioning, reset to 0:0:0 (cur:age:rev)
 # when changing POSTGIS_MINOR_VERSION

aclocal.m4

@@ -45,6 +45,8 @@ esac
 ])
 
 m4_include([macros/ac_proj4_version.m4])
+m4_include([macros/ac_protobufc_version.m4])
+m4_include([macros/ax_cxx_compile_stdcxx.m4])
 m4_include([macros/gettext.m4])
 m4_include([macros/gtk-2.0.m4])
 m4_include([macros/iconv.m4])

autogen.sh

@@ -36,7 +36,7 @@ done
 AUTOCONF=`which autoconf 2>/dev/null`
 if [ ! ${AUTOCONF} ]; then
     echo "Missing autoconf!"
-    exit
+    exit 1
 fi
 AUTOCONF_VER=`${AUTOCONF} --version | ${GREP} -E "^.*[0-9]$" | ${SED} 's/^.* //'`
 
@@ -48,7 +48,7 @@ for aclocal in aclocal aclocal-1.10 aclocal-1.9; do
 done
 if [ ! ${ACLOCAL} ]; then
     echo "Missing aclocal!"
-    exit
+    exit 1
 fi
 ACLOCAL_VER=`${ACLOCAL} --version | ${GREP} -E "^.*[0-9]$" | ${SED} 's/^.* //'`
 
@@ -60,7 +60,7 @@ for libtoolize in glibtoolize libtoolize; do
 done
 if [ ! ${LIBTOOLIZE} ]; then
     echo "Missing libtoolize!"
-    exit
+    exit 1
 fi
 LIBTOOLIZE_VER=`${LIBTOOLIZE} --version | ${GREP} -E "^.*[0-9]\.[0-9]" | ${SED} 's/^.* //'`
 LIBTOOLIZE_MAJOR_VER=`echo ${LIBTOOLIZE_VER} | cut -f1 -d'.'`

build-aux/ltmain.sh

@@ -31,7 +31,7 @@
 
 PROGRAM=libtool
 PACKAGE=libtool
-VERSION="2.4.6 Debian-2.4.6-10"
+VERSION="2.4.6 Debian-2.4.6-11"
 package_revision=2.4.6
 
 
@@ -2141,7 +2141,7 @@ include the following information:
        compiler:       $LTCC
        compiler flags: $LTCFLAGS
        linker:         $LD (gnu? $with_gnu_ld)
-       version:        $progname $scriptversion Debian-2.4.6-10
+       version:        $progname $scriptversion Debian-2.4.6-11
        automake:       `($AUTOMAKE --version) 2>/dev/null |$SED 1q`
        autoconf:       `($AUTOCONF --version) 2>/dev/null |$SED 1q`