From 3a244bedee3bad4805229d8d623c8d9ac7ef4b6e Mon Sep 17 00:00:00 2001
From: Olivier Goguel <ogoguel@MacBook-Pro-de-Olivier.local>
Date: Sun, 27 Mar 2016 11:34:35 +0200
Subject: [PATCH] Replaced xcodebuild.h with CFBundleVersion

---
 ActiveGS_iOS/activegs.plist         | 4 ++--
 Common.iphone/infoViewController.mm | 8 +++-----
 xcodebuild.h                        | 1 -
 3 files changed, 5 insertions(+), 8 deletions(-)
 delete mode 100644 xcodebuild.h

diff --git a/ActiveGS_iOS/activegs.plist b/ActiveGS_iOS/activegs.plist
index e07b1ad..451eb6c 100644
--- a/ActiveGS_iOS/activegs.plist
+++ b/ActiveGS_iOS/activegs.plist
@@ -23,11 +23,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string></string>
+	<string>1.40</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.40</string>
+	<string>1</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UIAppFonts</key>
diff --git a/Common.iphone/infoViewController.mm b/Common.iphone/infoViewController.mm
index 6689619..0f1d2a3 100644
--- a/Common.iphone/infoViewController.mm
+++ b/Common.iphone/infoViewController.mm
@@ -10,7 +10,6 @@
 #include "../Common/svnversion.h"
 #import "asyncimageview.h"
 #import "activegsViewController.h"
-#include "../xcodebuild.h"
 
 @implementation infoViewController
 
@@ -27,13 +26,12 @@
 -(void)viewDidLoad
 {
 
-    
-    NSString *AppVersion = [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleVersion"];
-    NSString *buildVersion = [NSString stringWithUTF8String:xcodebuild];
+    NSString *appVersion = [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleShortVersionString"];
+    NSString *buildVersion = [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleVersion"];
     
     
 	self.versionUILandscape.text=
-    self.versionUI.text = [NSString stringWithFormat: @"v%@#%@  -- ActiveGS "TOSTRING(ACTIVEGSMAJOR)"."TOSTRING(ACTIVEGSMINOR)"."TOSTRING(ACTIVEGSBUILD)"",AppVersion,buildVersion];
+    self.versionUI.text = [NSString stringWithFormat: @"v%@.%@  -- ActiveGS "TOSTRING(ACTIVEGSMAJOR)"."TOSTRING(ACTIVEGSMINOR)"."TOSTRING(ACTIVEGSBUILD)"",appVersion,buildVersion];
     
     [self.portraitView setFrame:[[UIScreen mainScreen] bounds] ];
     [self.landscapeView setFrame:[[UIScreen mainScreen] bounds] ];
diff --git a/xcodebuild.h b/xcodebuild.h
deleted file mode 100644
index 14634a7..0000000
--- a/xcodebuild.h
+++ /dev/null
@@ -1 +0,0 @@
-const char* xcodebuild="304";