Commit 862274e5 authored by Christer Ekholm's avatar Christer Ekholm

Makefile: Changed target release to also do snapshot builds.

If HEAD is not a tagged commit then construct lyskom-clientversion the
same way as wen building default target (lyskom.elc)
parent 5b56b345
2014-10-26 Christer Ekholm <che@chrekh.se>
* Makefile: Changed target release. If HEAD is not a tagged
commit then construct lyskom-clientversion the same way as wen
building default target (lyskom.elc), also use comit-id in
filenames instead of only 0.48.
2014-09-04 Christer Ekholm <che@chrekh.se>
* Makefile: Removed comment about (the removed) target fast, and
......
......@@ -31,8 +31,17 @@
# Version of the client.
#
# LASTRELEASE is the latest released version.
# NEXTRELEASE is a guess what the next release would be.
#
# Remember to change LASTRELEASE to NEXTRELEASE when doing a new
# release. The commit taged as a release should have LASTRELEASE ==
# NEXTRELEASE.
#
# Also remember to change version number in ../doc/Makefile!
CLIENTVERSION = 0.48
LASTRELEASE = 0.48
NEXTRELEASE = 0.49
CLIENTVERSION = $(shell (git describe --exact-match --tags HEAD 2>/dev/null || git rev-parse --short HEAD) | sed -e 's/^v//')
######################################################################
......@@ -43,7 +52,7 @@ EMACS = xemacs
LANGUAGES = swedish english
# These files are included in all distribution archives.
DOCFILES = ../doc/NEWS-$(CLIENTVERSION)
DOCFILES = ../doc/NEWS-$(NEXTRELEASE)
# Default target.
TARGET = lyskom.elc
......@@ -131,7 +140,11 @@ DEFAULTLISPDIR = /usr/local/share/emacs/site-lisp
DEFAULTPREFIX = /usr/local
ifeq ($(MAKECMDGOALS),release)
VERSION-EL = version.el-release
ifeq ($(CLIENTVERSION),$(LASTRELEASE))
VERSION-EL = version.el-release
else
VERSION-EL = version.el
endif
else
VERSION-EL = version.el
endif
......@@ -142,7 +155,7 @@ all: $(TARGET)
version.el: version.el.in Makefile $(HEADER1) $(HEADER2) $(LANGUAGE-EL) $(SOURCES)
rm -f $@
sed "s/@@CLIENTVERSION@@/$(CLIENTVERSION) (`date +%Y-%m-%d`; Git `git rev-parse --short HEAD``git diff --quiet HEAD||echo '*'`)/g" <$< >$@
sed "s/@@CLIENTVERSION@@/$(LASTRELEASE) (`date +%Y-%m-%d`; Git `git rev-parse --short HEAD``git diff --quiet HEAD||echo '*'`)/g" <$< >$@
chmod 444 $@
version.el-release: version.el.in Makefile $(HEADER1) $(HEADER2) $(LANGUAGE-EL) $(SOURCES)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment