revise winnie's regess and package script copying to edb install to copy over non...

references #3921

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

diff --git a/ci/winnie/package_postgis.sh b/ci/winnie/package_postgis.sh
index 5485fdeab689505b1976a964216cfea1bb2b502d..1d332a00d87125f6bc85fe8171d2d3af3cdecd40 100644 (file)
--- a/ci/winnie/package_postgis.sh
+++ b/ci/winnie/package_postgis.sh
@@ -197,7 +197,11 @@ cp topology/topology_upgrade_*.sql ${RELDIR}/${RELVERDIR}/share/contrib/postgis-
 #cp utils/* ${RELDIR}/${RELVERDIR}/utils
 #cp extras/* ${RELDIR}/${RELVERDIR}/share/contrib/postgis-${POSTGIS_MINOR_VER}/extras
 cp ${PGPATH}/share/extension/postgis*${POSTGIS_MICRO_VER}.sql ${RELDIR}/${RELVERDIR}/share/extension
+cp ${PGPATH}/share/extension/postgis.sql ${RELDIR}/${RELVERDIR}/share/extension
+cp ${PGPATH}/share/extension/postgis_topology.sql ${RELDIR}/${RELVERDIR}/share/extension
+cp ${PGPATH}/share/extension/postgis_tiger_geocoder.sql ${RELDIR}/${RELVERDIR}/share/extension
 cp ${PGPATH}/share/extension/address_standardizer*${POSTGIS_MICRO_VER}.sql ${RELDIR}/${RELVERDIR}/share/extension
+cp ${PGPATH}/share/extension/address_standardizer.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 7d12a910ec794dad12db854a5ce2f98f8e5b3c29..4067bfe102d14d48dc711e841ba7bae51b7bc653 100644 (file)
--- a/ci/winnie/regress_postgis.sh
+++ b/ci/winnie/regress_postgis.sh
@@ -162,7 +162,11 @@ if [ "$MAKE_EXTENSION" == "1" ]; then
  cp postgis/postgis*.dll ${PGPATHEDB}/lib
  cp raster/rt_pg/rtpostgis-*.dll ${PGPATHEDB}/lib
  cp -r ${PGPATH}/share/extension/postgis*${POSTGIS_MICRO_VER}.sql ${PGPATHEDB}/share/extension
+ cp -r ${PGPATH}/share/extension/postgis.sql ${PGPATHEDB}/share/extension
+ cp -r ${PGPATH}/share/extension/postgis_tiger_geocoder.sql ${PGPATHEDB}/share/extension
+ cp -r ${PGPATH}/share/extension/postgis_topology.sql ${PGPATHEDB}/share/extension
  cp -r ${PGPATH}/share/extension/address_standardizer*${POSTGIS_MICRO_VER}.sql ${PGPATHEDB}/share/extension
+ cp -r ${PGPATH}/share/extension/address_standardizer.sql ${PGPATHEDB}/share/extension
  cp -r extensions/*/*.control ${PGPATHEDB}/share/extension
  cp -r extensions/*/*.dll ${PGPATHEDB}/lib