From df561f1563c3974705f228054b3b0483a1c81a63 Mon Sep 17 00:00:00 2001 From: Simon Michael Date: Fri, 5 Apr 2013 20:45:22 -0700 Subject: [PATCH] tools: calculate patch level using git describe now. Patch level is now the number of commits since the last_release tag, avoiding interference from misc other tags. --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index b9a3f4da7..0b49cac57 100644 --- a/Makefile +++ b/Makefile @@ -95,7 +95,8 @@ VERSIONFILE=VERSION VERSION:=$(shell cat $(VERSIONFILE)) # the number of changes recorded since last tag in this repo -PATCHLEVEL:=$(shell expr `darcs changes --count --from-tag=\\\\\.` - 1) +#PATCHLEVEL:=$(shell expr `git describe --long | awk -F - '{print $$2}' `) +PATCHLEVEL:=$(shell git rev-list last_release..HEAD | wc -l) # build flags WARNINGS:=-W -fwarn-tabs -fno-warn-unused-do-bind -fno-warn-name-shadowing #-fwarn-orphans -fwarn-simple-patterns -fwarn-monomorphism-restriction