From 04e8d00d8b55df69705c316fb2feecce23a29bfc Mon Sep 17 00:00:00 2001 From: Sandro Santilli Date: Wed, 4 Oct 2017 18:43:11 +0000 Subject: [PATCH] Install a single upgrade script and use symlinks for all others The real file will be named postgis--ANY--.sql git-svn-id: http://svn.osgeo.org/postgis/trunk@15887 b70326c6-7e19-0410-871a-916f4a2858ee --- extensions/postgis/Makefile.in | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/extensions/postgis/Makefile.in b/extensions/postgis/Makefile.in index 1193c0959..2bd24be85 100644 --- a/extensions/postgis/Makefile.in +++ b/extensions/postgis/Makefile.in @@ -34,7 +34,7 @@ EXTRA_CLEAN += ${SQL_BITS} sql/*.sql 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)--$(EXTVERSION).sql: sql/$(EXTENSION).sql 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 @@ sql/$(EXTENSION)--$(EXTVERSION)next--$(EXTVERSION).sql: sql_bits/postgis_extensi 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.sql: ../../postgis/postgis_for_extension.sql 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/rtpostgis.sql: ../../raster/rt_pg/rtpostgis_for_extension.sql 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 @@ sql_bits/postgis_extension_upgrade_minor.sql: ../postgis_extension_helper.sql sq 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) -- 2.40.0