From 9886c111a19c6ea8b6d1a90f5e88127c42eba0f7 Mon Sep 17 00:00:00 2001
From: alan young <ayoung1@ec2gerrit01.idc.logitech.com>
Date: Tue, 10 Apr 2012 08:17:38 -0700
Subject: [PATCH] Use (abbreviated) git revision for Squeezeplay version
 number.

Change-Id: Ia853a0a2eca5386da015678db8f75ebbad43174a
---
 src/squeezeplay/Makefile.am | 8 ++++----
 src/squeezeplay/Makefile.in | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/squeezeplay/Makefile.am b/src/squeezeplay/Makefile.am
index 0efface2af..5a160308fd 100644
--- a/src/squeezeplay/Makefile.am
+++ b/src/squeezeplay/Makefile.am
@@ -63,9 +63,9 @@ APP_NAME = SqueezePlay Beta
 BUNDLE_CONTENTS = $(BUNDLE_NAME)/Contents
 PLIST_FILE = $(BUNDLE_CONTENTS)/Info.plist
 
-VERSION_TEXT = $(shell cat ../squeezeplay.version)r$(shell svnversion -n .. | sed -e 's/[MS]//g')
-DEB_VERSION_TEXT = $(shell cat ../squeezeplay.version)~$(shell svnversion -n .. | sed -e 's/[MS]//g')
-TGZ_VERSION_TEXT = $(shell cat ../squeezeplay.version)-$(shell svnversion -n .. | sed -e 's/[MS]//g')
+VERSION_TEXT = $(shell cat ../squeezeplay.version)r$(shell git rev-list --abbrev-commit --max-count=1 HEAD)
+DEB_VERSION_TEXT = $(shell cat ../squeezeplay.version)~$(shell git rev-list --abbrev-commit --max-count=1 HEAD)
+TGZ_VERSION_TEXT = $(shell cat ../squeezeplay.version)-$(shell git rev-list --abbrev-commit --max-count=1 HEAD)
 ICNS_NAME = icon.icns
 DMG_TEMP_DIR = temp-SqueezePlay_image
 DMG_IMAGE_DIR = SqueezePlay_image
@@ -154,7 +154,7 @@ src/version.h: FORCE
 	@echo '#define SQUEEZEPLAY_RELEASE "'`cat ../squeezeplay.version`'"' >> src/version.h
 	@echo '#endif' >> src/version.h
 	@echo '#ifndef SQUEEZEPLAY_REVISION' >> src/version.h
-	@echo '#define SQUEEZEPLAY_REVISION "'`svnversion -n ..`'"' >> src/version.h
+	@echo '#define SQUEEZEPLAY_REVISION "'`git rev-list --abbrev-commit --max-count=1 HEAD`'"' >> src/version.h
 	@echo '#endif' >> src/version.h
 	@echo '#define JIVE_VERSION SQUEEZEPLAY_RELEASE" r"SQUEEZEPLAY_REVISION' >> src/version.h
 
diff --git a/src/squeezeplay/Makefile.in b/src/squeezeplay/Makefile.in
index f8a4b65d30..bba309b9e8 100644
--- a/src/squeezeplay/Makefile.in
+++ b/src/squeezeplay/Makefile.in
@@ -274,9 +274,9 @@ BUNDLE_NAME = SqueezePlay.app
 APP_NAME = SqueezePlay Beta
 BUNDLE_CONTENTS = $(BUNDLE_NAME)/Contents
 PLIST_FILE = $(BUNDLE_CONTENTS)/Info.plist
-VERSION_TEXT = $(shell cat ../squeezeplay.version)r$(shell svnversion -n .. | sed -e 's/[MS]//g')
-DEB_VERSION_TEXT = $(shell cat ../squeezeplay.version)~$(shell svnversion -n .. | sed -e 's/[MS]//g')
-TGZ_VERSION_TEXT = $(shell cat ../squeezeplay.version)-$(shell svnversion -n .. | sed -e 's/[MS]//g')
+VERSION_TEXT = $(shell cat ../squeezeplay.version)r$(shell git rev-list --abbrev-commit --max-count=1 HEAD)
+DEB_VERSION_TEXT = $(shell cat ../squeezeplay.version)~$(shell git rev-list --abbrev-commit --max-count=1 HEAD)
+TGZ_VERSION_TEXT = $(shell cat ../squeezeplay.version)-$(shell git rev-list --abbrev-commit --max-count=1 HEAD)
 ICNS_NAME = icon.icns
 DMG_TEMP_DIR = temp-SqueezePlay_image
 DMG_IMAGE_DIR = SqueezePlay_image
@@ -1326,7 +1326,7 @@ src/version.h: FORCE
 	@echo '#define SQUEEZEPLAY_RELEASE "'`cat ../squeezeplay.version`'"' >> src/version.h
 	@echo '#endif' >> src/version.h
 	@echo '#ifndef SQUEEZEPLAY_REVISION' >> src/version.h
-	@echo '#define SQUEEZEPLAY_REVISION "'`svnversion -n ..`'"' >> src/version.h
+	@echo '#define SQUEEZEPLAY_REVISION "'`git rev-list --abbrev-commit --max-count=1 HEAD`'"' >> src/version.h
 	@echo '#endif' >> src/version.h
 	@echo '#define JIVE_VERSION SQUEEZEPLAY_RELEASE" r"SQUEEZEPLAY_REVISION' >> src/version.h