[postgis-tickets] [SCM] PostGIS Buildbots; Jenkins jobs and instructions for setting up winnie and debbie bots. branch master updated. 099b8c27ea5bd7a876fcb2483b9b3cc58ec93655

[git at osgeo.org]

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 Buildbots; Jenkins jobs and instructions for setting up winnie and debbie bots.".

The branch, master has been updated
       via  099b8c27ea5bd7a876fcb2483b9b3cc58ec93655 (commit)
      from  34047e6efc87d3a5086ac13c908bb5ef9a885379 (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 099b8c27ea5bd7a876fcb2483b9b3cc58ec93655
Author: Regina Obe <lr at pcorp.us>
Date:   Sun Nov 13 22:17:58 2022 -0500

    Revise script to work against main changes

diff --git a/windows/mingw64/scripts/build_h3-pg.sh b/windows/mingw64/scripts/build_h3-pg.sh
index 3de16c6..156ea9a 100644
--- a/windows/mingw64/scripts/build_h3-pg.sh
+++ b/windows/mingw64/scripts/build_h3-pg.sh
@@ -7,15 +7,27 @@ set -e
 #export LIBXML_VER=2.7.8
 #export PGPORT=5443
 #export H3PG_VER=
+if [ "$GCC_TYPE" == "tux" ]; then
+	export GCC_TYPE=
+fi
+export PROJECTS=/projects
+
 export PGPATH=${PROJECTS}/postgresql/rel/pg${PG_VER}w${OS_BUILD}${GCC_TYPE}
 export PGPATHEDB=${PGPATH}edb
-export PATH="/mingw/bin:/mingw/include:/mingw/lib:/c/Windows/system32:/bin:/include:/usr/local/bin:/cmake/bin"
+
+export PGBIN=${PGPATH}/bin
+echo "PGBIN is $PGBIN"
+export PATH="/mingw/bin:/mingw/include:/mingw/lib:/c/Windows/system32:/bin:/include:/usr/local/bin"
 export PATH="${PATH}:${PROJECTS}/zlib/rel-zlib-${ZLIB_VER}w${OS_BUILD}${GCC_TYPE}/bin:${PROJECTS}/zlib/rel-zlib-${ZLIB_VER}w${OS_BUILD}${GCC_TYPE}/lib:${PROJECTS}/zlib/rel-${ZLIB_VER}w${OS_BUILD}${GCC_TYPE}/include:${PROJECTS}/libxml/rel-libxml2-${LIBXML_VER}w${OS_BUILD}${GCC_TYPE}/bin:${PROJECTS}/libxml/rel-libxml2-${LIBXML_VER}w${OS_BUILD}${GCC_TYPE}/lib:${PROJECTS}/libxml/rel-libxml2-${LIBXML_VER}w${OS_BUILD}${GCC_TYPE}/include:${PGPATH}/include:${PGPATH}/bin:/cmake/bin"
-export PGPORT=5452
+#export PGPORT=5452
 export PGUSER=postgres
 export SOURCES=/sources
 cd /projects
 cd h3-pg/h3-pg/
+make
+make install
+make installcheck
+
 #git clean -fdx
 export GIT_REVISION=`git status | head -1`
 export RELDIR=/projects/h3-pg/builds
@@ -24,39 +36,17 @@ export outdir="${RELDIR}/${RELVERDIR}"
 export package="${RELDIR}/${RELVERDIR}.zip"
 export INSTALL_DIR=${RELDIR}/${RELVERDIR}
 export verfile="${INSTALL_DIR}/h3-pg_version.txt"
-# h3 core library version to clone and statically link
-export LIBH3_VERSION=v4.0.1
-# directory that h3 core repository is cloned into
-export LIBH3_SOURCE=libh3-${LIBH3_VERSION}
-#build directory
-export LIBH3_BUILD=${LIBH3_SOURCE}/build
-git clone --branch ${LIBH3_VERSION} --depth 1 https://github.com/uber/h3 ${LIBH3_SOURCE}
-export LIBH3_BUILD=${LIBH3_SOURCE}/build
-#build h3 library
-mkdir -p ${LIBH3_BUILD}
-cd ${LIBH3_BUILD} && cmake \
-		-G "Unix Makefiles" \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DBUILD_TESTING=OFF \
-		-DENABLE_COVERAGE=OFF \
-		-DENABLE_DOCS=OFF \
-		-DENABLE_FORMAT=OFF \
-		-DENABLE_LINTING=OFF \
-		..
-#cmake -G "Unix Makefiles" --build ${LIBH3_BUILD} --target h3
-#cmake -G "Unix Makefiles" --build ${LIBH3_BUILD} --target binding-functions
-make
-cd /projects/h3-pg/h3-pg/
-make
-make install
+
+
 rm -rf ${INSTALL_DIR}
 mkdir -p ${INSTALL_DIR}/lib
 mkdir -p ${INSTALL_DIR}/docs
 mkdir -p ${INSTALL_DIR}/share/extension 
 cp -r ${RELDIR}/packaging_notes/* ${INSTALL_DIR}/
-cp ${PGPATH}/lib/h3*.dll ${INSTALL_DIR}/lib
+cp build/h3/h3*.dll ${INSTALL_DIR}/lib
 cp ${PGPATH}/share/extension/h3*.control ${INSTALL_DIR}/share/extension
 cp ${PGPATH}/share/extension/h3*.sql ${INSTALL_DIR}/share/extension
+
 cp README.md ${INSTALL_DIR}
 cp LICENSE ${INSTALL_DIR}
 cp docs/*.md ${INSTALL_DIR}/docs/

-----------------------------------------------------------------------

Summary of changes:
 windows/mingw64/scripts/build_h3-pg.sh | 46 +++++++++++++---------------------
 1 file changed, 18 insertions(+), 28 deletions(-)


hooks/post-receive
-- 
PostGIS Buildbots; Jenkins jobs and instructions for setting up winnie and debbie bots.