From b8e15dba83d58d186d1a51f92ecaac02c5e11b81 Mon Sep 17 00:00:00 2001
From: Sandro Santilli <strk@keybit.net>
Date: Thu, 8 May 2014 09:58:58 +0200
Subject: [PATCH] Generate cartodb.control with Makefile-driver version

Set version to 0.1dev
---
 .gitignore                            |  1 +
 Makefile                              | 16 +++++++++++-----
 cartodb.control => cartodb.control.in |  2 +-
 util/create_from_unpackaged.sh        |  5 +++--
 4 files changed, 16 insertions(+), 8 deletions(-)
 rename cartodb.control => cartodb.control.in (83%)

diff --git a/.gitignore b/.gitignore
index f6657d7..2468092 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 cartodb--*.sql
+cartodb.control
 results/
 regression.*
 expected/test
diff --git a/Makefile b/Makefile
index b3a23c5..10bb65e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,14 +1,17 @@
 # cartodb/Makefile
 
 EXTENSION = cartodb
-EXTVERSION = 0.1
+EXTVERSION = 0.1dev
 
 CDBSCRIPTS = \
   scripts-enabled/*.sql \
   $(END)
 
-DATA_built = $(EXTENSION)--$(EXTVERSION).sql \
-  $(EXTENSION)--unpackaged--$(EXTVERSION).sql
+DATA_built = \
+  $(EXTENSION)--$(EXTVERSION).sql \
+  $(EXTENSION)--unpackaged--$(EXTVERSION).sql \
+  $(EXTENSION).control
+
 DOCS = README.md
 REGRESS_NEW = test_ddl_triggers
 REGRESS_OLD = $(wildcard test/*.sql)
@@ -27,8 +30,11 @@ $(EXTENSION)--$(EXTVERSION).sql: $(CDBSCRIPTS) cartodb_hooks.sql Makefile
 	echo "GRANT USAGE ON SCHEMA cartodb TO public;" >> $@
 	cat cartodb_hooks.sql >> $@
 
-$(EXTENSION)--unpackaged--0.1.sql: $(EXTENSION)--$(EXTVERSION).sql util/create_from_unpackaged.sh Makefile
-	./util/create_from_unpackaged.sh cartodb--unpackaged--0.1.sql
+$(EXTENSION)--unpackaged--$(EXTVERSION).sql: $(EXTENSION)--$(EXTVERSION).sql util/create_from_unpackaged.sh Makefile
+	./util/create_from_unpackaged.sh $(EXTVERSION)
+
+$(EXTENSION).control: $(EXTENSION).control.in
+	sed -e 's/@@VERSION@@/$(EXTVERSION)/' $< > $@
 
 legacy_regress: $(REGRESS_OLD) Makefile
 	mkdir -p sql/test/
diff --git a/cartodb.control b/cartodb.control.in
similarity index 83%
rename from cartodb.control
rename to cartodb.control.in
index 4c9f6af..3c5af07 100644
--- a/cartodb.control
+++ b/cartodb.control.in
@@ -1,4 +1,4 @@
-default_version = '0.1'
+default_version = '@@VERSION@@'
 comment = 'Turn a database into a cartodb user database.'
 superuser = true
 relocatable = false
diff --git a/util/create_from_unpackaged.sh b/util/create_from_unpackaged.sh
index fba47a2..f8ec39f 100755
--- a/util/create_from_unpackaged.sh
+++ b/util/create_from_unpackaged.sh
@@ -1,7 +1,8 @@
 #!/bin/sh
 
-input=cartodb--0.1.sql
-output=cartodb--unpackaged--0.1.sql
+ver=$1
+input=cartodb--${ver}.sql
+output=cartodb--unpackaged--${ver}.sql
 
 cat ${input} > ${output}