[postgis-tickets] [SCM] PostGIS branch master updated. 3.2.0-555-g478811906
git at osgeo.org
git at osgeo.org
Thu Feb 17 08:49:49 PST 2022
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "PostGIS".
The branch, master has been updated
via 47881190654a6988c5f136f68e55ecf058885f9d (commit)
from 5c679541c62a90ffbb97f2d9bd25b3da3a4dfe27 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 47881190654a6988c5f136f68e55ecf058885f9d
Author: Sandro Santilli <strk at kbt.io>
Date: Thu Feb 17 17:49:12 2022 +0100
Clean more generated files on `make clean`
diff --git a/extensions/address_standardizer/Makefile.in b/extensions/address_standardizer/Makefile.in
index 6fa6a8f5a..ed18cbce0 100644
--- a/extensions/address_standardizer/Makefile.in
+++ b/extensions/address_standardizer/Makefile.in
@@ -49,15 +49,11 @@ all: sql/address_standardizer.sql sql/address_standardizer--1.0--$(EXTVERSION).
sql/$(EXTENSION)_data_us--$(EXTVERSION)next--$(EXTVERSION).sql sql/$(EXTENSION)_data_us--ANY--$(EXTVERSION).sql \
sql/test-init-extensions.sql sql/test-parseaddress.sql sql/test-standardize_address_1.sql sql/test-standardize_address_2.sql
-EXTRA_CLEAN = sql/
-
-
-
DOCS = README.address_standardizer
PG_CPPFLAGS = @CFLAGS@ @CPPFLAGS@ -DPCRE_VERSION=@PCRE_VERSION@
SHLIB_LINK = @SHLIB_LINK@ @PCRE_LDFLAGS@
-EXTRA_CLEAN = usps-st-city-name.txt mk-st-regexp mk-city-regex test_main
+EXTRA_CLEAN = sql/ usps-st-city-name.txt mk-st-regexp mk-city-regex test_main
REGRESS = test-init-extensions test-parseaddress test-standardize_address_1 test-standardize_address_2
diff --git a/extensions/postgis_tiger_geocoder/Makefile.in b/extensions/postgis_tiger_geocoder/Makefile.in
index bbf691875..49189aec5 100644
--- a/extensions/postgis_tiger_geocoder/Makefile.in
+++ b/extensions/postgis_tiger_geocoder/Makefile.in
@@ -32,7 +32,7 @@ REGRESS = test-normalize_address test-upgrade
REGRESS_OPTS = --load-extension=fuzzystrmatch --load-extension=postgis --load-extension=$(EXTENSION)
SQL_BITS = $(wildcard sql_bits/*.sql)
-EXTRA_CLEAN = sql ${SQL_BITS}
+EXTRA_CLEAN = sql expected ${SQL_BITS}
#test address standardizer if also built
ifeq (@ADDRESS_STANDARDIZER@,address_standardizer)
@@ -76,7 +76,7 @@ expected/test-upgrade.out: sql/test-upgrade.sql | expected
sql/test-pagc_normalize_address.sql: sql_bits/test_tuples_only_unaligned.sql.in ../../extras/tiger_geocoder/regress/pagc_normalize_address_regress.sql | sql
cat $^ > $@
-sql/$(EXTENSION).sql: sql_bits/tiger_geocoder.sql sql_bits/mark_editable_objects.sql.in sql_bits/tiger_geocoder_comments.sql | sql
+sql/$(EXTENSION).sql: sql/tiger_geocoder.sql sql_bits/mark_editable_objects.sql.in sql_bits/tiger_geocoder_comments.sql | sql
cat $^ > $@
sql/$(EXTENSION)--ANY--$(EXTVERSION).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 | sql
@@ -126,7 +126,7 @@ sql/tiger_geocoder_minor.sql.in: ../../extras/tiger_geocoder/utility/set_search_
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 \
+sql/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 \
../../extras/tiger_geocoder/tables/lookup_tables_2011.sql \
@@ -161,19 +161,16 @@ 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
- mkdir -p sql_bits
+ sql/add_search_path.sql | sql
cat $^ > $@
echo "SELECT postgis_extension_drop_if_exists('${EXTENSION}', 'DROP SCHEMA tiger_data');" >> $@
cat @srcdir@/../postgis_extension_helper_uninstall.sql >> $@
-sql_bits/tiger_geocoder.sql: sql_bits/tiger_geocoder.sql.in
- mkdir -p sql_bits
+sql/tiger_geocoder.sql: sql/tiger_geocoder.sql.in
sed -e 's/BEGIN;//g' -e 's/COMMIT;//g' -e '/^CREATE SCHEMA/d;' $< > $@
$(PERL) -pe 's/BEGIN\;//g ; s/COMMIT\;//g' $< > $@
-sql_bits/add_search_path.sql: sql_bits/add_search_path.sql.in
- mkdir -p sql_bits
+sql/add_search_path.sql: sql_bits/add_search_path.sql.in
cp $< $@
../../doc/tiger_geocoder_comments.sql:
@@ -183,20 +180,6 @@ sql_bits/tiger_geocoder_comments.sql: ../../doc/tiger_geocoder_comments.sql
mkdir -p sql_bits
cp $< $@
-#grep all lines that start with CREATE OR REPLACE FUNCTION, TRIGGER...
-#then replace CREATE OR REPLACE .. with ALTER EXTENSION..;
-#then remove default values and extra junk
-# sql/$(EXTENSION)--unpackaged--$(EXTVERSION).sql: ../../tiger_geocoder/tiger_geocoder.sql
-# sed -e '/^CREATE \(OR REPLACE\|TYPE\|TABLE\|VIEW\|CAST\)/!d;' \
-# -e 's/OR REPLACE//g' \
-# -e 's/CREATE\(.*\)/ALTER EXTENSION $(EXTENSION) ADD\1;/' \
-# -e 's/DEFAULT [\.0-9a-zA-Z]\+//g' \
-# -e 's/\(BEFORE\|WITH FUNCTION\)\(.*\)/;/' \
-# -e 's/[ \t]+;/;/' \
-# -e 's/(;/;/' \
-# -e 's/\\(;/;/' \
-# -e 's/;;/;/g' $< > $@
-
#hardcode for now
#TODO: generate via create_unpackaged.pl
sql/$(EXTENSION)--unpackaged--$(EXTVERSION).sql: sql_bits/tiger_geocoder--unpackaged.sql.in | sql
-----------------------------------------------------------------------
Summary of changes:
extensions/address_standardizer/Makefile.in | 6 +-----
extensions/postgis_tiger_geocoder/Makefile.in | 29 ++++++---------------------
2 files changed, 7 insertions(+), 28 deletions(-)
hooks/post-receive
--
PostGIS
More information about the postgis-tickets
mailing list