merge postgis and raster into a single extension called "postgis", revise postgis_top...

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

diff --git a/extensions/postgis_core/META.json b/extensions/postgis/META.json
similarity index 74%
rename from extensions/postgis_core/META.json
rename to extensions/postgis/META.json
index 4460976c4868976a7d6a13cd37f6e4476a162a29..9c0800bde8d6c754916ab92de83a3488b8a4e6ae 100644 (file)
--- a/extensions/postgis_core/META.json
+++ b/extensions/postgis/META.json
@@ -1,8 +1,8 @@
 {\r
        "name": "postgis",\r
        "abstract": "PostGIS 2.0 OGC/SQL-MM compliant spatial extender for PostgreSQL",\r
-       "description": "This module provides GIS geometry and geography types, functions, and tables",\r
-       "version": "2.0.0",\r
+       "description": "This module provides GIS geometry, geography, raster types, functions, and tables",\r
+       "version": "2.0.0a1",\r
        "release_status": "unstable",\r
        "maintainer": "PostGIS Steering Committee",\r
        "license": "gpl_2",\r
@@ -10,13 +10,18 @@
                "postgis": {\r
                        "abstract": "PostGIS GIS types, indexes and functions",\r
                        "version": "2.0.0",\r
-                       "file": "sql/postgis_core.sql",\r
+                       "file": "sql/postgis.sql",\r
                        "docfile": "doc/postgis.md"\r
-               }\r
+               },\r
          "spatial_ref_sys": {\r
            "file": "sql/spatial_ref_sys.sql",\r
            "version": "2.0.0",\r
            "abstract": "Directory of spatial reference systems needed for geometry transformation between different spatial reference systems"\r
+         },\r
+        "raster": {\r
+           "file": "sql/rtpostgis.sql",\r
+           "version": "2.0.0",\r
+           "abstract": "Raster functions and types"\r
          }\r
        },\r
        "prereqs": {\r
@@ -45,7 +50,7 @@
        "tags": [\r
                "gis",\r
                "spatial",\r
-               "geometry",\r
+               "geometry","raster",\r
                "geography",\r
                "location"\r
        ]\r

diff --git a/extensions/postgis_core/Makefile b/extensions/postgis/Makefile
similarity index 75%
rename from extensions/postgis_core/Makefile
rename to extensions/postgis/Makefile
index 28bff0a1a590c24761a94cc4350c38f46f2a0fd2..5e85e61ca53734f04f5e95bfe8e77944baec6f98 100644 (file)
--- a/extensions/postgis_core/Makefile
+++ b/extensions/postgis/Makefile
@@ -1,4 +1,4 @@
-EXTENSION    = postgis_core
+EXTENSION    = postgis
 EXTVERSION   = $(shell grep default_version $(EXTENSION).control | \
                sed -e "s/default_version[[:space:]]*=[[:space:]]*'\([^']*\)'/\1/")
 
@@ -13,7 +13,7 @@ EXTRA_CLEAN += sql/$(EXTENSION).sql ${SQL_BITS}
 
 
 ifeq ($(PG91),yes)
-sql/$(EXTENSION).sql: sql_bits/postgis.sql sql_bits/postgis_comments.sql sql_bits/spatial_ref_sys.sql
+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
 
@@ -29,6 +29,16 @@ sql_bits/postgis.sql: ../../postgis/postgis.sql
        
 sql_bits/postgis_comments.sql: ../../doc/postgis_comments.sql
        cp $< $@
+       
+sql/$(EXTENSION).sql: 
+       cat $^ > $@
+       
+#strip BEGIN/COMMIT since these are not allowed in extensions
+sql_bits/rtpostgis.sql: ../../raster/rt_pg/rtpostgis.sql
+       sed -e 's/BEGIN;//g' -e 's/COMMIT;//g'  $< > $@
+       
+sql_bits/raster_comments.sql: ../../doc/raster_comments.sql
+       cp $< $@
 
 DATA = $(wildcard sql/*--*.sql) sql/$(EXTENSION)--$(EXTVERSION).sql
 EXTRA_CLEAN += sql/$(EXTENSION)--$(EXTVERSION).sql

diff --git a/extensions/postgis_core/doc/postgis.md b/extensions/postgis/doc/postgis.md
similarity index 100%
rename from extensions/postgis_core/doc/postgis.md
rename to extensions/postgis/doc/postgis.md

diff --git a/extensions/postgis/postgis.control b/extensions/postgis/postgis.control
new file mode 100644 (file)
index 0000000..932825e
--- /dev/null
+++ b/extensions/postgis/postgis.control
@@ -0,0 +1,5 @@
+# postgis extension
+comment = 'postgis geometry,geography, and raster spatial types and functions'
+default_version = '2.0.0a1'
+module_pathname = '$libdir/postgis-2.0'
+relocatable = true

diff --git a/extensions/postgis_core/postgis_core.control b/extensions/postgis_core/postgis_core.control
deleted file mode 100644 (file)
index c44c513..0000000
--- a/extensions/postgis_core/postgis_core.control
+++ /dev/null
@@ -1,5 +0,0 @@
-# postgis extension
-comment = 'postgis geometry and geography sql-mm spatial types and functions'
-default_version = '2.0.0'
-module_pathname = '$libdir/postgis-2.0'
-relocatable = true

diff --git a/extensions/postgis_raster/META.json b/extensions/postgis_raster/META.json
deleted file mode 100644 (file)
index f62b13f..0000000
--- a/extensions/postgis_raster/META.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{\r
-       "name": "postgis_raster",\r
-       "abstract": "PostGIS 2.0 OGC/SQL-MM compliant spatial extender for PostgreSQL",\r
-       "description": "This module provides GIS geometry and geography types and functions",\r
-       "version": "2.0.0",\r
-       "release_status": "unstable",\r
-       "maintainer": "PostGIS Steering Committee",\r
-       "license": "gpl_2",\r
-       "provides": {\r
-               "postgis_raster": {\r
-                       "abstract": "PostGIS Raster types, indexes and functions",\r
-                       "version": "2.0.0",\r
-                       "file": "sql/postgis_raster.sql",\r
-                       "docfile": "doc/postgis.md"\r
-               }\r
-       }\r
-       "prereqs": {\r
-      "runtime": {\r
-         "requires": {\r
-            "plpgsql": 0,\r
-            "PostgreSQL": "8.4.0",\r
-            "postgis_core": "2.0.0"\r
-         }\r
-      }\r
-    },\r
-    "generated_by": "Regina O. Obe",\r
-       "resources": {\r
-               "bugtracker": {\r
-                       "web": "http://trac.osgeo.org/postgis"\r
-               },\r
-               "repository": {\r
-                       "url": "svn://svn.osgeo.org/postgis/",\r
-                       "web": "http://www.postgis.org",\r
-                       "type": "svn"\r
-               }\r
-       },\r
-       "meta-spec": {\r
-               "version": "1.0.0",\r
-               "url": "http://pgxn.org/meta/spec.txt"\r
-       },\r
-       "tags": [\r
-               "gis",\r
-               "spatial",\r
-               "geometry",\r
-               "geography",\r
-               "location", "raster"\r
-       ]\r
-}\r

diff --git a/extensions/postgis_raster/Makefile b/extensions/postgis_raster/Makefile
deleted file mode 100644 (file)
index b6131f4..0000000
--- a/extensions/postgis_raster/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-EXTENSION    = postgis_raster
-EXTVERSION   = $(shell grep default_version $(EXTENSION).control | sed -e "s/default_version[[:space:]]*=[[:space:]]*'\([^']*\)'/\1/")
-
-DATA         = $(filter-out $(wildcard sql/*--*.sql),$(wildcard sql/*.sql))
-
-PG_CONFIG    = pg_config
-# SQL objects (files requiring C pre-processing)
-#SQL_OBJS=postgis.sql.in
-PG91         = $(shell $(PG_CONFIG) --version | grep -qE " 8\.| 9\.0" && echo no || echo yes)
-SQL_BITS     = $(wildcard sql_bits/*.sql)
-EXTRA_CLEAN += sql/$(EXTENSION).sql ${SQL_BITS}
-
-sql/$(EXTENSION).sql: $(SQL_BITS)
-       cat $^ > $@
-
-ifeq ($(PG91),yes)
-all: sql/$(EXTENSION)--$(EXTVERSION).sql
-
-sql/$(EXTENSION)--$(EXTVERSION).sql: sql/$(EXTENSION).sql
-       cp $< $@
-       
-sql/$(EXTENSION).sql: sql_bits/rtpostgis.sql sql_bits/raster_comments.sql
-       cat $^ > $@
-       
-#strip BEGIN/COMMIT since these are not allowed in extensions
-sql_bits/rtpostgis.sql: ../../raster/rt_pg/rtpostgis.sql
-       sed -e 's/BEGIN;//g' -e 's/COMMIT;//g'  $< > $@
-       
-sql_bits/raster_comments.sql: ../../doc/raster_comments.sql
-       cp $< $@
-       
-DATA = $(wildcard sql/*--*.sql) sql/$(EXTENSION)--$(EXTVERSION).sql
-EXTRA_CLEAN += sql/$(EXTENSION)--$(EXTVERSION).sql
-endif
-
-PGXS := $(shell $(PG_CONFIG) --pgxs)
-include $(PGXS)

diff --git a/extensions/postgis_raster/doc/postgis.md b/extensions/postgis_raster/doc/postgis.md
deleted file mode 100644 (file)
index ca68fc9..0000000
--- a/extensions/postgis_raster/doc/postgis.md
+++ /dev/null
@@ -1,6 +0,0 @@
-PostGIS 2.0.0
-============
-
-Extensive documentation can be found at.
-HTML: http://www.postgis.org/documentation/manual-svn/
-PDF: http://www.postgis.org/download/postgis-2.0.0SVN.pdf

diff --git a/extensions/postgis_raster/postgis_raster.control b/extensions/postgis_raster/postgis_raster.control
deleted file mode 100644 (file)
index 00d4141..0000000
--- a/extensions/postgis_raster/postgis_raster.control
+++ /dev/null
@@ -1,6 +0,0 @@
-# postgis extension
-comment = 'postgis raster spatial types and functions'
-default_version = '2.0.0'
-module_pathname = '$libdir/rtpostgis-2.0'
-relocatable = true
-requires = postgis_core

diff --git a/extensions/postgis_topology/postgis_topology.control b/extensions/postgis_topology/postgis_topology.control
index ec021ab5675b86493bf8b10397d9a8cb5d02cc99..20534c21ea286222c442f2bb636ae4a27aae903e 100644 (file)
--- a/extensions/postgis_topology/postgis_topology.control
+++ b/extensions/postgis_topology/postgis_topology.control
@@ -3,4 +3,4 @@ comment = 'postgis topology spatial types and functions'
 default_version = '2.0.0a1'
 relocatable = false
 schema = topology
-requires = postgis_core
+requires = postgis