[postgis-tickets] r16075 - revise winnie's regess and package script copying to edb install to copy over non-versioned .sql file as well.

[Regina Obe]

Author: robe
Date: 2017-10-28 11:55:00 -0700 (Sat, 28 Oct 2017)
New Revision: 16075

Modified:
   trunk/ci/winnie/package_postgis.sh
   trunk/ci/winnie/regress_postgis.sh
Log:
revise winnie's regess and package script copying to edb install to copy over non-versioned .sql file as well.
Actually unversioned .sql aren't used at all, it was the next.sql scripts that weren't being overridden
references #3921

Modified: trunk/ci/winnie/package_postgis.sh
===================================================================
--- trunk/ci/winnie/package_postgis.sh	2017-10-28 18:38:38 UTC (rev 16074)
+++ trunk/ci/winnie/package_postgis.sh	2017-10-28 18:55:00 UTC (rev 16075)
@@ -197,11 +197,8 @@
 #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/postgis*${POSTGIS_MICRO_VER}next.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

Modified: trunk/ci/winnie/regress_postgis.sh
===================================================================
--- trunk/ci/winnie/regress_postgis.sh	2017-10-28 18:38:38 UTC (rev 16074)
+++ trunk/ci/winnie/regress_postgis.sh	2017-10-28 18:55:00 UTC (rev 16075)
@@ -162,11 +162,8 @@
  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/postgis*${POSTGIS_MICRO_VER}next.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