koma/i3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Deleting VERSION and extracting it from I3_VERSION instead (#2419)

Browse Source
This commit is contained in:
eplanet
2016-08-13 22:46:27 +02:00
committed by Michael Stapelberg
parent 012de8cd6f
commit b668d62cfc
4 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
common.mk
View File

@ -21,8 +21,8 @@ endif
# In dist and snapshot tarballs, use the I3_VERSION and VERSION files. Otherwise use git information.
ifeq ($(wildcard .git),)
# not in git repository
VERSION := '$(shell [ -f $(TOPDIR)/VERSION ] && cat $(TOPDIR)/VERSION)'
I3_VERSION := '$(shell [ -f $(TOPDIR)/I3_VERSION ] && cat $(TOPDIR)/I3_VERSION)'
VERSION := $(shell [ -f $(TOPDIR)/I3_VERSION ] && cat $(TOPDIR)/I3_VERSION | cut -d '-' -f 1)
I3_VERSION := $(shell [ -f $(TOPDIR)/I3_VERSION ] && cat $(TOPDIR)/I3_VERSION)
else
VERSION := $(shell git describe --tags --abbrev=0)
I3_VERSION := '$(shell git describe --tags --always) ($(shell git log --pretty=format:%cd --date=short -n1), branch \"$(shell git describe --tags --always --all | sed s:heads/::)\")'