public inbox for b.a.t.m.a.n@lists.open-mesh.org
 help / color / mirror / Atom feed
From: Sven Eckelmann <sven@narfation.org>
To: b.a.t.m.a.n@lists.open-mesh.org
Subject: [B.A.T.M.A.N.] [PATCH 2/2] batctl: Remove subversion/svk revision information
Date: Thu, 31 Mar 2011 18:11:39 +0200	[thread overview]
Message-ID: <1301587899-9449-3-git-send-email-sven@narfation.org> (raw)
In-Reply-To: <1301587899-9449-1-git-send-email-sven@narfation.org>

The current version of batctl cannot be obtained from subversion or svk
anymore. It is unnecessary to provide the functionality to retrieve the
current revision using these tools.

We only have to differenciate between git checkout and official release.
We cannot detect a git snapshot and thus the distribution has to provide
the REVISION variable for snapshots.

Signed-off-by: Sven Eckelmann <sven@narfation.org>
---
 Makefile |   20 ++------------------
 1 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/Makefile b/Makefile
index b5b4e2b..217a00a 100644
--- a/Makefile
+++ b/Makefile
@@ -47,24 +47,8 @@ PACKAGE_NAME = batctl
 BINARY_NAME = batctl
 SOURCE_VERSION_HEADER = main.h
 
-REVISION= $(shell	if [ -d .svn ]; then \
-				if which svn > /dev/null; then \
-					echo rv$$(svn info | grep "Rev:" | sed -e '1p' -n | awk '{print $$4}'); \
-				else \
-					echo "[unknown]"; \
-				fi; \
-			elif [ -d .git ]; then \
-				if which git > /dev/null; then \
-					echo $$(git describe --always --dirty 2> /dev/null); \
-				else \
-					echo "[unknown]"; \
-				fi; \
-			elif [ -d ~/.svk ]; then \
-				if which svk > /dev/null; then \
-					echo rv$$(svk info | grep "Mirrored From" | awk '{print $$5}'); \
-				else \
-					echo "[unknown]"; \
-				fi; \
+REVISION= $(shell	if [ -d .git ]; then \
+				echo $$(git describe --always --dirty 2> /dev/null || echo "[unknown]"); \
 			fi)
 
 REVISION_VERSION =\"\ $(REVISION)\"
-- 
1.7.4.1


  parent reply	other threads:[~2011-03-31 16:11 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-03-31 16:11 [B.A.T.M.A.N.] [PATCH 1/2] batctl: Remove obsolete creation of source packages Sven Eckelmann
2011-03-31 16:11 ` [B.A.T.M.A.N.] [PATCH] batman-adv: Remove subversion/svk revision information Sven Eckelmann
2011-04-01 19:50   ` Marek Lindner
2011-03-31 16:11 ` Sven Eckelmann [this message]
2011-04-01 19:45   ` [B.A.T.M.A.N.] [PATCH 2/2] batctl: " Marek Lindner
2011-04-01 19:44 ` [B.A.T.M.A.N.] [PATCH 1/2] batctl: Remove obsolete creation of source packages Marek Lindner

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1301587899-9449-3-git-send-email-sven@narfation.org \
    --to=sven@narfation.org \
    --cc=b.a.t.m.a.n@lists.open-mesh.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox