marco/i3status
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added version files for release tarball. Fixes #78 (#132)

Browse Source
This commit is contained in:
eplanet 2016-06-27 08:49:51 +02:00 committed by Michael Stapelberg
parent 3a807af855
commit 4a37333cad
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
I3STATUS_VERSION Normal file
View File

@ -0,0 +1 @@
2.10-non-git

14
Makefile
View File

@ -1,3 +1,5 @@
TOPDIR=$(shell pwd)
ifndef PREFIX
PREFIX=/usr
endif
@ -17,7 +19,7 @@ CFLAGS+=-g
CFLAGS+=-std=gnu99
CFLAGS+=-pedantic
CPPFLAGS+=-DSYSCONFDIR=\"$(SYSCONFDIR)\"
CPPFLAGS+=-DVERSION=\"${GIT_VERSION}\"
CPPFLAGS+=-DVERSION=\"${I3STATUS_VERSION}\"
CFLAGS+=-Iinclude
LIBS+=-lconfuse
LIBS+=-lyajl
@ -25,8 +27,14 @@ LIBS+=-lpulse
LIBS+=-lm
LIBS+=-lpthread
ifeq ($(wildcard .git),)
# not in git repository
VERSION := '$(shell [ -f $(TOPDIR)/VERSION ] && cat $(TOPDIR)/VERSION)'
I3STATUS_VERSION := '$(shell [ -f $(TOPDIR)/I3STATUS_VERSION ] && cat $(TOPDIR)/I3STATUS_VERSION)'
else
VERSION:=$(shell git describe --tags --abbrev=0)
GIT_VERSION:="$(shell git describe --tags --always) ($(shell git log --pretty=format:%cd --date=short -n1))"
I3STATUS_VERSION:="$(shell git describe --tags --always) ($(shell git log --pretty=format:%cd --date=short -n1))"
endif
OS:=$(shell uname)
ifeq ($(OS),Linux)
@ -120,6 +128,6 @@ release:
cp -r include i3status-${VERSION}
cp -r yajl-fallback i3status-${VERSION}
cp -r contrib i3status-${VERSION}
sed -e 's/^GIT_VERSION:=\(.*\)/GIT_VERSION=${GIT_VERSION}/g;s/^VERSION:=\(.*\)/VERSION=${VERSION}/g' Makefile > i3status-${VERSION}/Makefile
sed -e 's/^I3STATUS_VERSION:=\(.*\)/I3STATUS_VERSION=${I3STATUS_VERSION}/g;s/^VERSION:=\(.*\)/VERSION=${VERSION}/g' Makefile > i3status-${VERSION}/Makefile
tar cjf i3status-${VERSION}.tar.bz2 i3status-${VERSION}
rm -rf i3status-${VERSION}

1
VERSION Normal file
View File

@ -0,0 +1 @@
2.10