Merge pull request #53 from CartoDB/CDB-3504

New versioning mechanism
This commit is contained in:
Raul Ochoa 2014-08-25 17:12:57 +02:00
commit eaee6d3d70
4 changed files with 13 additions and 9 deletions

View File

@ -19,7 +19,7 @@ in which those scripts are loaded.
Scripts would be best coded in a way to be usable both for creation
and upgrade of the objects. This means using CREATE OR REPLACE for
the functions, and whatever it takes to check existance of any previous
the functions, and whatever it takes to check existence of any previous
version of objects in other cases.
When used as an extension (probably always from version 0.2.0 onwards)
@ -27,8 +27,8 @@ all the objects will be installed in a "cartodb" schema. Take this into
account to fully-qualify internal calls to avoid (possibly dangerous)
name clashes.
Every new feature (as well as bugfixes) should come with a testcase,
see next session.
Every new feature (as well as bugfixes) should come with a test case,
see next section.
Writing testcases
-----------------
@ -58,4 +58,3 @@ Starting with 0.2.0, the in-place reload can be done with an ad-hoc function:
```sql
SELECT cartodb.cdb_extension_reload();
```

View File

@ -1,7 +1,7 @@
# cartodb/Makefile
EXTENSION = cartodb
EXTVERSION = 0.3.6
EXTVERSION = 0.4.0
SED = sed
@ -26,6 +26,7 @@ UPGRADABLE = \
0.3.3 \
0.3.4 \
0.3.5 \
0.3.6 \
$(EXTVERSION)dev \
$(EXTVERSION)next \
$(END)
@ -36,7 +37,6 @@ UPGRADES = \
$(SED) 's/$$/--$(EXTVERSION).sql/' | \
$(SED) 's/ /--$(EXTVERSION).sql $(EXTENSION)--/g')
REV=$(shell git describe)
GITDIR=$(shell test -d .git && echo '.git' || cat .git | $(SED) 's/^gitdir: //')
DATA_built = \
@ -78,7 +78,7 @@ $(EXTENSION).control: $(EXTENSION).control.in Makefile
$(SED) -e 's/@@VERSION@@/$(EXTVERSION)/' $< > $@
cartodb_version.sql: cartodb_version.sql.in Makefile $(GITDIR)/index
$(SED) -e 's/@@VERSION@@/$(EXTVERSION) $(REV)/' $< > $@
$(SED) -e 's/@@VERSION@@/$(EXTVERSION)/' $< > $@
legacy_regress: $(REGRESS_OLD) Makefile
mkdir -p sql/test/

View File

@ -1,6 +1,7 @@
0.4.0 (2014-mm-dd)
------------------
Added CDB_Math_Mode function
Changes in versioning: no revision is attached so it no longer uses `git describe` for the version.
0.3.6 (2014-08-11)
------------------

View File

@ -20,12 +20,16 @@ Dependencies
Install
-------
make all install
```sh
make all install
```
Test installation
-----------------
make installcheck
```sh
make installcheck
```
NOTE: if ``test_ddl_triggers`` fails it's likely due to an incomplete
installation of schema_triggers: you need to add ``schema_triggers.so``