configured files for pointcloud_postgis

Author: mbredif

pgsql/CMakeLists.txt

@@ -10,7 +10,7 @@ set ( PC_HEADERS
   pc_pgsql.h
   )
 
-set ( PC_INSTALL_EXENSIONS
+set ( PC_INSTALL_EXTENSIONS
   "${PROJECT_BINARY_DIR}/pgsql/pointcloud--${POINTCLOUD_VERSION}.sql"
   "${PROJECT_BINARY_DIR}/pgsql/pointcloud.control"
   )
@@ -64,7 +64,7 @@ install (
   )
 
 install (
-  FILES ${PC_INSTALL_EXENSIONS} 
+  FILES ${PC_INSTALL_EXTENSIONS}
   DESTINATION "${PGSQL_SHAREDIR}/extension"
   )
 

pgsql/META.json

@@ -9,7 +9,7 @@
 	"provides": {
 		"pointcloud": {
 			"abstract": "LIDAR point and patch types and functions",
-			"version": "1.0.0",
+			"version": "1.1.0",
 			"file": "",
 			"docfile": ""
 		}
@@ -32,7 +32,7 @@
 		}
 	},
 	"meta-spec": {
-		"version": "1.0.0",
+		"version": "1.1.0",
 		"url": "http://pgxn.org/meta/spec.txt"
 	},
 	"tags": [

pgsql/Makefile

@@ -56,4 +56,4 @@ $(EXTENSION)--%--$(EXTVERSION).sql: $(EXTENSION)--$(EXTVERSION).sql ../util/proc
 	cat $< | ../util/proc_upgrade.pl > $@
 
 $(EXTENSION)--%--$(EXTVERSION)next.sql: $(EXTENSION)--$(EXTVERSION)next--$(EXTVERSION).sql
-	ln -f $< $@
+	cp $< $@

pgsql_postgis/CMakeLists.txt

@@ -1,11 +1,21 @@
 
-set ( PCPG_INSTALL_EXENSIONS
-  pointcloud_postgis--1.0.sql
-  pointcloud_postgis.control
+configure_file(
+    pointcloud_postgis.sql.in
+    "${PROJECT_BINARY_DIR}/pgsql/pointcloud_postgis--${POINTCLOUD_VERSION}.sql"
   )
-        
+
+configure_file(
+    pointcloud_postgis.control.in
+    "${PROJECT_BINARY_DIR}/pgsql/pointcloud_postgis.control"
+  )
+
+set ( PCPG_INSTALL_EXTENSIONS
+    "${PROJECT_BINARY_DIR}/pgsql/pointcloud_postgis--${POINTCLOUD_VERSION}.sql"
+    "${PROJECT_BINARY_DIR}/pgsql/pointcloud_postgis.control"
+  )
+
 install (
-  FILES ${PCPG_INSTALL_EXENSIONS} 
+  FILES ${PCPG_INSTALL_EXTENSIONS}
   DESTINATION "${PGSQL_SHAREDIR}/extension"
   )
 

pgsql_postgis/META.json

@@ -2,7 +2,7 @@
 	"name": "pointcloud_postgis",
 	"abstract": "PostGIS integration functions for Pointcloud",
 	"description": "Provides GIS overlay and vector/raster hooks for point clou data.",
-	"version": "1.0.0",
+	"version": "1.1.0",
 	"release_status": "unstable",
 	"maintainer": "Paul Ramsey",
 	"license": "bsd",
@@ -18,7 +18,7 @@
       "runtime": {
          "requires": {
             "postgis": "2.0.0",
-            "pointcloud": "1.0.0"
+            "pointcloud": "1.1.0"
          }
       }
     },
@@ -34,7 +34,7 @@
 		}
 	},
 	"meta-spec": {
-		"version": "1.0.0",
+		"version": "1.1.0",
 		"url": "http://pgxn.org/meta/spec.txt"
 	},
 	"tags": [

pgsql_postgis/Makefile

@@ -4,8 +4,11 @@ include ../config.mk
 
 #MODULE_big = pointcloud_postgis
 #OBJS =
+SED = sed
 EXTENSION = pointcloud_postgis
-DATA = $(EXTENSION)--1.0.sql
+EXTVERSION=$(shell cat ../Version.config)
+EXTVERSION_MAJOR=$(shell cut -d. -f1,2 ../Version.config)
+DATA = $(EXTENSION)--$(EXTVERSION).sql
 
 #REGRESS = pointcloud
 
@@ -15,3 +18,10 @@ DATA = $(EXTENSION)--1.0.sql
 
 # We are going to use PGXS for sure
 include $(PGXS)
+
+$(EXTENSION).control: $(EXTENSION).control.in Makefile
+	$(SED) -e 's/@POINTCLOUD_VERSION@/$(EXTVERSION)/' \
+         -e 's/@POINTCLOUD_VERSION_MAJOR@/$(EXTVERSION_MAJOR)/' $< > $@
+
+$(EXTENSION)--$(EXTVERSION).sql: $(EXTENSION).sql.in Makefile
+	$(SED) -e 's/@POINTCLOUD_VERSION@/$(EXTVERSION)/' $< > $@

pgsql_postgis/pointcloud_postgis.control …ql_postgis/pointcloud_postgis.control.inpgsql_postgis/pointcloud_postgis.control renamed to pgsql_postgis/pointcloud_postgis.control.in pgsql_postgis/pointcloud_postgis.control renamed to pgsql_postgis/pointcloud_postgis.control.in

@@ -1,7 +1,7 @@
 # pointcloud postgis integration extension
 comment = 'integration for pointcloud LIDAR data and PostGIS geometry data'
-default_version = '1.1.0'
-module_pathname = '$libdir/pointcloud-1.1'
+default_version = '@POINTCLOUD_VERSION@'
+module_pathname = '$libdir/pointcloud-@POINTCLOUD_VERSION_MAJOR@'
 relocatable = true
 superuser = false
 requires = 'postgis, pointcloud'