[postgis-tickets] r16247 - Generalize upgrade paths extension installs

[Sandro Santilli]

Author: strk
Date: 2018-01-10 03:35:22 -0800 (Wed, 10 Jan 2018)
New Revision: 16247

Added:
   trunk/extensions/upgrade-paths-rules.mk
Modified:
   trunk/extensions/postgis/Makefile.in
   trunk/extensions/postgis_topology/Makefile.in
Log:
Generalize upgrade paths extension installs

Modified: trunk/extensions/postgis/Makefile.in
===================================================================
--- trunk/extensions/postgis/Makefile.in	2018-01-09 20:52:25 UTC (rev 16246)
+++ trunk/extensions/postgis/Makefile.in	2018-01-10 11:35:22 UTC (rev 16247)
@@ -135,31 +135,8 @@
 	printf '\\echo Use "CREATE EXTENSION $(EXTENSION)" to load this file. \\quit\n' > $@
 	cat $^ >> $@
 
-EXTDIR=$(DESTDIR)$(datadir)/$(datamoduledir)
+include ../upgrade-paths-rules.mk
 
-install: install-upgrade-paths
-
-# The "next" lines are a cludge to allow upgrading between different
-# revisions of the same version
-install-upgrade-paths:
-	tpl='$(EXTENSION)--ANY--$(EXTVERSION).sql'; \
-	$(INSTALL_DATA) sql/$${tpl} "$(EXTDIR)/$${tpl}"; \
-	ln -fs "$${tpl}" $(EXTDIR)/$(EXTENSION)--$(EXTVERSION)--$(EXTVERSION)next.sql; \
-	ln -fs "$${tpl}" $(EXTDIR)/$(EXTENSION)--$(EXTVERSION)next--$(EXTVERSION).sql; \
-	for OLD_VERSION in $(UPGRADEABLE_VERSIONS); do \
-		ln -fs "$${tpl}" $(EXTDIR)/$(EXTENSION)--$$OLD_VERSION--$(EXTVERSION).sql; \
-	done
-
-uninstall: uninstall-upgrade-paths
-
-INSTALLED_UPGRADE_SCRIPTS = \
-	$(wildcard $(EXTDIR)/*$(EXTVERSION).sql) \
-	$(wildcard $(EXTDIR)/*$(EXTVERSION)next.sql) \
-	$(NULL)
-
-uninstall-upgrade-paths:
-	rm -f $(INSTALLED_UPGRADE_SCRIPTS)
-
 distclean: clean
 	rm -f Makefile
 

Modified: trunk/extensions/postgis_topology/Makefile.in
===================================================================
--- trunk/extensions/postgis_topology/Makefile.in	2018-01-09 20:52:25 UTC (rev 16246)
+++ trunk/extensions/postgis_topology/Makefile.in	2018-01-10 11:35:22 UTC (rev 16247)
@@ -81,34 +81,8 @@
 sql/$(EXTENSION)--ANY--$(EXTVERSION).sql: $(EXTENSION_UPGRADE_SCRIPTS)
 	cat $(EXTENSION_UPGRADE_SCRIPTS) > $@
 
-EXTDIR=$(DESTDIR)$(datadir)/$(datamoduledir)
+include ../upgrade-paths-rules.mk
 
-install: install-upgrade-paths
-
-# The "next" lines are a cludge to allow upgrading between different
-# revisions of the same version
-install-upgrade-paths:
-	tpl='$(EXTENSION)--ANY--$(EXTVERSION).sql'; \
-	$(INSTALL_DATA) sql/$${tpl} "$(EXTDIR)/$${tpl}"; \
-	ln -fs "$${tpl}" $(EXTDIR)/$(EXTENSION)--$(EXTVERSION)--$(EXTVERSION)next.sql; \
-	ln -fs "$${tpl}" $(EXTDIR)/$(EXTENSION)--$(EXTVERSION)next--$(EXTVERSION).sql; \
-	for OLD_VERSION in $(UPGRADEABLE_VERSIONS); do \
-		ln -fs "$${tpl}" $(EXTDIR)/$(EXTENSION)--$$OLD_VERSION--$(EXTVERSION).sql; \
-	done
-
-uninstall: uninstall-upgrade-paths
-
-INSTALLED_UPGRADE_SCRIPTS = \
-	$(wildcard $(EXTDIR)/*$(EXTVERSION).sql) \
-	$(wildcard $(EXTDIR)/*$(EXTVERSION)next.sql) \
-	$(NULL)
-
-uninstall-upgrade-paths:
-	rm -f $(INSTALLED_UPGRADE_SCRIPTS)
-
-DATA = $(wildcard sql/*--*.sql)
-EXTRA_CLEAN += sql/$(EXTENSION)--$(EXTVERSION).sql sql/$(EXTENSION)--unpackaged--$(EXTVERSION).sql
-
 distclean: clean
 	rm Makefile
 

Added: trunk/extensions/upgrade-paths-rules.mk
===================================================================
--- trunk/extensions/upgrade-paths-rules.mk	                        (rev 0)
+++ trunk/extensions/upgrade-paths-rules.mk	2018-01-10 11:35:22 UTC (rev 16247)
@@ -0,0 +1,24 @@
+EXTDIR=$(DESTDIR)$(datadir)/$(datamoduledir)
+
+install: install-upgrade-paths
+
+# The "next" lines are a cludge to allow upgrading between different
+# revisions of the same version
+install-upgrade-paths:
+	tpl='$(EXTENSION)--ANY--$(EXTVERSION).sql'; \
+	$(INSTALL_DATA) sql/$${tpl} "$(EXTDIR)/$${tpl}"; \
+	ln -fs "$${tpl}" $(EXTDIR)/$(EXTENSION)--$(EXTVERSION)--$(EXTVERSION)next.sql; \
+	ln -fs "$${tpl}" $(EXTDIR)/$(EXTENSION)--$(EXTVERSION)next--$(EXTVERSION).sql; \
+	for OLD_VERSION in $(UPGRADEABLE_VERSIONS); do \
+		ln -fs "$${tpl}" $(EXTDIR)/$(EXTENSION)--$$OLD_VERSION--$(EXTVERSION).sql; \
+	done
+
+uninstall: uninstall-upgrade-paths
+
+INSTALLED_UPGRADE_SCRIPTS = \
+	$(wildcard $(EXTDIR)/*$(EXTVERSION).sql) \
+	$(wildcard $(EXTDIR)/*$(EXTVERSION)next.sql) \
+	$(NULL)
+
+uninstall-upgrade-paths:
+	rm -f $(INSTALLED_UPGRADE_SCRIPTS)