Output single upgrade script for topology: topology_upgrade.sql

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

diff --git a/.gitignore b/.gitignore
index a0e06108725c37517a7f36ea2533e811404205cd..f5572d29c86c8c7dea97aea65a040a3d73861b07 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -115,8 +115,7 @@ topology/topology_drop_before.sql
 topology/topology_drop_before.sql.in
 topology/topology.sql
 topology/topology.sql.in
-topology/topology_upgrade_*_minor.sql
-topology/topology_upgrade.sql
+topology/topology_upgrade.sql*
 topology/uninstall_topology.sql
 libpgcommon/Makefile
 libpgcommon/cunit/Makefile

diff --git a/regress/run_test.pl b/regress/run_test.pl
index 8e39d956e16375d22a0c07b347209952405a6a1d..dacb15b5d7b1ccef83ab57c027e97b24b3ed6605 100755 (executable)
--- a/regress/run_test.pl
+++ b/regress/run_test.pl
@@ -1177,7 +1177,7 @@ sub upgrade_spatial
     
     if ( $OPT_WITH_TOPO ) 
     {
-        my $script = `ls ${STAGED_SCRIPTS_DIR}/topology_upgrade_*_minor.sql`;
+        my $script = `ls ${STAGED_SCRIPTS_DIR}/topology_upgrade.sql`;
         chomp($script);
         if ( -e $script )
         {

diff --git a/topology/Makefile.in b/topology/Makefile.in
index 6df4e7a064c5d016ee4d49f2923e4380194201d8..5c1af519a221fadf1c5c5dcab91a82bae0f4acdd 100644 (file)
--- a/topology/Makefile.in
+++ b/topology/Makefile.in
@@ -26,7 +26,7 @@ MODULEDIR=contrib/$(PGIS_MODULE_big)
 PGIS_MAJ_MIN=@POSTGIS_MAJOR_VERSION@@POSTGIS_MINOR_VERSION@
 
 # Files to be copied to the contrib/ directory
-DATA_built=topology.sql topology_upgrade_$(PGIS_MAJ_MIN)_minor.sql uninstall_topology.sql
+DATA_built=topology.sql topology_upgrade.sql uninstall_topology.sql
 
 # SQL preprocessor
 SQLPP = @SQLPP@
@@ -79,10 +79,11 @@ endif
 
 #Generate upgrade script by stripping things that can't be reinstalled
 #e.g. don't bother with tables, types, triggers, and domains
-topology_upgrade.sql:  topology.sql
+# TODO: use postgis_proc_upgrade.pl
+topology_upgrade.sql.in:  topology.sql
        $(PERL) -0777 -ne 's/^(CREATE|ALTER) (CAST|OPERATOR|TYPE|TABLE|SCHEMA|DOMAIN|TRIGGER).*?;//msg;print;' $< > $@
 
-topology_upgrade_$(PGIS_MAJ_MIN)_minor.sql:  topology_drop_before.sql topology_upgrade.sql topology_drop_after.sql
+topology_upgrade.sql: topology_drop_before.sql topology_upgrade.sql.in topology_drop_after.sql
        cat $^ > $@
 
 topology.sql: sql/sqlmm.sql.in sql/populate.sql.in sql/polygonize.sql.in sql/export/gml.sql.in sql/export/TopoJSON.sql.in sql/query/getnodebypoint.sql.in sql/query/getedgebypoint.sql.in sql/query/getfacebypoint.sql.in sql/query/GetRingEdges.sql.in sql/query/GetNodeEdges.sql.in sql/manage/TopologySummary.sql.in sql/manage/CopyTopology.sql.in sql/manage/ManageHelper.sql.in sql/topoelement/topoelement_agg.sql.in sql/topogeometry/type.sql.in sql/topogeometry/totopogeom.sql.in sql/topogeometry/cleartopogeom.sql.in sql/topogeometry/simplify.sql.in sql/predicates.sql.in ../postgis/sqldefines.h ../postgis_svn_revision.h