From: Rudolf Polzer <rpolzer@grawp.(none)>
Date: Fri, 2 Apr 2010 13:18:27 +0000 (+0200)
Subject: switch version tracking to git
X-Git-Tag: xonotic-v0.5.0~274^2
X-Git-Url: https://de.git.xonotic.org/?a=commitdiff_plain;h=cda0d10a1b56bf9633ce85f36ef4a4f58938ce20;p=xonotic%2Fnetradiant.git

switch version tracking to git
---

diff --git a/Makefile b/Makefile
index f3778e4c..25827897 100644
--- a/Makefile
+++ b/Makefile
@@ -46,7 +46,7 @@ DIFF               ?= diff
 SED                ?= sed
 
 # optional:
-SVNVERSION         ?= svnversion
+GIT                ?= git
 
 STDOUT_TO_DEVNULL  ?= >/dev/null
 STDERR_TO_DEVNULL  ?= 2>/dev/null
@@ -221,10 +221,10 @@ Q3MAP_VERSION = 2.5.17n
 # Executable extension
 RADIANT_EXECUTABLE := $(EXE)
 
-SVN_VERSION := $(shell $(SVNVERSION) -n $(STDERR_TO_DEVNULL) | $(SED) 's/M$$//g; s/.*://g;')
-ifneq ($(SVN_VERSION),)
-	RADIANT_VERSION := $(RADIANT_VERSION)-svn$(SVN_VERSION)
-	Q3MAP_VERSION := $(Q3MAP_VERSION)-svn$(SVN_VERSION)
+GIT_VERSION := $(shell $(GIT) rev-parse --short HEAD $(STDERR_TO_DEVNULL))
+ifneq ($(GIT_VERSION),)
+	RADIANT_VERSION := $(RADIANT_VERSION)-git-$(GIT_VERSION)
+	Q3MAP_VERSION := $(Q3MAP_VERSION)-git-$(GIT_VERSION)
 endif
 
 CPPFLAGS += -DRADIANT_VERSION="\"$(RADIANT_VERSION)\"" -DRADIANT_MAJOR_VERSION="\"$(RADIANT_MAJOR_VERSION)\"" -DRADIANT_MINOR_VERSION="\"$(RADIANT_MINOR_VERSION)\"" -DRADIANT_ABOUTMSG="\"$(RADIANT_ABOUTMSG)\"" -DQ3MAP_VERSION="\"$(Q3MAP_VERSION)\"" -DRADIANT_EXECUTABLE="\"$(RADIANT_EXECUTABLE)\""