Commit 1f83b8e2 authored by Per Cederqvist's avatar Per Cederqvist

Include more info in the version string.

Include the git ref in the version, and add a trailing asterisk to
indicate that the working tree has uncommitted changes.

The lyskom-list-clients-collect command now handles the new form of
the version number.
parent 05cd2de5
2013-05-07 Per Cederqvist <ceder@lysator.liu.se>
Include more info in the version string.
* Makefile (version.el): Include the git ref in the version, and
add a trailing asterisk to indicate that the working tree has
uncommitted changes.
* commands1.el (lyskom-list-clients-collect): Handle the new form
of the version number.
2013-05-06 Per Cederqvist <ceder@lysator.liu.se>
Don't process vars.el.in with sed. At least on MacOS X, sed fails
......
......@@ -147,7 +147,7 @@ all: $(TARGET)
version.el: version.el.in Makefile
rm -f $@
sed "s/@@CLIENTVERSION@@/$(CLIENTVERSION) (`date +%Y-%m-%d`; Git)/g" <$< >$@
sed "s/@@CLIENTVERSION@@/$(CLIENTVERSION) (`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
......
......@@ -3113,8 +3113,8 @@ prefix argument \(C-u -), list all sessions."
((null client) version)
((string-match "(.*; CVS)" version)
(replace-in-string version "(.*; CVS)" "(from CVS)"))
((string-match "(.*; Git)" version)
(replace-in-string version "(.*; Git)" "(from Git)"))
((string-match "(.*; Git.*)" version)
(replace-in-string version "(.*; Git.*)" "(from Git)"))
((string-match "\\s-*(build [^)]*)" version)
(replace-in-string version "\\s-*(build [^)]*)" ""))
(t version)))
......
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