[postgis-tickets] r15887 - Install a single upgrade script and use symlinks for all others

Sandro Santilli strk at kbt.io
Wed Oct 4 11:43:12 PDT 2017


Author: strk
Date: 2017-10-04 11:43:11 -0700 (Wed, 04 Oct 2017)
New Revision: 15887

Modified:
   trunk/extensions/postgis/Makefile.in
Log:
Install a single upgrade script and use symlinks for all others

The real file will be named postgis--ANY--<target>.sql

Modified: trunk/extensions/postgis/Makefile.in
===================================================================
--- trunk/extensions/postgis/Makefile.in	2017-10-04 18:20:00 UTC (rev 15886)
+++ trunk/extensions/postgis/Makefile.in	2017-10-04 18:43:11 UTC (rev 15887)
@@ -34,7 +34,7 @@
 CURV_big=@POSTGIS_MAJOR_VERSION@@POSTGIS_MINOR_VERSION@
 
 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/$(EXTENSION).sql: sql_bits/postgis.sql sql_bits/postgis_comments.sql sql_bits/rtpostgis.sql sql_bits/spatial_ref_sys_config_dump.sql sql_bits/raster_comments.sql sql_bits/spatial_ref_sys.sql
@@ -49,7 +49,7 @@
 sql/$(EXTENSION)--unpackaged--$(EXTVERSION).sql: sql_bits/postgis.sql sql_bits/rtpostgis.sql ../../utils/create_unpackaged.pl
 	mkdir -p sql
 	cat ../../postgis/postgis.sql ../../raster/rt_pg/rtpostgis.sql | $(PERL) ../../utils/create_unpackaged.pl postgis > $@
-	
+
 #this is a cludge to allow upgrading from same SVN to same SVN
 sql/$(EXTENSION)--$(EXTVERSION)--$(EXTVERSION)next.sql: sql_bits/postgis_extension_upgrade_minor.sql
 	cp $< $@
@@ -57,7 +57,7 @@
 	cp $< $@
 
 #strip BEGIN/COMMIT since these are not allowed in extensions
-sql_bits/spatial_ref_sys.sql: ../../spatial_ref_sys.sql	
+sql_bits/spatial_ref_sys.sql: ../../spatial_ref_sys.sql
 	$(PERL) -pe 's/BEGIN\;//g ; s/COMMIT\;//g' $< > $@
 
 #strip BEGIN/COMMIT since these are not allowed in extensions
@@ -70,7 +70,7 @@
 
 sql_bits/postgis_comments.sql: ../../doc/postgis_comments.sql
 	cp $< $@
-		
+
 #strip BEGIN/COMMIT since these are not allowed in extensions
 sql_bits/rtpostgis.sql: ../../raster/rt_pg/rtpostgis_for_extension.sql
 	mkdir -p sql_bits
@@ -79,7 +79,7 @@
 sql_bits/spatial_ref_sys_config_dump.sql: ../../spatial_ref_sys.sql ../../utils/create_spatial_ref_sys_config_dump.pl
 	$(PERL) ../../utils/create_spatial_ref_sys_config_dump.pl $< > $@
 
-sql_bits/rtpostgis_upgrade.sql: ../../raster/rt_pg/rtpostgis_upgrade_for_extension.sql 
+sql_bits/rtpostgis_upgrade.sql: ../../raster/rt_pg/rtpostgis_upgrade_for_extension.sql
 	$(PERL) -pe "s/BEGIN\;//g ; s/COMMIT\;//g; s/^(DROP .*)\;/SELECT postgis_extension_drop_if_exists('$(EXTENSION)', '\1');\n\1\;/" $< > $@
 
 sql_bits/postgis_upgrade.sql: ../../postgis/postgis_upgrade_for_extension.sql
@@ -98,8 +98,9 @@
 	cat $^ >> $@
 
 sql_minor_upgrade: sql_bits/postgis_extension_upgrade_minor.sql
+	cp $< sql/$(EXTENSION)--ANY-$(EXTVERSION).sql
 	for OLD_VERSION in $(UPGRADEABLE_VERSIONS); do \
-  	  cat $< > sql/$(EXTENSION)--$$OLD_VERSION--$(EXTVERSION).sql; \
+		ln -fs $(EXTENSION)--ANY-$(EXTVERSION).sql sql/$(EXTENSION)--$$OLD_VERSION--$(EXTVERSION).sql; \
 	done
 
 DATA = $(wildcard sql/*--*.sql)



More information about the postgis-tickets mailing list