[postgis-tickets] r17531 - set defaults back to old and put projdir back in configure for some reason not picking up proj

[Regina Obe]

Author: robe
Date: 2019-06-13 16:54:32 -0700 (Thu, 13 Jun 2019)
New Revision: 17531

Modified:
   trunk/ci/winnie/build_postgis.sh
   trunk/ci/winnie/package_postgis.sh
   trunk/ci/winnie/regress_postgis.sh
Log:
set defaults back to old and put projdir back in configure for some reason not picking up proj

Modified: trunk/ci/winnie/build_postgis.sh
===================================================================
--- trunk/ci/winnie/build_postgis.sh	2019-06-13 14:54:46 UTC (rev 17530)
+++ trunk/ci/winnie/build_postgis.sh	2019-06-13 23:54:32 UTC (rev 17531)
@@ -1,14 +1,16 @@
 #!/bin/bash
 set -e
 if  [[ "${OVERRIDE}" == '' ]] ;
+  export SFCGAL_VER=1.3.2
+  export GEOS_VER=3.7.1
+  export GDAL_VER=2.2.4
+  export PROJ_VER=4.9.3
+  export SFCGAL_VER=1.3.2
+  export PCRE_VER=8.33
+  export PROTOBUF_VER=3.2.0
+  export PROTOBUFC_VER=1.2.1
+  export CGAL_VER=4.11
 	export GEOS_VER=3.8
-	export GDAL_VER=2.4.1
-	export PROJ_VER=6.1.0
-	export SFCGAL_VER=1.3.2
-	export PROTOBUF_VER=3.2.0
-	export PROTOBUFC_VER=1.2.1
-	export CGAL_VER=4.11
-	export ICON_VER=1.15
 fi;
 
 export PCRE_VER=8.33
@@ -68,7 +70,7 @@
 
 #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}"
-export PKG_CONFIG_PATH=${PROJECTS}/protobuf/rel-${PROTOBUF_VER}w${OS_BUILD}${GCC_TYPE}/lib/pkgconfig;
+#export PKG_CONFIG_PATH=${PROJECTS}/protobuf/rel-${PROTOBUF_VER}w${OS_BUILD}${GCC_TYPE}/lib/pkgconfig;
 
 echo PATH AFTER: $PATH
 
@@ -120,6 +122,7 @@
   --with-xsldir=${PROJECTS}/docbook/docbook-xsl-1.76.1 \
   --with-gui --with-gettext=no \
   --with-sfcgal=${PROJECTS}/CGAL/rel-sfcgal-${SFCGAL_VER}w${OS_BUILD}${GCC_TYPE}/bin/sfcgal-config \
+  --with-projdir=${PROJECTS}/proj/rel-${PROJ_VER}w${OS_BUILD}${GCC_TYPE} \
   --without-interrupt-tests \
   --prefix=${PROJECTS}/postgis/liblwgeom-${POSTGIS_VER}w${OS_BUILD}${GCC_TYPE}
 else
@@ -132,6 +135,7 @@
   --with-pgconfig=${PGPATH}/bin/pg_config \
   --with-geosconfig=${PROJECTS}/geos/rel-${GEOS_VER}w${OS_BUILD}${GCC_TYPE}/bin/geos-config \
   --with-gui --with-gettext=no \
+  --with-projdir=${PROJECTS}/proj/rel-${PROJ_VER}w${OS_BUILD}${GCC_TYPE} \
   --with-libiconv=${PROJECTS}/rel-libiconv-${ICON_VER}w${OS_BUILD}${GCC_TYPE} \
   --with-xsldir=${PROJECTS}/docbook/docbook-xsl-1.76.1 \
   --without-interrupt-tests \

Modified: trunk/ci/winnie/package_postgis.sh
===================================================================
--- trunk/ci/winnie/package_postgis.sh	2019-06-13 14:54:46 UTC (rev 17530)
+++ trunk/ci/winnie/package_postgis.sh	2019-06-13 23:54:32 UTC (rev 17531)
@@ -16,8 +16,8 @@
 #otherwise use the ones jenkins passes thru
 if  [[ "${OVERRIDE}" == '' ]] ;
 	export GEOS_VER=3.8
-	export GDAL_VER=2.4.1
-	export PROJ_VER=6.1.0
+	export GDAL_VER=2.2.4
+	export PROJ_VER=4.9.3
 	export SFCGAL_VER=1.3.2
 	export PROTOBUF_VER=3.2.0
 	export PROTOBUFC_VER=1.2.1

Modified: trunk/ci/winnie/regress_postgis.sh
===================================================================
--- trunk/ci/winnie/regress_postgis.sh	2019-06-13 14:54:46 UTC (rev 17530)
+++ trunk/ci/winnie/regress_postgis.sh	2019-06-13 23:54:32 UTC (rev 17531)
@@ -2,8 +2,8 @@
 set -e
 if  [[ "${OVERRIDE}" == '' ]] ; then
 	export GEOS_VER=3.8
-	export GDAL_VER=2.4.1
-	export PROJ_VER=6.1.0
+	export GDAL_VER=2.2.4
+	export PROJ_VER=4.9.3
 	export SFCGAL_VER=1.3.2
 	export PROTOBUF_VER=3.2.0
 	export PROTOBUFC_VER=1.2.1
@@ -120,6 +120,7 @@
   --with-xsldir=${PROJECTS}/docbook/docbook-xsl-1.76.1 \
   --with-gui --with-gettext=no \
   --with-sfcgal=${PROJECTS}/CGAL/rel-sfcgal-${SFCGAL_VER}w${OS_BUILD}${GCC_TYPE}/bin/sfcgal-config \
+  --with-projdir=${PROJECTS}/proj/rel-${PROJ_VER}w${OS_BUILD}${GCC_TYPE} \
   --without-interrupt-tests \
   --prefix=${PROJECTS}/postgis/liblwgeom-${POSTGIS_VER}w${OS_BUILD}${GCC_TYPE}
 else
@@ -132,6 +133,7 @@
   --with-pgconfig=${PGPATH}/bin/pg_config \
   --with-geosconfig=${PROJECTS}/geos/rel-${GEOS_VER}w${OS_BUILD}${GCC_TYPE}/bin/geos-config \
   --with-gui --with-gettext=no \
+  --with-projdir=${PROJECTS}/proj/rel-${PROJ_VER}w${OS_BUILD}${GCC_TYPE} \
   --with-libiconv=${PROJECTS}/rel-libiconv-${ICON_VER}w${OS_BUILD}${GCC_TYPE} \
   --with-xsldir=${PROJECTS}/docbook/docbook-xsl-1.76.1 \
   --without-interrupt-tests \