cartodb4/cartodb-postgresql
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Include revision info in cdb_version() output

Browse Source 
Closes #34

NOTE: it will only work if "make" is run from within a git clone
This commit is contained in:
Sandro Santilli
2014-06-03 13:20:49 +02:00
parent ce20009fb2
commit 9230ffa925
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+3 -1
View File
@@ -24,6 +24,8 @@ UPGRADES = \
sed 's/$$/--$(EXTVERSION).sql/' | \ sed 's/$$/--$(EXTVERSION).sql/' | \
sed 's/ /--$(EXTVERSION).sql $(EXTENSION)--/g') sed 's/ /--$(EXTVERSION).sql $(EXTENSION)--/g')
REV=$(shell git describe)
DATA_built = \ DATA_built = \
$(EXTENSION)--$(EXTVERSION).sql \ $(EXTENSION)--$(EXTVERSION).sql \
$(EXTENSION)--$(EXTVERSION)--$(EXTVERSION)next.sql \ $(EXTENSION)--$(EXTVERSION)--$(EXTVERSION)next.sql \
@@ -63,7 +65,7 @@ $(EXTENSION).control: $(EXTENSION).control.in Makefile
sed -e 's/@@VERSION@@/$(EXTVERSION)/' $< > $@ sed -e 's/@@VERSION@@/$(EXTVERSION)/' $< > $@
cartodb_version.sql: cartodb_version.sql.in Makefile cartodb_version.sql: cartodb_version.sql.in Makefile
sed -e 's/@@VERSION@@/$(EXTVERSION)/' $< > $@ sed -e 's/@@VERSION@@/$(EXTVERSION) $(REV)/' $< > $@
legacy_regress: $(REGRESS_OLD) Makefile legacy_regress: $(REGRESS_OLD) Makefile
mkdir -p sql/test/ mkdir -p sql/test/
NEWS
+4
View File
@@ -9,6 +9,10 @@ Bug fixes:
- Fully qualify call to CDB_UserDataSize from quota trigger - Fully qualify call to CDB_UserDataSize from quota trigger
- Fix potential infinite loop in CDB_CartodbfyTable - Fix potential infinite loop in CDB_CartodbfyTable
Enhancements:
- Include revision info in cdb_version() output (#34)
0.1.0 - 2014-05-23 0.1.0 - 2014-05-23
------------------ ------------------