[postgis-tickets] r16538 - revise to handle use of SOURCE_FOLDER if passed in as an arg

[Regina Obe]

Author: robe
Date: 2018-04-11 14:02:41 -0700 (Wed, 11 Apr 2018)
New Revision: 16538

Modified:
   trunk/ci/winnie/build_postgis.sh
   trunk/ci/winnie/package_postgis.sh
   trunk/ci/winnie/regress_postgis.sh
Log:
revise to handle use of SOURCE_FOLDER if passed in as an arg

Modified: trunk/ci/winnie/build_postgis.sh
===================================================================
--- trunk/ci/winnie/build_postgis.sh	2018-04-10 04:06:01 UTC (rev 16537)
+++ trunk/ci/winnie/build_postgis.sh	2018-04-11 21:02:41 UTC (rev 16538)
@@ -14,7 +14,7 @@
 #export GCC_TYPE=gcc48  #for pre-4.8.0 compiles this is blank
 export SFCGAL_VER=1.3.2
 export GEOS_VER=3.7.0dev
-export GDAL_VER=2.2.3
+export GDAL_VER=2.2.4
 export PROJ_VER=4.9.3
 export SFCGAL_VER=1.3.2
 export PCRE_VER=8.33
@@ -58,11 +58,16 @@
 
 export POSTGIS_MICRO_VER=${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}.${POSTGIS_MICRO_VERSION}
 echo POSTGIS_MICRO_VERSION: $POSTGIS_VER
-if [[ "$POSTGIS_MICRO_VERSION"  == *SVN* || "$POSTGIS_MICRO_VERSION"  == *dev* ]] ; then
-	export POSTGIS_SRC=${PROJECTS}/postgis/branches/${POSTGIS_VER}
+
+if [ -n "$SOURCE_FOLDER" ]; then
+  export POSTGIS_SRC=${PROJECTS}/postgis/$SOURCE_FOLDER
 else
-	#tagged version -- official release
-	export POSTGIS_SRC=${PROJECTS}/postgis/tags/${POSTGIS_VER}.${POSTGIS_MICRO_VERSION}
+  if [[ "$POSTGIS_MICRO_VERSION"  == *SVN* || "$POSTGIS_MICRO_VERSION"  == *dev* ]] ; then
+    export POSTGIS_SRC=${PROJECTS}/postgis/branches/${POSTGIS_VER}
+  else
+    #tagged version -- official release
+    export POSTGIS_SRC=${PROJECTS}/postgis/tags/${POSTGIS_VER}.${POSTGIS_MICRO_VERSION}
+  fi;
 fi;
 
 #export POSTGIS_SRC=${PROJECTS}/postgis/trunk

Modified: trunk/ci/winnie/package_postgis.sh
===================================================================
--- trunk/ci/winnie/package_postgis.sh	2018-04-10 04:06:01 UTC (rev 16537)
+++ trunk/ci/winnie/package_postgis.sh	2018-04-11 21:02:41 UTC (rev 16538)
@@ -14,7 +14,7 @@
 #export GCC_TYPE=
 export SFCGAL_VER=1.3.2
 export GEOS_VER=3.7.0dev
-export GDAL_VER=2.2.3
+export GDAL_VER=2.2.4
 export PROJ_VER=4.9.3
 export SFCGAL_VER=1.3.2
 export PCRE_VER=8.33
@@ -61,6 +61,10 @@
 	export svnurl="https://svn.osgeo.org/postgis/tags/${POSTGIS_MINOR_VER}.${POSTGIS_MICRO_VERSION}"
 fi;
 
+if [ -n "$SOURCE_FOLDER" ]; then
+  export POSTGIS_SRC=${PROJECTS}/postgis/$SOURCE_FOLDER
+fi
+
 if [[ "$reference"  == *trunk* ]] ; then
 	export svnurl="https://svn.osgeo.org/postgis/trunk"
 fi;

Modified: trunk/ci/winnie/regress_postgis.sh
===================================================================
--- trunk/ci/winnie/regress_postgis.sh	2018-04-10 04:06:01 UTC (rev 16537)
+++ trunk/ci/winnie/regress_postgis.sh	2018-04-11 21:02:41 UTC (rev 16538)
@@ -2,7 +2,7 @@
 set -e
 export SFCGAL_VER=1.3.2
 export GEOS_VER=3.7.0dev
-export GDAL_VER=2.2.3
+export GDAL_VER=2.2.4
 export PROJ_VER=4.9.3
 export SFCGAL_VER=1.3.2
 export PCRE_VER=8.33
@@ -38,12 +38,18 @@
 
 export POSTGIS_VER=${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}
 export POSTGIS_MICRO_VER=${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}.${POSTGIS_MICRO_VERSION}
-if [[ "$POSTGIS_MICRO_VERSION"  == *SVN* || "$POSTGIS_MICRO_VERSION"  == *dev* ]] ; then
-	export POSTGIS_SRC=${PROJECTS}/postgis/branches/${POSTGIS_VER}
+
+if [ -n "$SOURCE_FOLDER" ]; then
+  export POSTGIS_SRC=${PROJECTS}/postgis/$SOURCE_FOLDER
 else
-	#tagged version -- official release
-	export POSTGIS_SRC=${PROJECTS}/postgis/tags/${POSTGIS_VER}.${POSTGIS_MICRO_VERSION}
+  if [[ "$POSTGIS_MICRO_VERSION"  == *SVN* || "$POSTGIS_MICRO_VERSION"  == *dev* ]] ; then
+    export POSTGIS_SRC=${PROJECTS}/postgis/branches/${POSTGIS_VER}
+  else
+    #tagged version -- official release
+    export POSTGIS_SRC=${PROJECTS}/postgis/tags/${POSTGIS_VER}.${POSTGIS_MICRO_VERSION}
+  fi;
 fi;
+
 export LIBXML_VER=2.7.8
 #export POSTGIS_SRC=${PROJECTS}/postgis/trunk
 export GDAL_DATA="${PROJECTS}/gdal/rel-${GDAL_VER}w${OS_BUILD}${GCC_TYPE}/share/gdal"