Change how we calculate minor versions suitable for extension upgrade.

git-svn-id: http://svn.osgeo.org/postgis/trunk@9043 b70326c6-7e19-0410-871a-916f4a2858ee

diff --git a/HOWTO_RELEASE b/HOWTO_RELEASE
index 2374a6b203f7271924d810b8a374bfc2402ce7a6..73091316811e4d708471b072c94fe9f98bb1998b 100644 (file)
--- a/HOWTO_RELEASE
+++ b/HOWTO_RELEASE
@@ -47,6 +47,7 @@ Release procedure
 7) Checkout tag:
    svn checkout http://svn.osgeo.org/postgis/tags/x.x.x
 8) Update Version.config as specified in Versioning Scheme above.
+8a) Ensure all the previous minor versions are listed in extension/upgradeable_versions.mk
 9) Commit your version number change to the tag.
 10) Run: sh make_dist.sh x.x.x
 11) Copy tarball to web site and edit downloads page

diff --git a/extensions/postgis/Makefile.in b/extensions/postgis/Makefile.in
index 7f433d0d4b1b808a1ad2f6d6f38debe36749c6ab..0a4280b20233b096fdf4a1568510997f3e0b4767 100644 (file)
--- a/extensions/postgis/Makefile.in
+++ b/extensions/postgis/Makefile.in
@@ -1,3 +1,5 @@
+include ../upgradeable_versions.mk
+
 EXTENSION     = postgis
 EXTVERSION    = @POSTGIS_LIB_VERSION@
 MINORVERSION  = @POSTGIS_MAJOR_VERSION@.@POSTGIS_MINOR_VERSION@
