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

[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  dfa99e3e8df141a9eb9524e0411e76a3e95655a3 (commit)
      from  55135474e84f85d917b30a69d42024ef6c72395e (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 dfa99e3e8df141a9eb9524e0411e76a3e95655a3
Author: Regina Obe <lr at pcorp.us>
Date:   Mon Oct 7 21:14:05 2019 -0400

    Fix path to zlib

diff --git a/windows/mingw64/scripts/build_pointcloud.sh b/windows/mingw64/scripts/build_pointcloud.sh
index 40d5f31..f8ed005 100644
--- a/windows/mingw64/scripts/build_pointcloud.sh
+++ b/windows/mingw64/scripts/build_pointcloud.sh
@@ -48,7 +48,7 @@ if true; then
 	cd ${PROJECTS}/postgis/pointcloud
 
 	#https://docs.google.com/document/d/1qJjiNUleh220so1gwthTtyJuBZj0TD3eDMTql-djCk8/edit?pli=1
-	export PATH="${PATH}:${PROJECTS}/zlib/rel-${ZLIB_VER}w${OS_BUILD}${GCC_TYPE}/bin:${PROJECTS}/zlib/rel-${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"
+	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"
 	#rm -rf pointcloud
 	#export PATH="${PGPATH}:${PATHOLD}:${PROJECTS}/gtkw${OS_BUILD}${GCC_TYPE}/bin" #${PROJECTS}/gtkw${OS_BUILD}${GCC_TYPE}/bin: 
 	#git clone -b master https://github.com/pramsey/pointcloud.git
@@ -65,8 +65,8 @@ if true; then
 
 	#./configure --help
 	#exit;
-	export CPPFLAGS="-I${PROJECTS}/zlib/rel-${ZLIB_VER}w${OS_BUILD}${GCC_TYPE}/include  -I${PROJECTS}/libxml/rel-libxml2-${LIBXML_VER}w${OS_BUILD}${GCC_TYPE}/include"
-	export LDFLAGS="-L${PROJECTS}/zlib/rel-${ZLIB_VER}w${OS_BUILD}${GCC_TYPE}/lib -L${PROJECTS}/libxml/rel-libxml2-${LIBXML_VER}w${OS_BUILD}${GCC_TYPE}/lib"
+	export CPPFLAGS="-I${PROJECTS}/zlib/rel-zlib-${ZLIB_VER}w${OS_BUILD}${GCC_TYPE}/include  -I${PROJECTS}/libxml/rel-libxml2-${LIBXML_VER}w${OS_BUILD}${GCC_TYPE}/include"
+	export LDFLAGS="-L${PROJECTS}/zlib/rel-zlib-${ZLIB_VER}w${OS_BUILD}${GCC_TYPE}/lib -L${PROJECTS}/libxml/rel-libxml2-${LIBXML_VER}w${OS_BUILD}${GCC_TYPE}/lib"
 	./configure --target=${MINGHOST} --with-xml2config=${PROJECTS}/libxml/rel-libxml2-${LIBXML_VER}w${OS_BUILD}${GCC_TYPE}/bin/xml2-config \
 		--with-pgconfig=${PGPATH}/bin/pg_config
 	make clean && make

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

Summary of changes:
 windows/mingw64/scripts/build_pointcloud.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)


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