From 5257b944b75c90232ad8dc2eadc2a69ed9a68083 Mon Sep 17 00:00:00 2001 From: Rafa de la Torre Date: Tue, 3 Nov 2015 11:15:19 +0000 Subject: [PATCH] First version of viable Makefile --- geocoder/extension/.gitignore | 1 + geocoder/extension/Makefile | 15 +++++++++++++-- geocoder/extension/cdb_geocoder.control | 4 ++-- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/geocoder/extension/.gitignore b/geocoder/extension/.gitignore index e710f0e..9819e6c 100644 --- a/geocoder/extension/.gitignore +++ b/geocoder/extension/.gitignore @@ -1,3 +1,4 @@ results/ regression.diffs regression.out +cdb_geocoder--0.0.1.sql diff --git a/geocoder/extension/Makefile b/geocoder/extension/Makefile index cf92715..d1bef4b 100644 --- a/geocoder/extension/Makefile +++ b/geocoder/extension/Makefile @@ -1,8 +1,19 @@ -EXTENSION = cdb_geocoder_admin0 -DATA = cdb_geocoder_admin0--0.0.1.sql +EXTENSION = cdb_geocoder +EXTVERSION = $(shell grep default_version $(EXTENSION).control | sed -e "s/default_version[[:space:]]*=[[:space:]]*'\([^']*\)'/\1/") + +DATA = cdb_geocoder--0.0.1.sql REGRESS = cdb_geocoder_admin0_test # postgres build stuff PG_CONFIG = pg_config PGXS := $(shell $(PG_CONFIG) --pgxs) include $(PGXS) + + +SOURCES_0_0_1 = $(wildcard sql/0.0.1/*.sql) + +cdb_geocoder--0.0.1.sql: $(SOURCES_0_0_1) + rm -f $@ + cat $(SOURCES_0_0_1) >> $@ + +all: $(DATA) diff --git a/geocoder/extension/cdb_geocoder.control b/geocoder/extension/cdb_geocoder.control index eedb9b1..2532160 100644 --- a/geocoder/extension/cdb_geocoder.control +++ b/geocoder/extension/cdb_geocoder.control @@ -1,5 +1,5 @@ -# cdb geocoder admin0 extension -comment = 'CartoDB admin0 internal geocoder' +# cdb geocoder extension +comment = 'CartoDB internal geocoder' default_version = '0.0.1' relocatable = true requires = cartodb