From 3f942d694ec213b87b0597408421103ee9e0cc2d Mon Sep 17 00:00:00 2001 From: mentor Date: Mon, 21 Jan 2008 08:59:27 +0000 Subject: [PATCH] Add git svnversion.h generation code Signed-off-by: Russell Harmon Switch from `` to POSIX preferred (and more readable) $() git-svn-id: http://madwifi-project.org/svn/madwifi/trunk@3224 0192ed92-7a03-0410-a25b-9323aeb14dbd --- Makefile | 7 +++++-- THANKS | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index a390b2f..586bb90 100644 --- a/Makefile +++ b/Makefile @@ -66,10 +66,13 @@ endif .PHONY: svnversion.h svnversion.h: @if [ -d .svn ]; then \ - ver=`svnversion -nc . | sed -e 's/^[^:]*://;s/[A-Za-z]//'`; \ + ver=$(svnversion -nc . | sed -e 's/^[^:]*://;s/[A-Za-z]//'); \ echo "#define SVNVERSION \"svn r$$ver\"" > $@.tmp; \ + elif [ -d .git ]; then \ + ver=$(git svn log | head -n2 | tail -n1 | cut -d\ -f1); \ + echo "#define SVNVERSION \"svn $$ver\"" > $@.tmp; \ elif [ -s SNAPSHOT ]; then \ - ver=`sed -e '/^Revision: */!d;s///;q' SNAPSHOT`; \ + ver=$(sed -e '/^Revision: */!d;s///;q' SNAPSHOT); \ echo "#define SVNVERSION \"svn r$$ver\"" > $@.tmp; \ else \ touch $@.tmp; \ diff --git a/THANKS b/THANKS index e8e8cd2..a79b360 100644 --- a/THANKS +++ b/THANKS @@ -128,6 +128,7 @@ Mike Taylor Derek J Smithies jhansen Benoit Papillault +Russell Harmon Apologies to anyone whose name was unintentionally left off. Please let us know if you think your name should be mentioned here! -- 2.35.1