From: Martin Willi <martin@revosec.ch>
Date: Wed, 24 Aug 2016 18:17:18 +0000 (+0200)
Subject: osx: Perform project upgrades suggested by latest Xcode
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=3d43ccdc4355443db6a27c0bb63fd09e34b53668;p=thirdparty%2Fstrongswan.git

osx: Perform project upgrades suggested by latest Xcode
---

diff --git a/src/frontends/osx/charon-xpc/charon-xpc-Info.plist b/src/frontends/osx/charon-xpc/charon-xpc-Info.plist
index 85e2e4dc2c..ee235e0e29 100644
--- a/src/frontends/osx/charon-xpc/charon-xpc-Info.plist
+++ b/src/frontends/osx/charon-xpc/charon-xpc-Info.plist
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>CFBundleIdentifier</key>
-	<string>org.strongswan.charon-xpc</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
diff --git a/src/frontends/osx/strongSwan.xcodeproj/project.pbxproj b/src/frontends/osx/strongSwan.xcodeproj/project.pbxproj
index 90e2335981..ce23e8f1d7 100644
--- a/src/frontends/osx/strongSwan.xcodeproj/project.pbxproj
+++ b/src/frontends/osx/strongSwan.xcodeproj/project.pbxproj
@@ -255,7 +255,7 @@
 		5BD1CCA31726DB0100587077 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0620;
+				LastUpgradeCheck = 0730;
 				ORGANIZATIONNAME = "revosec AG";
 			};
 			buildConfigurationList = 5BD1CCA61726DB0100587077 /* Build configuration list for PBXProject "strongSwan" */;
@@ -394,6 +394,7 @@
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
+				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
@@ -443,6 +444,7 @@
 				GCC_PREFIX_HEADER = "strongSwan/strongSwan-Prefix.pch";
 				INFOPLIST_FILE = "strongSwan/strongSwan-Info.plist";
 				MACOSX_DEPLOYMENT_TARGET = 10.7;
+				PRODUCT_BUNDLE_IDENTIFIER = org.strongswan.osx;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "";
 				SDKROOT = macosx;
@@ -460,6 +462,7 @@
 				GCC_PREFIX_HEADER = "strongSwan/strongSwan-Prefix.pch";
 				INFOPLIST_FILE = "strongSwan/strongSwan-Info.plist";
 				MACOSX_DEPLOYMENT_TARGET = 10.7;
+				PRODUCT_BUNDLE_IDENTIFIER = org.strongswan.osx;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "";
 				SDKROOT = macosx;
@@ -508,6 +511,7 @@
 					__launchd_plist,
 					"charon-xpc/charon-xpc-Launchd.plist",
 				);
+				PRODUCT_BUNDLE_IDENTIFIER = "org.strongswan.charon-xpc";
 				PRODUCT_NAME = "org.strongswan.charon-xpc";
 				PROVISIONING_PROFILE = "";
 				SDKROOT = macosx;
@@ -557,6 +561,7 @@
 					__launchd_plist,
 					"charon-xpc/charon-xpc-Launchd.plist",
 				);
+				PRODUCT_BUNDLE_IDENTIFIER = "org.strongswan.charon-xpc";
 				PRODUCT_NAME = "org.strongswan.charon-xpc";
 				PROVISIONING_PROFILE = "";
 				SDKROOT = macosx;
diff --git a/src/frontends/osx/strongSwan/strongSwan-Info.plist b/src/frontends/osx/strongSwan/strongSwan-Info.plist
index d0c268612f..cd02dd48fb 100644
--- a/src/frontends/osx/strongSwan/strongSwan-Info.plist
+++ b/src/frontends/osx/strongSwan/strongSwan-Info.plist
@@ -9,7 +9,7 @@
 	<key>CFBundleIconFile</key>
 	<string>icon-large.icns</string>
 	<key>CFBundleIdentifier</key>
-	<string>org.strongswan.osx</string>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>