[postgis-tickets] r16533 - missed some spots where source_folder variable is used

Regina Obe lr at pcorp.us
Mon Apr 9 08:11:18 PDT 2018


Author: robe
Date: 2018-04-09 08:11:17 -0700 (Mon, 09 Apr 2018)
New Revision: 16533

Modified:
   branches/2.4/ci/winnie/build_postgis.sh
   branches/2.4/ci/winnie/package_postgis.sh
Log:
missed some spots where source_folder variable is used

Modified: branches/2.4/ci/winnie/build_postgis.sh
===================================================================
--- branches/2.4/ci/winnie/build_postgis.sh	2018-04-09 01:41:39 UTC (rev 16532)
+++ branches/2.4/ci/winnie/build_postgis.sh	2018-04-09 15:11:17 UTC (rev 16533)
@@ -60,7 +60,7 @@
 echo POSTGIS_MICRO_VERSION: $POSTGIS_VER
 
 if [ -n "$SOURCE_FOLDER" ]; then
-  export POSTGIS_SRC=$SOURCE_FOLDER
+  export POSTGIS_SRC=${PROJECTS}/postgis/$SOURCE_FOLDER
 else
   if [[ "$POSTGIS_MICRO_VERSION"  == *SVN* || "$POSTGIS_MICRO_VERSION"  == *dev* ]] ; then
     export POSTGIS_SRC=${PROJECTS}/postgis/branches/${POSTGIS_VER}

Modified: branches/2.4/ci/winnie/package_postgis.sh
===================================================================
--- branches/2.4/ci/winnie/package_postgis.sh	2018-04-09 01:41:39 UTC (rev 16532)
+++ branches/2.4/ci/winnie/package_postgis.sh	2018-04-09 15:11:17 UTC (rev 16533)
@@ -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;



More information about the postgis-tickets mailing list