Fix winnie build, package, and regress scripts to copy from mingw .sql from mingw...

Closes #3901

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

diff --git a/ci/winnie/build_postgis.sh b/ci/winnie/build_postgis.sh
index 604bcc26671e75fb61d093afac9843f1b73429fb..17b4a107f25bda5a8cece9875bf2fe0fd1598025 100644 (file)
--- a/ci/winnie/build_postgis.sh
+++ b/ci/winnie/build_postgis.sh
@@ -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 @@ fi;
 
 #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 @@ if [ -n "$SFCGAL_VER" ]; then
        #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 @@ CPPFLAGS="-I${PGPATH}/include  -I${MINGPROJECTS}/rel-libiconv-1.13.1w${OS_BUILD}
   --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 @@ fi;
 #patch liblwgeom generated make to get rid of dynamic linking
 sed -i 's/LDFLAGS += -no-undefined//g' liblwgeom/Makefile
 
+make uninstall
+
 make && make install
 

diff --git a/ci/winnie/package_postgis.sh b/ci/winnie/package_postgis.sh
index fa733d3c83335509e84d4f69bbeeb88fcda80b85..791305920d3a9761d54371f0a18024a20474ccf8 100644 (file)
--- a/ci/winnie/package_postgis.sh
+++ b/ci/winnie/package_postgis.sh
@@ -196,7 +196,8 @@ cp topology/topology_upgrade_*.sql ${RELDIR}/${RELVERDIR}/share/contrib/postgis-
 #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

diff --git a/ci/winnie/regress_postgis.sh b/ci/winnie/regress_postgis.sh
index 7234389b9066aba4fd86691770c3079f39752431..11c2070708265fa7f6b381c039e762e9b7b5032c 100644 (file)
--- a/ci/winnie/regress_postgis.sh
+++ b/ci/winnie/regress_postgis.sh
@@ -161,7 +161,8 @@ if [ "$MAKE_EXTENSION" == "1" ]; then
  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