[postgis-tickets] [SCM] PostGIS branch master updated. 3.3.0rc2-580-gdfb471df8
git at osgeo.org
git at osgeo.org
Tue Jan 31 10:38:55 PST 2023
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 dfb471df8db21fd115a38bedabd2911f4dc4e324 (commit)
from d59cb808db2f27f29c14f0cb458195dce445e9d5 (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 dfb471df8db21fd115a38bedabd2911f4dc4e324
Author: Sandro Santilli <strk at kbt.io>
Date: Tue Jan 31 19:37:58 2023 +0100
Add --disable-extension-upgrades-install configure switch
The switch disables automatic install of extension upgrade
scripts, giving a message at the end of `make install` as to
how to manually deal with those.
References #5092
diff --git a/.gitignore b/.gitignore
index 8485dcc10..2a8570a43 100644
--- a/.gitignore
+++ b/.gitignore
@@ -44,6 +44,7 @@ doc/raster_gardentest_*.sql
doc/tiger_geocoder_comments.sql
doc/topology_comments.sql
extensions/Makefile
+extensions/upgrade-paths-rules.mk
extensions/address_standardizer/Makefile
extensions/address_standardizer/mk-st-regexp
extensions/address_standardizer/address_standardizer--*.sql
diff --git a/GNUmakefile.in b/GNUmakefile.in
index a6bb9a269..8c265bc4f 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -29,6 +29,20 @@ all install uninstall noop clean distclean check-unit:
@if test x"$@" = xall; then \
echo "PostGIS was built successfully. Ready to install."; \
fi
+ifneq (@INSTALL_EXTENSION_UPGRADES@,yes)
+ifneq (@EXTENSIONS@,)
+ @if test x"$@" = xinstall; then \
+ echo; \
+ echo "PostGIS extensions installed, upgrade scripts retained."; \
+ echo; \
+ echo "You may use the "postgis" script to only install the ones you need, or";\
+ echo "you can install the ones required to upgrade from currently known versions with:"; \
+ echo; \
+ echo " make install-extension-upgrades-from-known-versions"; \
+ echo; \
+ fi
+endif
+endif
ifneq (@EXTENSIONS@,)
install-extension-upgrades-from-known-versions:
diff --git a/configure.ac b/configure.ac
index 634628f0d..80cd6c8dc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1718,6 +1718,10 @@ then
AC_SUBST([EXTENSIONS])
fi
+INSTALL_EXTENSION_UPGRADES=yes
+AC_ARG_ENABLE([extension-upgrades-install], AS_HELP_STRING([--disable-extension-upgrades-install], [Disable automatic install of extension upgrade scripts]),
+ [INSTALL_EXTENSION_UPGRADES=$enableval])
+AC_SUBST([INSTALL_EXTENSION_UPGRADES])
dnl ===========================================================================
dnl Output the relevant files
@@ -1734,6 +1738,7 @@ dnl echo "TRANSLATIONS_MAKEFILE_LIST: ${TRANSLATIONS_MAKEFILE_LIST}"
AC_CONFIG_FILES([GNUmakefile
extensions/Makefile
+ extensions/upgrade-paths-rules.mk
extensions/postgis/Makefile
extensions/postgis_topology/Makefile
extensions/postgis_tiger_geocoder/Makefile
@@ -1789,7 +1794,6 @@ AC_MSG_RESULT([ -------------- Additional Info ------------- ])
if test "x$LIBINCLUDEMINORVERSION" = "xyes"; then
AC_MSG_RESULT([ POSTGIS lib file includes minor: ENABLED])
fi
-
if test "x$INTERRUPTTESTS" = "xyes"; then
AC_MSG_RESULT([ Interrupt Tests: ENABLED])
else
@@ -1829,6 +1833,15 @@ AC_MSG_RESULT([ Perl: ${PERL}])
AC_MSG_RESULT()
AC_MSG_RESULT([ --------------- Extensions --------------- ])
+if test "x$EXTENSIONS" = "xextensions"; then
+ if test "x$INSTALL_EXTENSION_UPGRADES" = "xyes"; then
+ AC_MSG_RESULT([ PostgreSQL EXTENSION support: enabled])
+ else
+ AC_MSG_RESULT([ PostgreSQL EXTENSION support: enabled (manual install of upgrade paths)])
+ fi
+else
+ AC_MSG_RESULT([ PostgreSQL EXTENSION support: disabled])
+fi
if test "x$RASTER" = "xraster"; then
AC_MSG_RESULT([ PostGIS Raster: enabled])
else
diff --git a/extensions/address_standardizer/Makefile.in b/extensions/address_standardizer/Makefile.in
index cbf35ae28..5fac487c5 100644
--- a/extensions/address_standardizer/Makefile.in
+++ b/extensions/address_standardizer/Makefile.in
@@ -119,7 +119,7 @@ sql/$(EXTENSION)--ANY--$(EXTVERSION).sql: $(EXTENSION_UPGRADE_SCRIPTS)
sql/$(EXTENSION)_data_us--ANY--$(EXTVERSION).sql: sql/$(EXTENSION)_data_us--$(EXTVERSION).sql | sql
cat $^ > $@
-include @srcdir@/../upgrade-paths-rules.mk
+include ../upgrade-paths-rules.mk
# TODO: fix this by moving data in their own directories
ifeq ($(EXTENSION_DATA_INSTALL),)
diff --git a/extensions/postgis/Makefile.in b/extensions/postgis/Makefile.in
index 1d5619bc4..4cd1bdcb2 100644
--- a/extensions/postgis/Makefile.in
+++ b/extensions/postgis/Makefile.in
@@ -140,7 +140,7 @@ sql/$(EXTENSION)--ANY--$(EXTVERSION).sql: $(EXTENSION_UPGRADE_SCRIPTS) | sql
printf '\\echo Use "CREATE EXTENSION $(EXTENSION)" to load this file. \\quit\n' > $@
cat $^ >> $@
-include @srcdir@/../upgrade-paths-rules.mk
+include ../upgrade-paths-rules.mk
distclean: clean
rm -f Makefile
diff --git a/extensions/postgis_raster/Makefile.in b/extensions/postgis_raster/Makefile.in
index 1d061f114..bb78d7a23 100644
--- a/extensions/postgis_raster/Makefile.in
+++ b/extensions/postgis_raster/Makefile.in
@@ -122,7 +122,7 @@ sql/$(EXTENSION)--ANY--$(EXTVERSION).sql: $(EXTENSION_UPGRADE_SCRIPTS) | sql
printf '\\echo Use "CREATE EXTENSION $(EXTENSION)" to load this file. \\quit\n' > $@
cat $^ >> $@
-include @srcdir@/../upgrade-paths-rules.mk
+include ../upgrade-paths-rules.mk
distclean: clean
rm -f Makefile
diff --git a/extensions/postgis_sfcgal/Makefile.in b/extensions/postgis_sfcgal/Makefile.in
index 6acb88a6b..73f828b5b 100644
--- a/extensions/postgis_sfcgal/Makefile.in
+++ b/extensions/postgis_sfcgal/Makefile.in
@@ -94,7 +94,7 @@ sql/sfcgal_upgrade_minor.sql: ../postgis_extension_helper.sql sql/sfcgal_upgrade
sql/$(EXTENSION)--ANY--$(EXTVERSION).sql: $(EXTENSION_UPGRADE_SCRIPTS)
cat $(EXTENSION_UPGRADE_SCRIPTS) > $@
-include @srcdir@/../upgrade-paths-rules.mk
+include ../upgrade-paths-rules.mk
distclean: clean
rm Makefile
diff --git a/extensions/postgis_tiger_geocoder/Makefile.in b/extensions/postgis_tiger_geocoder/Makefile.in
index 8c7df1532..de3d37f57 100644
--- a/extensions/postgis_tiger_geocoder/Makefile.in
+++ b/extensions/postgis_tiger_geocoder/Makefile.in
@@ -205,7 +205,7 @@ sql/tiger_geocoder_upgrade_minor.sql: sql/tiger_geocoder_minor.sql.in | sql
#only extension files
EXTRA_CLEAN += $(wildcard expected/*--*.out)
-include @srcdir@/../upgrade-paths-rules.mk
+include ../upgrade-paths-rules.mk
distclean: clean
rm Makefile
diff --git a/extensions/postgis_topology/Makefile.in b/extensions/postgis_topology/Makefile.in
index e63f8f3d1..763fdb5ac 100644
--- a/extensions/postgis_topology/Makefile.in
+++ b/extensions/postgis_topology/Makefile.in
@@ -99,7 +99,7 @@ sql/topology_upgrade.sql: ../../topology/topology_upgrade.sql | sql
sql/$(EXTENSION)--ANY--$(EXTVERSION).sql: $(EXTENSION_UPGRADE_SCRIPTS)
cat $^ > $@
-include @srcdir@/../upgrade-paths-rules.mk
+include ../upgrade-paths-rules.mk
distclean: clean
rm Makefile
diff --git a/extensions/upgrade-paths-rules.mk b/extensions/upgrade-paths-rules.mk.in
similarity index 92%
rename from extensions/upgrade-paths-rules.mk
rename to extensions/upgrade-paths-rules.mk.in
index 2f6611201..6759dd32a 100644
--- a/extensions/upgrade-paths-rules.mk
+++ b/extensions/upgrade-paths-rules.mk.in
@@ -22,8 +22,10 @@ install-upgrade-paths: tag-as-any
tpl='$(EXTENSION)--ANY--$(EXTVERSION).sql'; \
$(INSTALL_DATA) sql/$${tpl} "$(EXTDIR)/$${tpl}"; \
$(INSTALL_DATA) "sql/$(TAG_UPGRADE)" "$(EXTDIR)/$(TAG_UPGRADE)"; \
- ln -fs "$(TAG_UPGRADE)" $(EXTDIR)/$(EXTENSION)--$(EXTVERSION)--ANY.sql; \
- $(MAKE) install-extension-upgrades-from-known-versions # make this conditional !
+ ln -fs "$(TAG_UPGRADE)" $(EXTDIR)/$(EXTENSION)--$(EXTVERSION)--ANY.sql;
+ifeq (@INSTALL_EXTENSION_UPGRADES@,yes)
+ $(MAKE) install-extension-upgrades-from-known-versions
+endif
install-extension-upgrades-from-known-versions:
$(PERL) $(top_srcdir)/loader/postgis.pl \
-----------------------------------------------------------------------
Summary of changes:
.gitignore | 1 +
GNUmakefile.in | 14 ++++++++++++++
configure.ac | 15 ++++++++++++++-
extensions/address_standardizer/Makefile.in | 2 +-
extensions/postgis/Makefile.in | 2 +-
extensions/postgis_raster/Makefile.in | 2 +-
extensions/postgis_sfcgal/Makefile.in | 2 +-
extensions/postgis_tiger_geocoder/Makefile.in | 2 +-
extensions/postgis_topology/Makefile.in | 2 +-
.../{upgrade-paths-rules.mk => upgrade-paths-rules.mk.in} | 6 ++++--
10 files changed, 39 insertions(+), 9 deletions(-)
rename extensions/{upgrade-paths-rules.mk => upgrade-paths-rules.mk.in} (92%)
hooks/post-receive
--
PostGIS
More information about the postgis-tickets
mailing list