[postgis-tickets] [SCM] PostGIS branch master updated. 3.4.0beta1-48-ge16e1e9ac
git at osgeo.org
git at osgeo.org
Thu Jul 20 20:59:56 PDT 2023
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "PostGIS".
The branch, master has been updated
via e16e1e9ac9140aae46446d949976ef97129c6a9b (commit)
from ec00ef3d9d49a89bf727b732acfa0ebb9809d1d3 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit e16e1e9ac9140aae46446d949976ef97129c6a9b
Author: Regina Obe <lr at pcorp.us>
Date: Thu Jul 20 23:59:10 2023 -0400
WINNIE FIXES
- Fix typo in include file, should be winnie_common.sh (not .h)
- Move more shared variables to winnie_common.sh
diff --git a/ci/winnie/build_postgis.sh b/ci/winnie/build_postgis.sh
index 3ec9e8411..f0d2a7b76 100644
--- a/ci/winnie/build_postgis.sh
+++ b/ci/winnie/build_postgis.sh
@@ -1,80 +1,6 @@
#!/usr/bin/env bash
-. $(dirname $0)/winnie_common.h
-
-set -e
-if [[ "${OVERRIDE}" == '' ]] ; then
- export GEOS_VER=3.10.2
- export GDAL_VER=3.4.2
- export PROJ_VER=7.2.1
- export SFCGAL_VER=1.4.1
- export CGAL_VER=5.3
- export ICON_VER=1.16
- export ZLIB_VER=1.2.11
- export PROTOBUF_VER=3.2.0
- export PROTOBUFC_VER=1.2.1
- export JSON_VER=0.12
- export PROJSO=libproj-19.dll
-fi;
-
-export PROTOBUF_VER=3.2.0
-export PROTOBUFC_VER=1.2.1
-export JSON_VER=0.12
-export PCRE_VER=8.33
-
-if [[ "${ICON_VER}" == '' ]] ; then
- export ICON_VER=1.15
-fi;
-
-echo "ICON_VER ${ICON_VER}"
-
-#set to something even if override is on but not set
-if [[ "${ZLIB_VER}" == '' ]] ; then
- export ZLIB_VER=1.2.11
-fi;
-
-
-#set to something even if override is on but not set
-if [[ "${LIBXML_VER}" == '' ]] ; then
- export LIBXML_VER=2.7.8
-fi;
-
-#set to something even if override is on but not set
-if [[ "${CGAL_VER}" == '' ]] ; then
- export CGAL_VER=5.3
-fi;
-
-#export GDAL_VER=2.4.0
-#export PROJ_VER=5.2.0
-
-echo "ZLIB_VER $ZLIB_VER"
-echo "PROJ_VER $PROJ_VER"
-echo "LIBXML_VER $LIBXML_VER"
-echo "CGAL_VER $CGAL_VER"
-export PROJECTS=/projects
-export MINGPROJECTS=/projects
-export PATHOLD=$PATH
-
-if [ "$OS_BUILD" == "64" ] ; then
- export MINGHOST=x86_64-w64-mingw32
-else
- export MINGHOST=i686-w64-mingw32
-fi;
-
-echo PATH AFTER: $PATH
-#export PG_VER=9.2beta2
-export PGWINVER=${PG_VER}edb
-export WORKSPACE=`pwd`
-
-echo PATH BEFORE: $PATH
-
-#export PGHOST=localhost
-#export PGPORT=8442
-export PGUSER=postgres
-#export GEOS_VER=3.4.0dev
-#export GDAL_VER=1.9.1
-export PGPATH=${PROJECTS}/postgresql/rel/pg${PG_VER}w${OS_BUILD}${GCC_TYPE}
-export PGPATHEDB=${PROJECTS}/postgresql/rel/pg${PG_VER}w${OS_BUILD}${GCC_TYPE}edb
+. $(dirname $0)/winnie_common.sh
if [ -n "$SOURCE_FOLDER" ]; then
export POSTGIS_SRC=${PROJECTS}/postgis/$SOURCE_FOLDER
@@ -93,18 +19,8 @@ export POSTGIS_MICRO_VER=${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}.${POS
#export POSTGIS_SRC=${PROJECTS}/postgis/trunk
-export GDAL_DATA="${PROJECTS}/gdal/rel-${GDAL_VER}w${OS_BUILD}${GCC_TYPE}/share/gdal"
-
export RELVERDIR=postgis-pg${REL_PGVER}-binaries-${POSTGIS_MICRO_VER}w${OS_BUILD}
-export PATH="${PATHOLD}:${PGPATH}/bin:${PGPATH}/lib"
-export PATH="${PROJECTS}/xsltproc:${PROJECTS}/gtkw${OS_BUILD}${GCC_TYPE}/bin:${PROJECTS}/geos/rel-${GEOS_VER}w${OS_BUILD}${GCC_TYPE}/bin:${PROJECTS}/gdal/rel-${GDAL_VER}w${OS_BUILD}${GCC_TYPE}/bin:${PROJECTS}/rel-libiconv-${ICON_VER}w${OS_BUILD}${GCC_TYPE}/lib:${PROJECTS}/rel-libiconv-${ICON_VER}w${OS_BUILD}${GCC_TYPE}/include:${PROJECTS}/rel-libiconv-${ICON_VER}w${OS_BUILD}${GCC_TYPE}/bin:${PROJECTS}/proj/rel-${PROJ_VER}w${OS_BUILD}${GCC_TYPE}/bin:${PROJECTS}/proj/rel-proj-${PROJ_VER}w${OS_BUILD}${GCC_TYPE}/bin:${PROJECTS}/libxml/rel-libxml2-${LIBXML_VER}w${OS_BUILD}${GCC_TYPE}/bin:${PROJECTS}/zlib/rel-zlib-${ZLIB_VER}w${OS_BUILD}${GCC_TYPE}/bin:${PROJECTS}/zlib/rel-zlib-${ZLIB_VER}w${OS_BUILD}${GCC_TYPE}/lib:${PATH}"
-export PKG_CONFIG_PATH="${PROJECTS}/sqlite/rel-sqlite3w${OS_BUILD}${GCC_TYPE}/lib/pkgconfig:${PROJECTS}/zlib/rel-zlib-${ZLIB_VER}w${OS_BUILD}${GCC_TYPE}/lib:${PROJECTS}/protobuf/rel-${PROTOBUF_VER}w${OS_BUILD}${GCC_TYPE}/lib/pkgconfig:${PROJECTS}/json-c/rel-${JSON_VER}w${OS_BUILD}${GCC_TYPE}/lib/pkgconfig:${PROJECTS}/proj/rel-${PROJ_VER}w${OS_BUILD}${GCC_TYPE}/lib/pkgconfig:${PROJECTS}/proj/rel-proj-${PROJ_VER}w${OS_BUILD}${GCC_TYPE}/lib/pkgconfig:${PROJECTS}/gdal/rel-${GDAL_VER}w${OS_BUILD}${GCC_TYPE}/lib/pkgconfig:${PROJECTS}/pcre/rel-${PCRE_VER}w${OS_BUILD}${GCC_TYPE}/lib/pkgconfig:${PROJECTS}/zlib/rel-zlib-${ZLIB_VER}w${OS_BUILD}${GCC_TYPE}/lib/pkgconfig::${PROJECTS}/gtkw${OS_BUILD}${GCC_TYPE}/lib/pkgconfig"
-export SHLIB_LINK="-static-libstdc++ -lstdc++ -Wl,-Bdynamic -lm"
-CPPFLAGS="-I${PGPATH}/include -I${PROJECTS}/rel-libiconv-${ICON_VER}w${OS_BUILD}${GCC_TYPE}/include"
-
-#add protobuf
-export PATH="${PROJECTS}/protobuf/rel-${PROTOBUF_VER}w${OS_BUILD}${GCC_TYPE}/bin:${PROJECTS}/protobuf/rel-${PROTOBUF_VER}w${OS_BUILD}${GCC_TYPE}/lib:${PATH}"
echo PATH AFTER: $PATH
diff --git a/ci/winnie/package_postgis.sh b/ci/winnie/package_postgis.sh
index 5b6faf08a..7cd652347 100644
--- a/ci/winnie/package_postgis.sh
+++ b/ci/winnie/package_postgis.sh
@@ -4,94 +4,13 @@
## and are passed in by the jenkins job process
###
-. $(dirname $0)/winnie_common.h
+. $(dirname $0)/winnie_common.sh
-#export OS_BUILD=64
-#export PGPORT=8442
-
-#export OS_BUILD=32
-
-#export GCC_TYPE=
-#if no override is set - use these values
-#otherwise use the ones jenkins passes thru
-#!/usr/bin/env bash
-if [[ "${OVERRIDE}" == '' ]] ; then
- export GEOS_VER=3.10.3
- export GDAL_VER=3.4.2
- export PROJ_VER=7.2.1
- export SFCGAL_VER=1.4.1
- export CGAL_VER=5.3
- export ICON_VER=1.16
- export ZLIB_VER=1.2.11
- export PROTOBUF_VER=3.2.0
- export PROTOBUFC_VER=1.2.1
- export JSON_VER=0.12
- export PROJSO=libproj-19.dll
- export CURL_VER=7.73
-fi;
-
-
-export PROTOBUF_VER=3.2.0
-export PROTOBUFC_VER=1.2.1
-export JSON_VER=0.12
-export PCRE_VER=8.33
-
-if [[ "${ICON_VER}" == '' ]] ; then
- export ICON_VER=1.15
-fi;
-
-echo "ICON_VER ${ICON_VER}"
-
-if [[ "${CURL_VER}" == '' ]] ; then
- export CURL_VER=7.73
-fi;
-
-echo "CURL_VER ${CURL_VER}"
-
-#set to something even if override is on but not set
-if [[ "${ZLIB_VER}" == '' ]] ; then
- export ZLIB_VER=1.2.11
-fi;
-
-
-#set to something even if override is on but not set
-if [[ "${LIBXML_VER}" == '' ]] ; then
- export LIBXML_VER=2.9.9
-fi;
-
-#set to something even if override is on but not set
-if [[ "${CGAL_VER}" == '' ]] ; then
- export CGAL_VER=5.3
-fi;
-
-echo "ZLIB_VER $ZLIB_VER"
-echo "PROJ_VER $PROJ_VER"
-echo "LIBXML_VER $LIBXML_VER"
-echo "CGAL_VER $CGAL_VER"
-
-
-export PROJECTS=/projects
-export PROJECTS=/projects
-export PATHOLD=$PATH
-
-
-export PGHOST=localhost
-
-export PGUSER=postgres
-
-export PATHOLD=$PATH
WEB=/home/www/postgis/htdocs
DWN=${WEB}/download
-export PATHOLD="/mingw/bin:/mingw/include:/c/Windows/system32:/c/Windows:.:/bin:/include:/usr/local/bin"
#export PG_VER=9.2beta2
-echo PATH BEFORE: $PATH
-
-export PGPATH=${PROJECTS}/postgresql/rel/pg${PG_VER}w${OS_BUILD}${GCC_TYPE}
-export PGPATHEDB=${PGPATH}edb
-#export PROJSO=libproj-13.dll
-
if [ -n "$SOURCE_FOLDER" ]; then
export POSTGIS_SRC=${PROJECTS}/postgis/$SOURCE_FOLDER
cd $POSTGIS_SRC
@@ -117,7 +36,6 @@ export REL_PGVER=${PG_VER//./} #strip the period
export RELDIR=${PROJECTS}/postgis/builds/${POSTGIS_MINOR_VER}
export RELVERDIR=postgis-pg${REL_PGVER}-binaries-${POSTGIS_MICRO_VER}w${OS_BUILD}${GCC_TYPE}
export PATH="${PATHOLD}:${PGPATH}/bin:${PGPATH}/lib"
-export PCRE_VER=8.33
#PATH="${PGPATH}/bin:${PGPATH}/lib:${PROJECTS}/xsltproc:${PROJECTS}/gtkw${OS_BUILD}${GCC_TYPE}/bin:${PROJECTS}/gtkw${OS_BUILD}/bin:${PROJECTS}/geos/rel-${GEOS_VER}w${OS_BUILD}${GCC_TYPE}/bin:${PROJECTS}/rel-libiconv-${ICON_VER}w${OS_BUILD}${GCC_TYPE}/include:${PROJECTS}/rel-libiconv-1.13.1w${OS_BUILD}${GCC_TYPE}/bin:${PATH}"
#echo PATH AFTER: $PATH
outdir="${RELDIR}/${RELVERDIR}"
diff --git a/ci/winnie/regress_postgis.sh b/ci/winnie/regress_postgis.sh
index 49ba72205..d75891bf9 100644
--- a/ci/winnie/regress_postgis.sh
+++ b/ci/winnie/regress_postgis.sh
@@ -1,78 +1,17 @@
#!/usr/bin/env bash
-. $(dirname $0)/winnie_common.h
+. $(dirname $0)/winnie_common.sh
echo "MSYS2_ARG_CONV_EXCL=$MSYS2_ARG_CONV_EXCL"
-if [[ "${OVERRIDE}" == '' ]] ; then
- export GEOS_VER=3.11.0
- export GDAL_VER=3.4.2
- export PROJ_VER=7.2.1
- export SFCGAL_VER=1.4.1
- export CGAL_VER=5.3
- export ICON_VER=1.16
- export ZLIB_VER=1.2.11
- export PROTOBUF_VER=3.2.0
- export PROTOBUFC_VER=1.2.1
- export JSON_VER=0.12
- export PROJSO=libproj-19.dll
-fi;
-
-export PROTOBUF_VER=3.2.0
-export PROTOBUFC_VER=1.2.1
-export JSON_VER=0.12
-export PCRE_VER=8.33
-
-
-if [[ "${ICON_VER}" == '' ]] ; then
- export ICON_VER=1.16
-fi;
-
-echo "ICON_VER ${ICON_VER}"
-
-#set to something even if override is on but not set
-if [[ "${ZLIB_VER}" == '' ]] ; then
- export ZLIB_VER=1.2.11
-fi;
-
-
-#set to something even if override is on but not set
-if [[ "${LIBXML_VER}" == '' ]] ; then
- export LIBXML_VER=2.9.9
-fi;
-
-#set to something even if override is on but not set
-if [[ "${CGAL_VER}" == '' ]] ; then
- export CGAL_VER=5.3
-fi;
-
-echo "ZLIB_VER $ZLIB_VER"
-echo "PROJ_VER $PROJ_VER"
-echo "LIBXML_VER $LIBXML_VER"
-echo "CGAL_VER $CGAL_VER"
-echo "ZLIB_VER $ZLIB_VER"
-echo "PROJ_VER $PROJ_VER"
-echo "LIBXML_VER $LIBXML_VER"
-export PROJECTS=/projects
-export MINGPROJECTS=/projects
-export PATHOLD=$PATH
-
-if [ "$OS_BUILD" == "64" ] ; then
- export MINGHOST=x86_64-w64-mingw32
-else
- export MINGHOST=i686-w64-mingw32
-fi;
-
echo PATH AFTER: $PATH
#export PG_VER=9.2beta2
export PGWINVER=${PG_VER}edb
export WORKSPACE=`pwd`
-echo PATH BEFORE: $PATH
-
#export PGHOST=localhost
#export PGPORT=8442
-export PGUSER=postgres
+
#export GEOS_VER=3.4.0dev
#export GDAL_VER=1.9.1
export PGPATH=${PROJECTS}/postgresql/rel/pg${PG_VER}w${OS_BUILD}${GCC_TYPE}
diff --git a/ci/winnie/winnie_common.sh b/ci/winnie/winnie_common.sh
index 7c9dde5a2..cf9223e59 100644
--- a/ci/winnie/winnie_common.sh
+++ b/ci/winnie/winnie_common.sh
@@ -5,6 +5,100 @@
set -e
+export PROJECTS=/projects
# Don't convert paths
# See https://trac.osgeo.org/postgis/ticket/5436#comment:5
export MSYS2_ARG_CONV_EXCL=/config/tags
+
+if [[ "${OVERRIDE}" == '' ]] ; then
+ export GEOS_VER=3.10.2
+ export GDAL_VER=3.4.2
+ export PROJ_VER=7.2.1
+ export SFCGAL_VER=1.4.1
+ export CGAL_VER=5.3
+ export ICON_VER=1.16
+ export ZLIB_VER=1.2.11
+ export PROTOBUF_VER=3.2.0
+ export PROTOBUFC_VER=1.2.1
+ export JSON_VER=0.12
+ export PROJSO=libproj-19.dll
+fi;
+
+export PROTOBUF_VER=3.2.0
+export PROTOBUFC_VER=1.2.1
+export JSON_VER=0.16
+export PCRE_VER=8.33
+
+
+#export OS_BUILD=64
+#export PGPORT=8442
+
+#export OS_BUILD=32
+
+#export GCC_TYPE=
+#if no override is set - use these values
+#otherwise use the ones jenkins passes thru
+if [[ "${ICON_VER}" == '' ]] ; then
+ export ICON_VER=1.17
+fi;
+
+echo "ICON_VER ${ICON_VER}"
+
+#set to something even if override is on but not set
+if [[ "${ZLIB_VER}" == '' ]] ; then
+ export ZLIB_VER=1.2.13
+fi;
+
+#set to something even if override is on but not set
+if [[ "${LIBXML_VER}" == '' ]] ; then
+ export LIBXML_VER=2.9.14
+fi;
+
+#set to something even if override is on but not set
+if [[ "${CGAL_VER}" == '' ]] ; then
+ export CGAL_VER=5.3
+fi;
+
+#export GDAL_VER=2.4.0
+#export PROJ_VER=5.2.0
+
+echo "ZLIB_VER $ZLIB_VER"
+echo "PROJ_VER $PROJ_VER"
+echo "LIBXML_VER $LIBXML_VER"
+echo "CGAL_VER $CGAL_VER"
+export PROJECTS=/projects
+export MINGPROJECTS=/projects
+export PATHOLD="/mingw/bin:/mingw/include:/c/Windows/system32:/c/Windows:.:/bin:/include:/usr/local/bin"
+
+if [ "$OS_BUILD" == "64" ] ; then
+ export MINGHOST=x86_64-w64-mingw32
+else
+ export MINGHOST=i686-w64-mingw32
+fi;
+
+#export PG_VER=9.2beta2
+export PGWINVER=${PG_VER}edb
+export WORKSPACE=`pwd`
+
+echo PATH BEFORE: $PATH
+
+#export PGHOST=localhost
+#export PGPORT=8442
+export PGUSER=postgres
+#export GEOS_VER=3.4.0dev
+#export GDAL_VER=1.9.1
+export PGPATH=${PROJECTS}/postgresql/rel/pg${PG_VER}w${OS_BUILD}${GCC_TYPE}
+export PGPATHEDB=${PROJECTS}/postgresql/rel/pg${PG_VER}w${OS_BUILD}${GCC_TYPE}edb
+
+export GDAL_DATA="${PROJECTS}/gdal/rel-${GDAL_VER}w${OS_BUILD}${GCC_TYPE}/share/gdal"
+
+export PATH="${PATHOLD}:${PGPATH}/bin:${PGPATH}/lib"
+export PATH="${PROJECTS}/xsltproc:${PROJECTS}/gtkw${OS_BUILD}${GCC_TYPE}/bin:${PROJECTS}/geos/rel-${GEOS_VER}w${OS_BUILD}${GCC_TYPE}/bin:${PROJECTS}/gdal/rel-${GDAL_VER}w${OS_BUILD}${GCC_TYPE}/bin:${PROJECTS}/rel-libiconv-${ICON_VER}w${OS_BUILD}${GCC_TYPE}/lib:${PROJECTS}/rel-libiconv-${ICON_VER}w${OS_BUILD}${GCC_TYPE}/include:${PROJECTS}/rel-libiconv-${ICON_VER}w${OS_BUILD}${GCC_TYPE}/bin:${PROJECTS}/proj/rel-${PROJ_VER}w${OS_BUILD}${GCC_TYPE}/bin:${PROJECTS}/proj/rel-proj-${PROJ_VER}w${OS_BUILD}${GCC_TYPE}/bin:${PROJECTS}/libxml/rel-libxml2-${LIBXML_VER}w${OS_BUILD}${GCC_TYPE}/bin:${PROJECTS}/zlib/rel-zlib-${ZLIB_VER}w${OS_BUILD}${GCC_TYPE}/bin:${PROJECTS}/zlib/rel-zlib-${ZLIB_VER}w${OS_BUILD}${GCC_TYPE}/lib:${PATH}"
+export PKG_CONFIG_PATH="${PROJECTS}/sqlite/rel-sqlite3w${OS_BUILD}${GCC_TYPE}/lib/pkgconfig:${PROJECTS}/zlib/rel-zlib-${ZLIB_VER}w${OS_BUILD}${GCC_TYPE}/lib:${PROJECTS}/protobuf/rel-${PROTOBUF_VER}w${OS_BUILD}${GCC_TYPE}/lib/pkgconfig:${PROJECTS}/json-c/rel-${JSON_VER}w${OS_BUILD}${GCC_TYPE}/lib/pkgconfig:${PROJECTS}/proj/rel-${PROJ_VER}w${OS_BUILD}${GCC_TYPE}/lib/pkgconfig:${PROJECTS}/proj/rel-proj-${PROJ_VER}w${OS_BUILD}${GCC_TYPE}/lib/pkgconfig:${PROJECTS}/gdal/rel-${GDAL_VER}w${OS_BUILD}${GCC_TYPE}/lib/pkgconfig:${PROJECTS}/pcre/rel-${PCRE_VER}w${OS_BUILD}${GCC_TYPE}/lib/pkgconfig:${PROJECTS}/zlib/rel-zlib-${ZLIB_VER}w${OS_BUILD}${GCC_TYPE}/lib/pkgconfig::${PROJECTS}/gtkw${OS_BUILD}${GCC_TYPE}/lib/pkgconfig"
+export SHLIB_LINK="-static-libstdc++ -lstdc++ -Wl,-Bdynamic -lm"
+CPPFLAGS="-I${PGPATH}/include -I${PROJECTS}/rel-libiconv-${ICON_VER}w${OS_BUILD}${GCC_TYPE}/include"
+
+#add protobuf
+export PATH="${PROJECTS}/protobuf/rel-${PROTOBUF_VER}w${OS_BUILD}${GCC_TYPE}/bin:${PROJECTS}/protobuf/rel-${PROTOBUF_VER}w${OS_BUILD}${GCC_TYPE}/lib:${PATH}"
+
+echo "PATH AFTER: $PATH"
-----------------------------------------------------------------------
Summary of changes:
ci/winnie/build_postgis.sh | 86 +---------------------------------------
ci/winnie/package_postgis.sh | 84 +--------------------------------------
ci/winnie/regress_postgis.sh | 65 +-----------------------------
ci/winnie/winnie_common.sh | 94 ++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 98 insertions(+), 231 deletions(-)
hooks/post-receive
--
PostGIS
More information about the postgis-tickets
mailing list