CDB-3656 Removes revision from the extension version
This commit is contained in:
@@ -36,7 +36,6 @@ 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)
|
|
||||||
GITDIR=$(shell test -d .git && echo '.git' || cat .git | $(SED) 's/^gitdir: //')
|
GITDIR=$(shell test -d .git && echo '.git' || cat .git | $(SED) 's/^gitdir: //')
|
||||||
|
|
||||||
DATA_built = \
|
DATA_built = \
|
||||||
@@ -78,7 +77,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 $(GITDIR)/index
|
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
|
legacy_regress: $(REGRESS_OLD) Makefile
|
||||||
mkdir -p sql/test/
|
mkdir -p sql/test/
|
||||||
|
|||||||
Reference in New Issue
Block a user