set defaults back to old and put projdir back in configure for some reason not pickin...

git-svn-id: http://svn.osgeo.org/postgis/trunk@17531 b70326c6-7e19-0410-871a-916f4a2858ee

diff --git a/ci/winnie/build_postgis.sh b/ci/winnie/build_postgis.sh
index 0148f0f9a9fba84ad13c2dc74466cef66afbc17f..b655f851e4813b3fe69964102bedccd100aaa924 100644 (file)
--- a/ci/winnie/build_postgis.sh
+++ b/ci/winnie/build_postgis.sh
@@ -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 @@ PATH="${MINGPROJECTS}/xsltproc:${MINGPROJECTS}/gtkw${OS_BUILD}${GCC_TYPE}/bin:${
 
 #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 @@ LDFLAGS="-Wl,--enable-auto-import -L${PGPATH}/lib -L${PROJECTS}/rel-libiconv-${I
   --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 @@ LDFLAGS="-Wl,--enable-auto-import -L${PGPATH}/lib -L${PROJECTS}/rel-libiconv-${I
   --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 \

diff --git a/ci/winnie/package_postgis.sh b/ci/winnie/package_postgis.sh
index b48bb4649b6b4c965114035899699a0cd1c76655..ccc982a4b8cd14fc24720417e90cc66276d3dbdd 100644 (file)
--- a/ci/winnie/package_postgis.sh
+++ b/ci/winnie/package_postgis.sh
@@ -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

diff --git a/ci/winnie/regress_postgis.sh b/ci/winnie/regress_postgis.sh
index b15e3cef8ec4f2cae8b527969e567a751f339a8a..6116166506727c90f530a688edadad0c85f0deb7 100644 (file)
--- a/ci/winnie/regress_postgis.sh
+++ b/ci/winnie/regress_postgis.sh
@@ -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 @@ LDFLAGS="-Wl,--enable-auto-import -L${PGPATH}/lib -L${PROJECTS}/rel-libiconv-${I
   --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 @@ LDFLAGS="-Wl,--enable-auto-import -L${PGPATH}/lib -L${PROJECTS}/rel-libiconv-${I
   --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 \