From ccc58d3424f1431c195cb03e4f1e4c672c3a375f Mon Sep 17 00:00:00 2001 From: Regina Obe Date: Sat, 28 Oct 2017 18:55:00 +0000 Subject: [PATCH] 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 git-svn-id: http://svn.osgeo.org/postgis/trunk@16075 b70326c6-7e19-0410-871a-916f4a2858ee --- ci/winnie/package_postgis.sh | 5 +---- ci/winnie/regress_postgis.sh | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/ci/winnie/package_postgis.sh b/ci/winnie/package_postgis.sh index 1d332a00d..92d68ae9f 100644 --- a/ci/winnie/package_postgis.sh +++ b/ci/winnie/package_postgis.sh @@ -197,11 +197,8 @@ 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/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 diff --git a/ci/winnie/regress_postgis.sh b/ci/winnie/regress_postgis.sh index 4067bfe10..0457f5e03 100644 --- a/ci/winnie/regress_postgis.sh +++ b/ci/winnie/regress_postgis.sh @@ -162,11 +162,8 @@ 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/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 -- 2.40.0