From 8b801a69e266d8dbb189ae6a9b890344df5c4bf0 Mon Sep 17 00:00:00 2001
From: "gtm.daemon" <gtm.daemon@7dc7ac4e-7543-0410-b95c-c1676fc8e2a3>
Date: Thu, 3 Jan 2013 18:30:08 +0000
Subject: [Author: thomasvl]

Fix up one compile warning found by Xcode.
Use the newer directive to fix up the unittest bundle ids (flagged by
  newer Xcodes).
Force the deployment version to 10.5 to avoid a bunch of the color sync
  dep. notices.

R=dmaclach
DELTA=7  (2 added, 0 deleted, 5 changed)
---
 GTM.xcodeproj/project.pbxproj               | 2 ++
 UnitTest-Info.plist                         | 4 ++--
 UnitTesting/GTMAppKitUnitTestingUtilities.m | 6 +++---
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/GTM.xcodeproj/project.pbxproj b/GTM.xcodeproj/project.pbxproj
index 6009663..3a9024f 100644
--- a/GTM.xcodeproj/project.pbxproj
+++ b/GTM.xcodeproj/project.pbxproj
@@ -2814,6 +2814,7 @@
 				GCC_WARN_SHADOW = YES;
 				GTM_EXTRA_WARNING_OVERRIDE_CFLAGS = "-Wno-unused-parameter";
 				GTM_HOST_GCC_PREPROCESSOR_DEFINITIONS = "COMPONENT_SIGNATURE=\"\\'GTM \\'\" kComponentSignatureString=\"\\\"GoogleToolboxForMac\\\"\"";
+				MACOSX_DEPLOYMENT_TARGET = 10.5;
 			};
 			name = Debug;
 		};
@@ -2916,6 +2917,7 @@
 				GCC_WARN_SHADOW = YES;
 				GTM_EXTRA_WARNING_OVERRIDE_CFLAGS = "-Wno-unused-parameter";
 				GTM_HOST_GCC_PREPROCESSOR_DEFINITIONS = "COMPONENT_SIGNATURE=\"\\'GTM \\'\" kComponentSignatureString=\"\\\"GoogleToolboxForMac\\\"\"";
+				MACOSX_DEPLOYMENT_TARGET = 10.5;
 			};
 			name = Release;
 		};
diff --git a/UnitTest-Info.plist b/UnitTest-Info.plist
index 71daf7d..8f36dfe 100644
--- a/UnitTest-Info.plist
+++ b/UnitTest-Info.plist
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
 	<key>CFBundleDevelopmentRegion</key>
@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>${EXECUTABLE_NAME}</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.google.${PRODUCT_NAME}</string>
+	<string>com.google.${PRODUCT_NAME:rfc1034identifier}</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundlePackageType</key>
diff --git a/UnitTesting/GTMAppKitUnitTestingUtilities.m b/UnitTesting/GTMAppKitUnitTestingUtilities.m
index 6f51410..5d87541 100644
--- a/UnitTesting/GTMAppKitUnitTestingUtilities.m
+++ b/UnitTesting/GTMAppKitUnitTestingUtilities.m
@@ -205,8 +205,8 @@ void GTMSetColorProfileToGenericRGB(void) {
     // No way to force this case in a unittest.
     _GTMDevLog(@"Failed to get current color profile. "
                "I will not be able to restore your current profile, thus I'm "
-               "not changing it. Many unit tests may fail as a result. (Error: %i)",
-          error);
+               "not changing it. Many unit tests may fail as a result. (Error: %li)",
+          (long)error);
     return;
     // COV_NF_END
   }
@@ -230,7 +230,7 @@ void GTMSetColorProfileToGenericRGB(void) {
     // COV_NF_START
     // No way to force this case in a unittest.
     _GTMDevLog(@"Failed to set color profile to \"%@\"! Many unit tests will fail as "
-               "a result.  (Error: %i)", genericProfileName, error);
+               "a result.  (Error: %li)", genericProfileName, (long)error);
     // COV_NF_END
   } else {
     gGTMCurrentColorProfile = previousProfile;
-- 
cgit v1.2.3