From 6d07c877a9833a140b87a87751b9e69cfcfbfe98 Mon Sep 17 00:00:00 2001
From: Tony Garnock-Jones <tonygarnockjones@gmail.com>
Date: Thu, 10 May 2012 17:07:10 -0400
Subject: [PATCH] Tweak embedded version numbering

---
 osx-server-gui/English.lproj/Credits.html |  3 +--
 osx-server-gui/Makefile                   | 10 ++++------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/osx-server-gui/English.lproj/Credits.html b/osx-server-gui/English.lproj/Credits.html
index 916511a..f507739 100644
--- a/osx-server-gui/English.lproj/Credits.html
+++ b/osx-server-gui/English.lproj/Credits.html
@@ -36,8 +36,7 @@
     <h4>Build information</h4>
     <ul>
       <li>Build stamp @BUILD_STAMP@</li>
-      <li>@GUI_VERSION@</li>
-      <li>@SERVER_VERSION@</li>
+      <li>Server version @SERVER_VERSION@</li>
     </ul>
   </body>
 </html>
diff --git a/osx-server-gui/Makefile b/osx-server-gui/Makefile
index c6b0e5d..fcb7868 100644
--- a/osx-server-gui/Makefile
+++ b/osx-server-gui/Makefile
@@ -7,8 +7,7 @@ RELEASE_RESOURCES=build/Release/$(APP_NAME).app/Contents/Resources
 DEBUG_RESOURCES=build/Debug/$(APP_NAME).app/Contents/Resources
 
 BUILD_STAMP:=$(shell date +%Y%m%d-%H%M%S)
-GUI_VERSION:=Hop OSX GUI revision git-$(shell git branch -v --abbrev=8 | grep '^\*' | awk '{print $$3}')
-SERVER_VERSION:=Server revision git-$(shell cd $(SERVER_PATH); git branch -v --abbrev=8 | grep '^\*' | awk '{print $$3}')
+SERVER_VERSION:=git-$(shell cd $(SERVER_PATH); git branch -v --abbrev=8 | grep '^\*' | awk '{print $$3}')
 
 release: $(SERVER_PATH)/$(SERVER_BINARY)
 	xcodebuild -configuration Release
@@ -17,20 +16,19 @@ release: $(SERVER_PATH)/$(SERVER_BINARY)
 	cp -rp $(SERVER_PATH)/$(SERVER_WEB) $(RELEASE_RESOURCES)/.
 	sed \
 		-e 's:@BUILD_STAMP@:$(BUILD_STAMP):g' \
-		-e 's:@GUI_VERSION@:$(GUI_VERSION):g' \
 		-e 's:@SERVER_VERSION@:$(SERVER_VERSION):g' \
 		$(RELEASE_RESOURCES)/English.lproj/Credits.html \
 		> $(RELEASE_RESOURCES)/English.lproj/Credits.html.tmp
 	mv \
 		$(RELEASE_RESOURCES)/English.lproj/Credits.html.tmp \
 		$(RELEASE_RESOURCES)/English.lproj/Credits.html
+	/usr/libexec/PlistBuddy \
+		-c "Set CFBundleVersion $(SERVER_VERSION)" \
+		$(RELEASE_RESOURCES)/../Info.plist
 
 # /usr/libexec/PlistBuddy \
 # 	-c "Set CFBundleShortVersionString $(GUI_VERSION)" \
 # 	$(RELEASE_RESOURCES)/../Info.plist
-# /usr/libexec/PlistBuddy \
-# 	-c "Set CFBundleVersion $(SERVER_VERSION)" \
-# 	$(RELEASE_RESOURCES)/../Info.plist
 
 debug: $(SERVER_PATH)/$(SERVER_BINARY)
 	xcodebuild -configuration Debug