From bad994dc385801aa25a602b71d149e9dbca9ec8f Mon Sep 17 00:00:00 2001 From: Regina Obe Date: Sat, 30 Jul 2016 16:56:43 +0000 Subject: [PATCH] perl as found by configure is not used in tiger, sfcgal, or address_standardizer extensions references #3602 for PostGIS 2.3 (trunk) tiger_data not being backed up and add upgrade test references #3515 for PostGIS 2.3 (trunk) git-svn-id: http://svn.osgeo.org/postgis/trunk@15026 b70326c6-7e19-0410-871a-916f4a2858ee --- extensions/address_standardizer/Makefile.in | 2 +- extensions/postgis_sfcgal/Makefile.in | 1 + extensions/postgis_tiger_geocoder/Makefile.in | 27 ++++++++++++++----- 3 files changed, 23 insertions(+), 7 deletions(-) diff --git a/extensions/address_standardizer/Makefile.in b/extensions/address_standardizer/Makefile.in index 8d5a41a58..22b23a621 100644 --- a/extensions/address_standardizer/Makefile.in +++ b/extensions/address_standardizer/Makefile.in @@ -170,4 +170,4 @@ EXTRA_CLEAN += sql/$(EXTENSION)--$(EXTVERSION).sql sql/$(EXTENSION)--unpackaged- PGXS := @PGXS@ include $(PGXS) - +PERL = @PERL@ diff --git a/extensions/postgis_sfcgal/Makefile.in b/extensions/postgis_sfcgal/Makefile.in index 3d5b34908..707a34915 100644 --- a/extensions/postgis_sfcgal/Makefile.in +++ b/extensions/postgis_sfcgal/Makefile.in @@ -91,3 +91,4 @@ distclean: clean PGXS := $(shell $(PG_CONFIG) --pgxs) include $(PGXS) +PERL = @PERL@ diff --git a/extensions/postgis_tiger_geocoder/Makefile.in b/extensions/postgis_tiger_geocoder/Makefile.in index b454b4f2b..030287cdb 100644 --- a/extensions/postgis_tiger_geocoder/Makefile.in +++ b/extensions/postgis_tiger_geocoder/Makefile.in @@ -23,7 +23,7 @@ PREREL_PREFIX = $(shell echo $(EXTVERSION) | \ $(PERL) -pe 's/(\d+[a-zA-Z]+)\d*/\1/' DATA = $(filter-out $(wildcard sql/*--*.sql),$(wildcard sql/*.sql)) -REGRESS = test-normalize_address +REGRESS = test-normalize_address test-upgrade REGRESS_OPTS = --load-extension=fuzzystrmatch --load-extension=postgis --load-extension=$(EXTENSION) PG_CONFIG = @PG_CONFIG@ @@ -39,7 +39,7 @@ ifeq (@ADDRESS_STANDARDIZER@,address_standardizer) endif ifeq ($(PG91),yes) -all: sql/$(EXTENSION)--$(EXTVERSION).sql sql/$(EXTENSION)--unpackaged--$(EXTVERSION).sql sql/$(EXTENSION)--$(EXTVERSION)--$(EXTVERSION)next.sql sql/$(EXTENSION)--$(EXTVERSION)next--$(EXTVERSION).sql sql_minor_upgrade sql/test-normalize_address.sql sql/test-pagc_normalize_address.sql expected/test-normalize_address.out expected/test-pagc_normalize_address.out sql/$(EXTENSION)--$(EXTVERSION)next--$(EXTVERSION).sql sql_minor_upgrade +all: sql/$(EXTENSION)--$(EXTVERSION).sql sql/$(EXTENSION)--unpackaged--$(EXTVERSION).sql sql/$(EXTENSION)--$(EXTVERSION)--$(EXTVERSION)next.sql sql/$(EXTENSION)--$(EXTVERSION)next--$(EXTVERSION).sql sql_minor_upgrade sql/test-normalize_address.sql sql/test-pagc_normalize_address.sql expected/test-normalize_address.out expected/test-pagc_normalize_address.out sql/test-upgrade.sql expected/test-upgrade.out sql/$(EXTENSION)--$(EXTVERSION)next--$(EXTVERSION).sql sql_minor_upgrade sql/$(EXTENSION)--$(EXTVERSION).sql: sql/$(EXTENSION).sql mkdir -p sql @@ -58,6 +58,13 @@ sql/test-normalize_address.sql: sql_bits/test_tuples_only_unaligned.sql.in ../.. mkdir -p sql cat $^ > $@ +sql/test-upgrade.sql: + mkdir -p sql + echo 'ALTER EXTENSION ${EXTENSION} UPDATE TO "$(EXTVERSION)next"' > $@ + +expected/test-upgrade.out: sql/test-upgrade.sql + cp $< $@ + sql/test-pagc_normalize_address.sql: sql_bits/test_tuples_only_unaligned.sql.in ../../extras/tiger_geocoder/regress/pagc_normalize_address_regress.sql mkdir -p sql cat $^ > $@ @@ -67,9 +74,13 @@ sql/$(EXTENSION).sql: sql_bits/tiger_geocoder.sql sql_bits/mark_editable_object cat $^ > $@ #this is a cludge to allow upgrading from same SVN to same SVN -sql/$(EXTENSION)--$(EXTVERSION)--$(EXTVERSION)next.sql: ../postgis_extension_helper.sql sql_bits/remove_from_extension.sql.in sql/tiger_geocoder_upgrade_minor.sql sql_bits/mark_editable_objects.sql.in sql_bits/tiger_geocoder_comments.sql ../postgis_extension_helper_uninstall.sql +sql/$(EXTENSION)--$(EXTVERSION)--$(EXTVERSION)next.sql: ../postgis_extension_helper.sql sql_bits/remove_from_extension.sql.in sql/tiger_geocoder_upgrade_minor.sql sql_bits/mark_editable_objects.sql.in sql_bits/tiger_geocoder_comments.sql mkdir -p sql cat $^ > $@ + echo "SELECT postgis_extension_drop_if_exists('${EXTENSION}', 'DROP SCHEMA tiger_data');" >> $@ + cat ../postgis_extension_helper_uninstall.sql >> $@ + + sql/$(EXTENSION)--$(EXTVERSION)next--$(EXTVERSION).sql: sql/$(EXTENSION)--$(EXTVERSION)--$(EXTVERSION)next.sql @@ -79,6 +90,7 @@ sql/$(EXTENSION)--$(EXTVERSION)next--$(EXTVERSION).sql: sql/$(EXTENSION)--$(EXTV #strip BEGIN/COMMIT since these are not allowed in extensions #strip CREATE SCHEMA since we force extension # to create schema by setting schema to tiger_geocoder in control +#also remove tiger_data from extension if it is part of it sql_bits/tiger_geocoder_minor.sql.in: ../../extras/tiger_geocoder/utility/set_search_path.sql \ ../../extras/tiger_geocoder/geocode_settings.sql \ ../../extras/tiger_geocoder/tiger_loader_2015.sql \ @@ -111,6 +123,7 @@ sql_bits/tiger_geocoder_minor.sql.in: ../../extras/tiger_geocoder/utility/set_se ../../extras/tiger_geocoder/geocode/census_tracts_functions.sql cat $^ > $@ +#also remove tiger_data from extension if it is part of it so data gets backed up sql_bits/tiger_geocoder.sql.in: sql_bits/norm_addy_create.sql.in \ ../../extras/tiger_geocoder/utility/set_search_path.sql \ ../../extras/tiger_geocoder/geocode_settings.sql \ @@ -146,9 +159,10 @@ sql_bits/tiger_geocoder.sql.in: sql_bits/norm_addy_create.sql.in \ ../../extras/tiger_geocoder/geocode/census_tracts_functions.sql \ ../../extras/tiger_geocoder/topology/tiger_topology_loader.sql \ ../postgis_extension_helper.sql \ - sql_bits/add_search_path.sql \ - ../postgis_extension_helper_uninstall.sql + sql_bits/add_search_path.sql cat $^ > $@ + echo "SELECT postgis_extension_drop_if_exists('${EXTENSION}', 'DROP SCHEMA tiger_data');" >> $@ + cat ../postgis_extension_helper_uninstall.sql >> $@ sql_bits/tiger_geocoder.sql: sql_bits/tiger_geocoder.sql.in sed -e 's/BEGIN;//g' -e 's/COMMIT;//g' -e '/^CREATE SCHEMA/d;' $< > $@ @@ -198,7 +212,7 @@ sql/tiger_geocoder_upgrade_minor.sql: sql_bits/tiger_geocoder_minor.sql.in -e 's/BEGIN;//g' -e 's/COMMIT;//g' \ $< > $@ -sql_minor_upgrade: ../postgis_extension_helper.sql sql_bits/remove_from_extension.sql.in sql/tiger_geocoder_upgrade_minor.sql sql_bits/mark_editable_objects.sql.in sql_bits/tiger_geocoder_comments.sql ../postgis_extension_helper_uninstall.sql +sql_minor_upgrade: sql/$(EXTENSION)--$(EXTVERSION)--$(EXTVERSION)next.sql for OLD_VERSION in $(UPGRADEABLE_VERSIONS); do \ cat $^ > sql/$(EXTENSION)--$$OLD_VERSION--$(EXTVERSION).sql; \ done @@ -214,3 +228,4 @@ distclean: clean PGXS := $(shell $(PG_CONFIG) --pgxs) include $(PGXS) +PERL=@PERL@ -- 2.40.0