[postgis-tickets] r15979 - Fix winnie build, package, and regress scripts to copy from mingw .sql from mingw install location

[Regina Obe]

Author: robe
Date: 2017-10-12 22:40:27 -0700 (Thu, 12 Oct 2017)
New Revision: 15979

Modified:
   trunk/ci/winnie/build_postgis.sh
   trunk/ci/winnie/package_postgis.sh
   trunk/ci/winnie/regress_postgis.sh
Log:
Fix winnie build, package, and regress scripts to copy from mingw .sql from mingw install location
Closes #3901

Modified: trunk/ci/winnie/build_postgis.sh
===================================================================
--- trunk/ci/winnie/build_postgis.sh	2017-10-12 22:40:00 UTC (rev 15978)
+++ trunk/ci/winnie/build_postgis.sh	2017-10-13 05:40:27 UTC (rev 15979)
@@ -2,7 +2,7 @@
 set -e
 #### $Id:build_postgis210.sh 10208 2012-08-30 05:38:22Z robe $
 #all these get passed in by jenkins
-#export OS_BUILD=64 
+#export OS_BUILD=64
 #export PG_VER=9.2beta2
 #export PGHOST=localhost
 #export PGPORT=8442
@@ -61,7 +61,7 @@
 
 #export POSTGIS_SRC=${PROJECTS}/postgis/trunk
 export GDAL_DATA="${PROJECTS}/gdal/rel-${GDAL_VER}w${OS_BUILD}${GCC_TYPE}/share/gdal"
-# export REL_PGVER=$(echo $PG_VER | tr '.' '') 
+# export REL_PGVER=$(echo $PG_VER | tr '.' '')
 # echo $REL_PGVER
 # export RELDIR=${MINGPROJECTS}/postgis/builds/postgis-21
 # export RELVERDIR=postgis-pg${REL_PGVER}-binaries-${POSTGIS_MICRO_VER}w64
@@ -102,7 +102,7 @@
 	#BOOST_VER_WU=1_49_0
 	export BOOST_VER_WU=1_53_0
 	export PATH="${PROJECTS}/CGAL/rel-cgal-${CGAL_VER}w${OS_BUILD}${GCC_TYPE}/bin:${PROJECTS}/boost/rel-${BOOST_VER_WU}w${OS_BUILD}${GCC_TYPE}/lib:${PATH}"
-	
+
 CPPFLAGS="-I${PGPATH}/include -I${MINGPROJECTS}/rel-libiconv-1.13.1w${OS_BUILD}${GCC_TYPE}/include" \
 LDFLAGS="-L${PGPATH}/lib -L${PROJECTS}/gdal/rel-${GDAL_VER}w${OS_BUILD}${GCC_TYPE}/lib -L${MINGPROJECTS}/rel-libiconv-1.13.1w${OS_BUILD}${GCC_TYPE}/lib" ./configure \
   --host=${MINGHOST} --with-xml2config=${PROJECTS}/libxml/rel-libxml2-${LIBXML_VER}w${OS_BUILD}${GCC_TYPE}/bin/xml2-config \
@@ -143,6 +143,7 @@
   --with-xsldir=${PROJECTS}/docbook/docbook-xsl-1.76.1 \
   --with-gettext=no
 fi;
+
 #make clean
 ##hack to get around boolean incompatibility now only needed for 2.0 (no longer for 2.1)
 if [ "$POSTGIS_MINOR_VERSION" == "0" ] ; then
@@ -153,5 +154,7 @@
 #patch liblwgeom generated make to get rid of dynamic linking
 sed -i 's/LDFLAGS += -no-undefined//g' liblwgeom/Makefile
 
+make uninstall
+
 make && make install
 

Modified: trunk/ci/winnie/package_postgis.sh
===================================================================
--- trunk/ci/winnie/package_postgis.sh	2017-10-12 22:40:00 UTC (rev 15978)
+++ trunk/ci/winnie/package_postgis.sh	2017-10-13 05:40:27 UTC (rev 15979)
@@ -196,7 +196,8 @@
 #cp topology/README* ${RELDIR}/${RELVERDIR}/share/contrib/postgis-${POSTGIS_MINOR_VER}
 #cp utils/* ${RELDIR}/${RELVERDIR}/utils
 #cp extras/* ${RELDIR}/${RELVERDIR}/share/contrib/postgis-${POSTGIS_MINOR_VER}/extras
-cp -r extensions/*/sql/* ${RELDIR}/${RELVERDIR}/share/extension
+cp ${PGPATH}/share/extension/*postgis*${POSTGIS_MICRO_VER}*.sql ${RELDIR}/${RELVERDIR}/share/extension
+cp ${PGPATH}/share/extension/*address_standardizer*${POSTGIS_MICRO_VER}*.sql ${RELDIR}/${RELVERDIR}/share/extension
 cp -r extensions/*/*.control ${RELDIR}/${RELVERDIR}/share/extension
 cp -r extensions/*/*.dll ${RELDIR}/${RELVERDIR}/lib #only address_standardizer in theory has this
 #cp extensions/postgis_topology/sql/* ${RELDIR}/${RELVERDIR}/share/extension

Modified: trunk/ci/winnie/regress_postgis.sh
===================================================================
--- trunk/ci/winnie/regress_postgis.sh	2017-10-12 22:40:00 UTC (rev 15978)
+++ trunk/ci/winnie/regress_postgis.sh	2017-10-13 05:40:27 UTC (rev 15979)
@@ -161,7 +161,8 @@
  cp topology/*.dll ${PGPATHEDB}/lib
  cp postgis/postgis*.dll ${PGPATHEDB}/lib
  cp raster/rt_pg/rtpostgis-*.dll ${PGPATHEDB}/lib
- cp -r extensions/*/sql/* ${PGPATHEDB}/share/extension
+ cp -r ${PGPATH}/share/extension/*postgis*${POSTGIS_MICRO_VER}*.sql ${PGPATHEDB}/share/extension
+ cp -r ${PGPATH}/share/extension/*address_standardizer*${POSTGIS_MICRO_VER}*.sql ${PGPATHEDB}/share/extension
  cp -r extensions/*/*.control ${PGPATHEDB}/share/extension
  cp -r extensions/*/*.dll ${PGPATHEDB}/lib