diff --git a/Makefile b/Makefile index 7664d9d..4ef7f6d 100644 --- a/Makefile +++ b/Makefile @@ -24,6 +24,8 @@ UPGRADES = \ sed 's/$$/--$(EXTVERSION).sql/' | \ sed 's/ /--$(EXTVERSION).sql $(EXTENSION)--/g') +REV=$(shell git describe) + DATA_built = \ $(EXTENSION)--$(EXTVERSION).sql \ $(EXTENSION)--$(EXTVERSION)--$(EXTVERSION)next.sql \ @@ -63,7 +65,7 @@ $(EXTENSION).control: $(EXTENSION).control.in Makefile sed -e 's/@@VERSION@@/$(EXTVERSION)/' $< > $@ cartodb_version.sql: cartodb_version.sql.in Makefile - sed -e 's/@@VERSION@@/$(EXTVERSION)/' $< > $@ + sed -e 's/@@VERSION@@/$(EXTVERSION) $(REV)/' $< > $@ legacy_regress: $(REGRESS_OLD) Makefile mkdir -p sql/test/ diff --git a/NEWS b/NEWS index e730fa2..5c35f67 100644 --- a/NEWS +++ b/NEWS @@ -9,6 +9,10 @@ Bug fixes: - Fully qualify call to CDB_UserDataSize from quota trigger - Fix potential infinite loop in CDB_CartodbfyTable +Enhancements: + + - Include revision info in cdb_version() output (#34) + 0.1.0 - 2014-05-23 ------------------