@@ -28,6 +30,7 @@ EXTRA_CLEAN += ${SQL_BITS} sql/*.sql
 ifeq ($(PG91),yes)
 sql/$(EXTENSION).sql: sql_bits/postgis.sql sql_bits/postgis_comments.sql sql_bits/rtpostgis.sql sql_bits/raster_comments.sql sql_bits/spatial_ref_sys.sql
        cat $^ > $@
+       
 all: sql/$(EXTENSION)--$(EXTVERSION).sql sql_minor_upgrade
 
 sql/$(EXTENSION)--$(EXTVERSION).sql: sql/$(EXTENSION).sql
@@ -36,9 +39,10 @@ sql/$(EXTENSION)--$(EXTVERSION).sql: sql/$(EXTENSION).sql
 sql/$(EXTENSION)--unpackaged--$(EXTVERSION).sql: sql_bits/rtpostgis--unpackaged.sql sql_bits/postgis--unpackaged.sql
        cat $^ > $@
 
+#strip BEGIN/COMMIT since these are not allowed in extensions
 sql_bits/spatial_ref_sys.sql: ../../spatial_ref_sys.sql        
        sed -e 's/BEGIN;//g' -e 's/COMMIT;//g'  $< > $@
-       #cp $< $@
+
 #strip BEGIN/COMMIT since these are not allowed in extensions
 sql_bits/postgis.sql: ../../postgis/postgis.sql
        sed -e 's/BEGIN;//g' -e 's/COMMIT;//g'  $< > $@
@@ -119,22 +123,10 @@ sql_bits/postgis--unpackaged.sql:   ../../postgis/postgis.sql
                -e 's/\\(;/;/' \
                -e 's/;;/;/g' $< > $@
 
-sql_minor_upgrade: sql_bits/postgis_raster_upgrade_minor.sql
-       if test "$(PREREL_NUMBER)x" != "x"; then \
-          v=$(PREREL_PREV); \
-          while [[ $$v -ge 1 ]]; do \
-              cp -v $< sql/$(EXTENSION)--$(MINORVERSION).$(PREREL_PREFIX)$$v--$(EXTVERSION).sql; \
-              v=$$(($$v-1)); \
-            done; \
-       else \
-         if test $(MICRO_NUMBER) -gt 0; then \
-          v=0; \
-          while [[ $$v -le $(MICRO_PREV) ]]; do \
-             cp -v $< sql/$(EXTENSION)--$(MINORVERSION).$$v--$(EXTVERSION).sql; \
-              v=$$(($$v+1)); \
-           done; \
-         fi; \
-        fi
+sql_minor_upgrade: sql_bits/postgis_upgrade_minor.sql sql_bits/postgis_raster_upgrade_minor.sql
+       for OLD_VERSION in $(UPGRADEABLE_VERSIONS); do \
+         cat $< > sql/$(EXTENSION)--$$OLD_VERSION--$(EXTVERSION).sql; \
+       done
 
 DATA = $(wildcard sql/*--*.sql) sql/$(EXTENSION)--$(EXTVERSION).sql
 EXTRA_CLEAN += sql/$(EXTENSION)--$(EXTVERSION).sql

diff --git a/extensions/postgis_topology/Makefile.in b/extensions/postgis_topology/Makefile.in
index 9257d195c78d9d9a51a06526960a97b6426f42fa..fc9468903ae14a8c14110a8fc5cea2768d277fc3 100644 (file)
--- a/extensions/postgis_topology/Makefile.in
+++ b/extensions/postgis_topology/Makefile.in
@@ -1,3 +1,5 @@
+include ../upgradeable_versions.mk
+
 EXTENSION    = postgis_topology
 EXTVERSION    = @POSTGIS_LIB_VERSION@
 MINORVERSION  = @POSTGIS_MAJOR_VERSION@.@POSTGIS_MINOR_VERSION@
@@ -68,24 +70,12 @@ sql/topology_upgrade_minor.sql:  sql_bits/topology.sql
         sed -e '/^\(CREATE\|ALTER\) \(CAST\|TYPE\|TABLE\|SCHEMA\|DOMAIN\|TRIGGER\).*;/d' \
                 -e '/^\(CREATE\|ALTER\) \(CAST\|TYPE\|TABLE\|SCHEMA\|DOMAIN\|TRIGGER\)/,/\;/d' \
                 $< > $@
-
-sql_minor_upgrade: ../postgis_extension_helper.sql sql_bits/remove_from_extension.sql.in sql/topology_upgrade_minor.sql sql_bits/topology_comments.sql ../postgis_extension_helper_uninstall.sql
-       if test "$(PREREL_NUMBER)x" != "x"; then \
-          v=$(PREREL_PREV); \
-          while [[ $$v -ge 1 ]]; do \
-              cat $< > sql/$(EXTENSION)--$(MINORVERSION).$(PREREL_PREFIX)$$v--$(EXTVERSION).sql; \
-              v=$$(($$v-1)); \
-            done; \
-       else \
-         if test $(MICRO_NUMBER) -gt 0; then \
-          v=0; \
-          while [[ $$v -le $(MICRO_PREV) ]]; do \
-           cat $< > sql/$(EXTENSION)--$(MINORVERSION).$(PREREL_PREFIX)$$v--$(EXTVERSION).sql; \
-              v=$$(($$v+1)); \
-           done; \
-         fi; \
-        fi
        
+sql_minor_upgrade: ../postgis_extension_helper.sql sql_bits/remove_from_extension.sql.in sql/topology_upgrade_minor.sql sql_bits/topology_comments.sql ../postgis_extension_helper_uninstall.sql
+       for OLD_VERSION in $(UPGRADEABLE_VERSIONS); do \
+         cat $< > sql/$(EXTENSION)--$$OLD_VERSION--$(EXTVERSION).sql; \
+       done
+
 DATA = $(wildcard sql/*--*.sql) sql/$(EXTENSION)--$(EXTVERSION).sql
 EXTRA_CLEAN += sql/$(EXTENSION)--$(EXTVERSION).sql sql/$(EXTENSION)--unpackaged--$(EXTVERSION).sql
 endif

diff --git a/extensions/upgradeable_versions.mk b/extensions/upgradeable_versions.mk
new file mode 100644 (file)
index 0000000..893a4e4
--- /dev/null
+++ b/extensions/upgradeable_versions.mk
@@ -0,0 +1,4 @@
+UPGRADEABLE_VERSIONS = \
+       2.0.0alpha1 \
+       2.0.0alpha2 \
+       2.0.0alpha3