[postgis-tickets] [SCM] PostGIS branch master updated. 3.3.0rc2-579-gd59cb808d

[git at osgeo.org]

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  d59cb808db2f27f29c14f0cb458195dce445e9d5 (commit)
       via  f8f20befe27987ea3503b1ac03c35085786c54c4 (commit)
      from  c52873a7614bf06315a4914a5da1c499d596792f (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 d59cb808db2f27f29c14f0cb458195dce445e9d5
Author: Sandro Santilli <strk at kbt.io>
Date:   Tue Jan 31 09:20:09 2023 +0100

    Top-level install-extension-upgrades-from-known-versions make target

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 2e0a7181c..a6bb9a269 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -30,6 +30,11 @@ all install uninstall noop clean distclean check-unit:
 		echo "PostGIS was built successfully. Ready to install."; \
 	fi
 
+ifneq (@EXTENSIONS@,)
+install-extension-upgrades-from-known-versions:
+	$(MAKE) -C extensions/ $@
+endif
+
 all: postgis_revision.h
 
 ifeq (@LIBLWGEOM_ONLY@,no)
diff --git a/extensions/Makefile.in b/extensions/Makefile.in
index 0c48b615e..56be75191 100644
--- a/extensions/Makefile.in
+++ b/extensions/Makefile.in
@@ -25,7 +25,7 @@ ifeq (@ADDRESS_STANDARDIZER@,address_standardizer)
 	SUBDIRS += address_standardizer
 endif
 
-all clean distclean install uninstall installcheck:
+all clean distclean install uninstall installcheck install-extension-upgrades-from-known-versions:
 	for DIR in $(SUBDIRS); do \
 		echo "---- Making $@ in $${DIR}"; \
 		$(MAKE) -C "$${DIR}" $@ || exit 1; \

commit f8f20befe27987ea3503b1ac03c35085786c54c4
Author: Sandro Santilli <strk at kbt.io>
Date:   Tue Jan 31 09:19:11 2023 +0100

    Integrate address_standardizer_data_us handling of upgrade paths

diff --git a/extensions/address_standardizer/Makefile.in b/extensions/address_standardizer/Makefile.in
index 653dc5b0f..cbf35ae28 100644
--- a/extensions/address_standardizer/Makefile.in
+++ b/extensions/address_standardizer/Makefile.in
@@ -121,17 +121,20 @@ sql/$(EXTENSION)_data_us--ANY--$(EXTVERSION).sql: sql/$(EXTENSION)_data_us--$(EX
 
 include @srcdir@/../upgrade-paths-rules.mk
 
-install: install-upgrade-paths-data-us
-# address_standardizer is already defined, we have to additionally create
-# the upgrade path scripts for address_standardizer_data_us
-install-upgrade-paths-data-us:
-	tpl='$(EXTENSION)_data_us--ANY--$(EXTVERSION).sql'; \
-	$(INSTALL_DATA) sql/$${tpl} "$(EXTDIR)/$${tpl}"; \
-	ln -fs "$${tpl}" $(EXTDIR)/$(EXTENSION)_data_us--$(EXTVERSION)--$(EXTVERSION)next.sql; \
-	ln -fs "$${tpl}" $(EXTDIR)/$(EXTENSION)_data_us--$(EXTVERSION)next--$(EXTVERSION).sql; \
-	for OLD_VERSION in $(UPGRADEABLE_VERSIONS); do \
-		ln -fs "$${tpl}" $(EXTDIR)/$(EXTENSION)_data_us--$$OLD_VERSION--$(EXTVERSION).sql; \
+# TODO: fix this by moving data in their own directories
+ifeq ($(EXTENSION_DATA_INSTALL),)
+LANGUAGES = us
+install-upgrade-paths: install-upgrade-paths-data
+install-extension-upgrades-from-known-versions: install-extension-upgrades-from-known-versions-data
+install-upgrade-paths-data install-extension-upgrades-from-known-versions-data:
+	TARGET=`echo $@ | sed 's/-data$$//'`; \
+	for lang in $(LANGUAGES); do \
+		EXTENSION_DATA_INSTALL=1 \
+		$(MAKE) $${TARGET} \
+		EXTENSION=$(EXTENSION)_data_$${lang} \
+		|| exit 1; \
 	done
+endif
 
 mk-st-regexp: mk-st-regexp.pl
 	$(PERL) -c mk-st-regexp.pl
diff --git a/loader/postgis.pl b/loader/postgis.pl
index 7b1f5b675..ac1820675 100644
--- a/loader/postgis.pl
+++ b/loader/postgis.pl
@@ -33,6 +33,7 @@ Commands:
 
 my %SUPPORTED_EXTENSIONS = (
 	'address_standardizer' => 1,
+	'address_standardizer_data_us' => 1,
 	'postgis' => 1,
 	'postgis_raster' => 1,
 	'postgis_sfcgal' => 1,

-----------------------------------------------------------------------

Summary of changes:
 GNUmakefile.in                              |  5 +++++
 extensions/Makefile.in                      |  2 +-
 extensions/address_standardizer/Makefile.in | 23 +++++++++++++----------
 loader/postgis.pl                           |  1 +
 4 files changed, 20 insertions(+), 11 deletions(-)


hooks/post-receive
-- 
PostGIS