[Author: thomasvl]

Added Xcode configs for iPhone 2.2, 2.2.1, 3.0, 3.1, 3.1.2.
Updated the GTMiPhone project to have multiple config support.
Updated the helper script to handle all the iPhone configs also.
Left the generic configs in for now until the automated builds are updated.
Updated one issues with the atomic ops and iphone 3+ sdks.

R=dmaclach
DELTA=1413  (1397 added, 0 deleted, 16 changed)

23 files changed, 1413 insertions, 16 deletions

diff --git a/BuildScripts/BuildAllSDKs.sh b/BuildScripts/BuildAllSDKs.sh
index 32a867d..fccccf1 100755
--- a/BuildScripts/BuildAllSDKs.sh
+++ b/BuildScripts/BuildAllSDKs.sh
@@ -4,7 +4,7 @@
 # This script builds the Tiger, Leopard, SnowLeopard and iPhone versions of the 
 # requested target in the current basic config (debug, release, debug-gcov).
 #
-# Copyright 2006-2008 Google Inc.
+# Copyright 2006-2009 Google Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may not
 # use this file except in compliance with the License.  You may obtain a copy
@@ -18,12 +18,17 @@
 # License for the specific language governing permissions and limitations under
 # the License.
 
+# This scrit runs as the build script, it actually exits having really done no
+# build.  Instead it creates and launches and AppleScript that then drives
+# Xcode to do the real builds cycling through configurations/projects to get
+# everything done.
+
 GTM_PROJECT_TARGET="$1"
 GTMIPHONE_PROJECT_TARGET="$2"
 STARTING_TARGET="${TARGET_NAME}"
 SCRIPT_APP="${TMPDIR}DoBuild.app"
 
-REQUESTED_BUILD_STYLE=$(echo "${BUILD_STYLE}" | sed -E "s/(.*OrLater-)?(.*)/\2/")
+REQUESTED_BUILD_STYLE=$(echo "${BUILD_STYLE}" | sed -E "s/((iPhone.*)|(.*OrLater))-(.*)/\4/")
 # See if we were told to clean instead of build.
 PROJECT_ACTION="build"
 if [ "${ACTION}" == "clean" ]; then
@@ -38,6 +43,7 @@ AVAILABLE_PLATFORMS=`eval ls ${DEVELOPER_DIR}/Platforms`
 GTMIPHONE_OPEN_EXTRAS=""
 GTMIPHONE_BUILD_EXTRAS=""
 if [ "${GTMIPHONE_PROJECT_TARGET}" != "" ]; then
+  AVAILABLE_IPHONE_SDKS=`eval ls ${DEVELOPER_DIR}/Platforms/iPhoneSimulator.platform/Developer/SDKs`
   GTMIPHONE_OPEN_EXTRAS="
     if \"${AVAILABLE_PLATFORMS}\" contains \"iPhoneSimulator.platform\" then
       -- make sure both project files are open
@@ -46,13 +52,77 @@ if [ "${GTMIPHONE_PROJECT_TARGET}" != "" ]; then
     end if"
   GTMIPHONE_BUILD_EXTRAS="
     if \"${AVAILABLE_PLATFORMS}\" contains \"iPhoneSimulator.platform\" then
-      with timeout of 9999 seconds
-        tell project \"GTMiPhone\"
-          -- do the GTMiPhone build
-          ${PROJECT_ACTION} using build configuration \"${REQUESTED_BUILD_STYLE}\"
-          set active target to target \"${STARTING_TARGET}\"
-        end tell
-      end timeout
+      tell project \"GTMiPhone\"
+        -- wait for stub build to finish before kicking off the real builds.
+        set x to 0
+        repeat while currently building
+          delay 0.5
+          set x to x + 1
+          if x > 6 then
+            display alert \"GTMiPhone is still building, can't start.\"
+            return
+          end if
+        end repeat
+        -- do the GTMiPhone builds
+        with timeout of 9999 seconds
+          if \"{$AVAILABLE_IPHONE_SDKS}\" contains \"iPhoneSimulator2.0.sdk\" then
+            set active target to target \"${GTMIPHONE_PROJECT_TARGET}\"
+            set buildResult to ${PROJECT_ACTION} using build configuration \"iPhone2.0-${REQUESTED_BUILD_STYLE}\"
+            set active target to target \"${STARTING_TARGET}\"
+            if buildResult is not equal to \"Build succeeded\" then
+              return
+            end if
+          end if
+          if \"{$AVAILABLE_IPHONE_SDKS}\" contains \"iPhoneSimulator2.1.sdk\" then
+            set active target to target \"${GTMIPHONE_PROJECT_TARGET}\"
+            set buildResult to ${PROJECT_ACTION} using build configuration \"iPhone2.1-${REQUESTED_BUILD_STYLE}\"
+            set active target to target \"${STARTING_TARGET}\"
+            if buildResult is not equal to \"Build succeeded\" then
+              return
+            end if
+          end if
+          if \"{$AVAILABLE_IPHONE_SDKS}\" contains \"iPhoneSimulator2.2.sdk\" then
+            set active target to target \"${GTMIPHONE_PROJECT_TARGET}\"
+            set buildResult to ${PROJECT_ACTION} using build configuration \"iPhone2.2-${REQUESTED_BUILD_STYLE}\"
+            set active target to target \"${STARTING_TARGET}\"
+            if buildResult is not equal to \"Build succeeded\" then
+              return
+            end if
+          end if
+          if \"{$AVAILABLE_IPHONE_SDKS}\" contains \"iPhoneSimulator2.2.1.sdk\" then
+            set active target to target \"${GTMIPHONE_PROJECT_TARGET}\"
+            set buildResult to ${PROJECT_ACTION} using build configuration \"iPhone2.2.1-${REQUESTED_BUILD_STYLE}\"
+            set active target to target \"${STARTING_TARGET}\"
+            if buildResult is not equal to \"Build succeeded\" then
+              return
+            end if
+          end if
+          if \"{$AVAILABLE_IPHONE_SDKS}\" contains \"iPhoneSimulator3.0.sdk\" then
+            set active target to target \"${GTMIPHONE_PROJECT_TARGET}\"
+            set buildResult to ${PROJECT_ACTION} using build configuration \"iPhone3.0-${REQUESTED_BUILD_STYLE}\"
+            set active target to target \"${STARTING_TARGET}\"
+            if buildResult is not equal to \"Build succeeded\" then
+              return
+            end if
+          end if
+          if \"{$AVAILABLE_IPHONE_SDKS}\" contains \"iPhoneSimulator3.1.sdk\" then
+            set active target to target \"${GTMIPHONE_PROJECT_TARGET}\"
+            set buildResult to ${PROJECT_ACTION} using build configuration \"iPhone3.1-${REQUESTED_BUILD_STYLE}\"
+            set active target to target \"${STARTING_TARGET}\"
+            if buildResult is not equal to \"Build succeeded\" then
+              return
+            end if
+          end if
+          if \"{$AVAILABLE_IPHONE_SDKS}\" contains \"iPhoneSimulator3.1.2.sdk\" then
+            set active target to target \"${GTMIPHONE_PROJECT_TARGET}\"
+            set buildResult to ${PROJECT_ACTION} using build configuration \"iPhone3.1.2-${REQUESTED_BUILD_STYLE}\"
+            set active target to target \"${STARTING_TARGET}\"
+            if buildResult is not equal to \"Build succeeded\" then
+              return
+            end if
+          end if
+        end timeout
+      end tell
     end if"
 fi
 
@@ -63,7 +133,7 @@ OUR_BUILD_SCRIPT="on run
     ${GTMIPHONE_OPEN_EXTRAS}
     if \"${AVAILABLE_PLATFORMS}\" contains \"MacOSX.platform\" then
       tell project \"GTM\"
-        -- wait for build to finish
+        -- wait for stub build to finish before kicking off the real builds.
         set x to 0
         repeat while currently building
           delay 0.5
diff --git a/Foundation/GTMObjC2Runtime.h b/Foundation/GTMObjC2Runtime.h
index 9f5afa0..3671381 100644
--- a/Foundation/GTMObjC2Runtime.h
+++ b/Foundation/GTMObjC2Runtime.h
@@ -91,7 +91,10 @@ GTM_INLINE bool OSAtomicCompareAndSwapPtrBarrier(void *predicate,
 #endif  // MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_5
 #endif  // MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5
 
-#if (MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5) || (GTM_IPHONE_DEVICE)
+#if    (MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5) \
+    || (GTM_IPHONE_DEVICE) \
+    || (defined(__IPHONE_3_0) \
+        && (__IPHONE_OS_VERSION_MIN_REQUIRED >= __IPHONE_3_0))
 
 GTM_INLINE BOOL objc_atomicCompareAndSwapGlobalBarrier(id predicate, 
                                                        id replacement, 
@@ -107,4 +110,4 @@ GTM_INLINE BOOL objc_atomicCompareAndSwapInstanceVariableBarrier(id predicate,
                                           replacement, 
                                           (void * volatile *)objectLocation);
 }
-#endif  // (MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5) || (GTM_IPHONE_DEVICE)
+#endif  // (OS_MIN > 10.5) || (GTM_IPHONE_DEVICE) || (IPHONE_MIN > 3.0)
diff --git a/GTMiPhone.xcodeproj/project.pbxproj b/GTMiPhone.xcodeproj/project.pbxproj
index 6430e40..9ea78b6 100644
--- a/GTMiPhone.xcodeproj/project.pbxproj
+++ b/GTMiPhone.xcodeproj/project.pbxproj
@@ -294,6 +294,18 @@
 		F4E3B3D60EB5EF2400CB713D /* GTMUIFont+LineHeight.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "GTMUIFont+LineHeight.h"; sourceTree = "<group>"; };
 		F4E3B3D70EB5EF2400CB713D /* GTMUIFont+LineHeight.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "GTMUIFont+LineHeight.m"; sourceTree = "<group>"; };
 		F4E3B3E10EB5EF9A00CB713D /* GTMUIFont+LineHeightTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "GTMUIFont+LineHeightTest.m"; sourceTree = "<group>"; };
+		F4E426AC10B70DFB00F28A35 /* DebugiPhone21.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = DebugiPhone21.xcconfig; sourceTree = "<group>"; };
+		F4E426AD10B70DFB00F28A35 /* DebugiPhone22.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = DebugiPhone22.xcconfig; sourceTree = "<group>"; };
+		F4E426AE10B70DFB00F28A35 /* DebugiPhone30.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = DebugiPhone30.xcconfig; sourceTree = "<group>"; };
+		F4E426AF10B70DFB00F28A35 /* DebugiPhone31.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = DebugiPhone31.xcconfig; sourceTree = "<group>"; };
+		F4E426B010B70DFB00F28A35 /* DebugiPhone221.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = DebugiPhone221.xcconfig; sourceTree = "<group>"; };
+		F4E426B110B70DFB00F28A35 /* DebugiPhone312.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = DebugiPhone312.xcconfig; sourceTree = "<group>"; };
+		F4E426B210B70DFB00F28A35 /* ReleaseiPhone21.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = ReleaseiPhone21.xcconfig; sourceTree = "<group>"; };
+		F4E426B310B70DFB00F28A35 /* ReleaseiPhone22.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = ReleaseiPhone22.xcconfig; sourceTree = "<group>"; };
+		F4E426B410B70DFB00F28A35 /* ReleaseiPhone30.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = ReleaseiPhone30.xcconfig; sourceTree = "<group>"; };
+		F4E426B510B70DFB00F28A35 /* ReleaseiPhone31.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = ReleaseiPhone31.xcconfig; sourceTree = "<group>"; };
+		F4E426B610B70DFB00F28A35 /* ReleaseiPhone221.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = ReleaseiPhone221.xcconfig; sourceTree = "<group>"; };
+		F4E426B710B70DFB00F28A35 /* ReleaseiPhone312.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = ReleaseiPhone312.xcconfig; sourceTree = "<group>"; };
 		F4EF8AD40EBFF814008DD6DA /* GTMStackTrace.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTMStackTrace.h; sourceTree = "<group>"; };
 		F4EF8AD50EBFF814008DD6DA /* GTMStackTrace.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTMStackTrace.m; sourceTree = "<group>"; };
 		F4EF8AD60EBFF814008DD6DA /* GTMStackTraceTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTMStackTraceTest.m; sourceTree = "<group>"; };
@@ -554,7 +566,19 @@
 			isa = PBXGroup;
 			children = (
 				8BC049850DAEC59100C2D1CA /* DebugiPhone20.xcconfig */,
+				F4E426AC10B70DFB00F28A35 /* DebugiPhone21.xcconfig */,
+				F4E426AD10B70DFB00F28A35 /* DebugiPhone22.xcconfig */,
+				F4E426B010B70DFB00F28A35 /* DebugiPhone221.xcconfig */,
+				F4E426AE10B70DFB00F28A35 /* DebugiPhone30.xcconfig */,
+				F4E426AF10B70DFB00F28A35 /* DebugiPhone31.xcconfig */,
+				F4E426B110B70DFB00F28A35 /* DebugiPhone312.xcconfig */,
 				8BC049890DAEC59100C2D1CA /* ReleaseiPhone20.xcconfig */,
+				F4E426B210B70DFB00F28A35 /* ReleaseiPhone21.xcconfig */,
+				F4E426B310B70DFB00F28A35 /* ReleaseiPhone22.xcconfig */,
+				F4E426B610B70DFB00F28A35 /* ReleaseiPhone221.xcconfig */,
+				F4E426B410B70DFB00F28A35 /* ReleaseiPhone30.xcconfig */,
+				F4E426B510B70DFB00F28A35 /* ReleaseiPhone31.xcconfig */,
+				F4E426B710B70DFB00F28A35 /* ReleaseiPhone312.xcconfig */,
 			);
 			path = Project;
 			sourceTree = "<group>";
@@ -889,6 +913,727 @@
 			};
 			name = Release;
 		};
+		F4E4263610B70C4F00F28A35 /* iPhone2.0-Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 8BC049850DAEC59100C2D1CA /* DebugiPhone20.xcconfig */;
+			buildSettings = {
+				GCC_PRECOMPILE_PREFIX_HEADER = YES;
+				GCC_PREFIX_HEADER = GTM_Prefix.pch;
+				GCC_WARN_SHADOW = YES;
+				GTM_EXTRA_WARNING_OVERRIDE_CFLAGS = "-Wno-unused-parameter";
+			};
+			name = "iPhone2.0-Debug";
+		};
+		F4E4263710B70C4F00F28A35 /* iPhone2.0-Debug-gcov */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 8BC049850DAEC59100C2D1CA /* DebugiPhone20.xcconfig */;
+			buildSettings = {
+				GCC_PRECOMPILE_PREFIX_HEADER = YES;
+				GCC_PREFIX_HEADER = GTM_Prefix.pch;
+				GCC_WARN_SHADOW = YES;
+				GTM_EXTRA_WARNING_OVERRIDE_CFLAGS = "-Wno-unused-parameter";
+			};
+			name = "iPhone2.0-Debug-gcov";
+		};
+		F4E4263810B70C4F00F28A35 /* iPhone2.0-Release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 8BC049890DAEC59100C2D1CA /* ReleaseiPhone20.xcconfig */;
+			buildSettings = {
+				GCC_PRECOMPILE_PREFIX_HEADER = YES;
+				GCC_PREFIX_HEADER = GTM_Prefix.pch;
+				GCC_WARN_SHADOW = YES;
+				GTM_EXTRA_WARNING_OVERRIDE_CFLAGS = "-Wno-unused-parameter";
+			};
+			name = "iPhone2.0-Release";
+		};
+		F4E4263910B70C4F00F28A35 /* iPhone2.0-Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				PRODUCT_NAME = "All UnitTests";
+			};
+			name = "iPhone2.0-Debug";
+		};
+		F4E4263A10B70C4F00F28A35 /* iPhone2.0-Debug-gcov */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				PRODUCT_NAME = "All UnitTests";
+			};
+			name = "iPhone2.0-Debug-gcov";
+		};
+		F4E4263B10B70C4F00F28A35 /* iPhone2.0-Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				PRODUCT_NAME = "All UnitTests";
+			};
+			name = "iPhone2.0-Release";
+		};
+		F4E4263C10B70C4F00F28A35 /* iPhone2.0-Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				INFOPLIST_FILE = "GTMiPhone-Info.plist";
+				PRODUCT_NAME = GTMiPhoneTest;
+				SDKROOT = iphonesimulator2.0;
+			};
+			name = "iPhone2.0-Debug";
+		};
+		F4E4263D10B70C4F00F28A35 /* iPhone2.0-Debug-gcov */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 8BC0498F0DAEC59100C2D1CA /* CodeCoverage.xcconfig */;
+			buildSettings = {
+				INFOPLIST_FILE = "GTMiPhone-Info.plist";
+				PRODUCT_NAME = GTMiPhoneTest;
+				SDKROOT = iphonesimulator2.0;
+			};
+			name = "iPhone2.0-Debug-gcov";
+		};
+		F4E4263E10B70C4F00F28A35 /* iPhone2.0-Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				INFOPLIST_FILE = "GTMiPhone-Info.plist";
+				PRODUCT_NAME = GTMiPhoneTest;
+				SDKROOT = iphonesimulator2.0;
+			};
+			name = "iPhone2.0-Release";
+		};
+		F4E4263F10B70C4F00F28A35 /* iPhone2.0-Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				PRODUCT_NAME = "All UnitTests all SDKs";
+			};
+			name = "iPhone2.0-Debug";
+		};
+		F4E4264010B70C4F00F28A35 /* iPhone2.0-Debug-gcov */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				PRODUCT_NAME = "All UnitTests all SDKs";
+			};
+			name = "iPhone2.0-Debug-gcov";
+		};
+		F4E4264110B70C4F00F28A35 /* iPhone2.0-Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				PRODUCT_NAME = "All UnitTests all SDKs";
+			};
+			name = "iPhone2.0-Release";
+		};
+		F4E4265110B70C9300F28A35 /* iPhone2.1-Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = F4E426AC10B70DFB00F28A35 /* DebugiPhone21.xcconfig */;
+			buildSettings = {
+				GCC_PRECOMPILE_PREFIX_HEADER = YES;
+				GCC_PREFIX_HEADER = GTM_Prefix.pch;
+				GCC_WARN_SHADOW = YES;
+				GTM_EXTRA_WARNING_OVERRIDE_CFLAGS = "-Wno-unused-parameter";
+			};
+			name = "iPhone2.1-Debug";
+		};
+		F4E4265210B70C9300F28A35 /* iPhone2.1-Debug-gcov */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = F4E426AC10B70DFB00F28A35 /* DebugiPhone21.xcconfig */;
+			buildSettings = {
+				GCC_PRECOMPILE_PREFIX_HEADER = YES;
+				GCC_PREFIX_HEADER = GTM_Prefix.pch;
+				GCC_WARN_SHADOW = YES;
+				GTM_EXTRA_WARNING_OVERRIDE_CFLAGS = "-Wno-unused-parameter";
+			};
+			name = "iPhone2.1-Debug-gcov";
+		};
+		F4E4265310B70C9300F28A35 /* iPhone2.1-Release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = F4E426B210B70DFB00F28A35 /* ReleaseiPhone21.xcconfig */;
+			buildSettings = {
+				GCC_PRECOMPILE_PREFIX_HEADER = YES;
+				GCC_PREFIX_HEADER = GTM_Prefix.pch;
+				GCC_WARN_SHADOW = YES;
+				GTM_EXTRA_WARNING_OVERRIDE_CFLAGS = "-Wno-unused-parameter";
+			};
+			name = "iPhone2.1-Release";
+		};
+		F4E4265410B70C9300F28A35 /* iPhone2.1-Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				PRODUCT_NAME = "All UnitTests";
+			};
+			name = "iPhone2.1-Debug";
+		};
+		F4E4265510B70C9300F28A35 /* iPhone2.1-Debug-gcov */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				PRODUCT_NAME = "All UnitTests";
+			};
+			name = "iPhone2.1-Debug-gcov";
+		};
+		F4E4265610B70C9300F28A35 /* iPhone2.1-Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				PRODUCT_NAME = "All UnitTests";
+			};
+			name = "iPhone2.1-Release";
+		};
+		F4E4265710B70C9300F28A35 /* iPhone2.1-Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				INFOPLIST_FILE = "GTMiPhone-Info.plist";
+				PRODUCT_NAME = GTMiPhoneTest;
+				SDKROOT = iphonesimulator2.1;
+			};
+			name = "iPhone2.1-Debug";
+		};
+		F4E4265810B70C9300F28A35 /* iPhone2.1-Debug-gcov */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 8BC0498F0DAEC59100C2D1CA /* CodeCoverage.xcconfig */;
+			buildSettings = {
+				INFOPLIST_FILE = "GTMiPhone-Info.plist";
+				PRODUCT_NAME = GTMiPhoneTest;
+				SDKROOT = iphonesimulator2.1;
+			};
+			name = "iPhone2.1-Debug-gcov";
+		};
+		F4E4265910B70C9300F28A35 /* iPhone2.1-Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				INFOPLIST_FILE = "GTMiPhone-Info.plist";
+				PRODUCT_NAME = GTMiPhoneTest;
+				SDKROOT = iphonesimulator2.1;
+			};
+			name = "iPhone2.1-Release";
+		};
+		F4E4265A10B70C9300F28A35 /* iPhone2.1-Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				PRODUCT_NAME = "All UnitTests all SDKs";
+			};
+			name = "iPhone2.1-Debug";
+		};
+		F4E4265B10B70C9300F28A35 /* iPhone2.1-Debug-gcov */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				PRODUCT_NAME = "All UnitTests all SDKs";
+			};
+			name = "iPhone2.1-Debug-gcov";
+		};
+		F4E4265C10B70C9300F28A35 /* iPhone2.1-Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				PRODUCT_NAME = "All UnitTests all SDKs";
+			};
+			name = "iPhone2.1-Release";
+		};
+		F4E4265D10B70CAC00F28A35 /* iPhone2.2-Debug-gcov */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = F4E426AD10B70DFB00F28A35 /* DebugiPhone22.xcconfig */;
+			buildSettings = {
+				GCC_PRECOMPILE_PREFIX_HEADER = YES;
+				GCC_PREFIX_HEADER = GTM_Prefix.pch;
+				GCC_WARN_SHADOW = YES;
+				GTM_EXTRA_WARNING_OVERRIDE_CFLAGS = "-Wno-unused-parameter";
+			};
+			name = "iPhone2.2-Debug-gcov";
+		};
+		F4E4265E10B70CAC00F28A35 /* iPhone2.2-Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = F4E426AD10B70DFB00F28A35 /* DebugiPhone22.xcconfig */;
+			buildSettings = {
+				GCC_PRECOMPILE_PREFIX_HEADER = YES;
+				GCC_PREFIX_HEADER = GTM_Prefix.pch;
+				GCC_WARN_SHADOW = YES;
+				GTM_EXTRA_WARNING_OVERRIDE_CFLAGS = "-Wno-unused-parameter";
+			};
+			name = "iPhone2.2-Debug";
+		};
+		F4E4265F10B70CAC00F28A35 /* iPhone2.2-Release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = F4E426B310B70DFB00F28A35 /* ReleaseiPhone22.xcconfig */;
+			buildSettings = {
+				GCC_PRECOMPILE_PREFIX_HEADER = YES;
+				GCC_PREFIX_HEADER = GTM_Prefix.pch;
+				GCC_WARN_SHADOW = YES;
+				GTM_EXTRA_WARNING_OVERRIDE_CFLAGS = "-Wno-unused-parameter";
+			};
+			name = "iPhone2.2-Release";
+		};
+		F4E4266010B70CAC00F28A35 /* iPhone2.2-Debug-gcov */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				PRODUCT_NAME = "All UnitTests";
+			};
+			name = "iPhone2.2-Debug-gcov";
+		};
+		F4E4266110B70CAC00F28A35 /* iPhone2.2-Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				PRODUCT_NAME = "All UnitTests";
+			};
+			name = "iPhone2.2-Debug";
+		};
+		F4E4266210B70CAC00F28A35 /* iPhone2.2-Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				PRODUCT_NAME = "All UnitTests";
+			};
+			name = "iPhone2.2-Release";
+		};
+		F4E4266310B70CAC00F28A35 /* iPhone2.2-Debug-gcov */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 8BC0498F0DAEC59100C2D1CA /* CodeCoverage.xcconfig */;
+			buildSettings = {
+				INFOPLIST_FILE = "GTMiPhone-Info.plist";
+				PRODUCT_NAME = GTMiPhoneTest;
+				SDKROOT = iphonesimulator2.2;
+			};
+			name = "iPhone2.2-Debug-gcov";
+		};
+		F4E4266410B70CAC00F28A35 /* iPhone2.2-Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				INFOPLIST_FILE = "GTMiPhone-Info.plist";
+				PRODUCT_NAME = GTMiPhoneTest;
+				SDKROOT = iphonesimulator2.2;
+			};
+			name = "iPhone2.2-Debug";
+		};
+		F4E4266510B70CAC00F28A35 /* iPhone2.2-Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				INFOPLIST_FILE = "GTMiPhone-Info.plist";
+				PRODUCT_NAME = GTMiPhoneTest;
+				SDKROOT = iphonesimulator2.2;
+			};
+			name = "iPhone2.2-Release";
+		};
+		F4E4266610B70CAC00F28A35 /* iPhone2.2-Debug-gcov */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				PRODUCT_NAME = "All UnitTests all SDKs";
+			};
+			name = "iPhone2.2-Debug-gcov";
+		};
+		F4E4266710B70CAC00F28A35 /* iPhone2.2-Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				PRODUCT_NAME = "All UnitTests all SDKs";
+			};
+			name = "iPhone2.2-Debug";
+		};
+		F4E4266810B70CAC00F28A35 /* iPhone2.2-Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				PRODUCT_NAME = "All UnitTests all SDKs";
+			};
+			name = "iPhone2.2-Release";
+		};
+		F4E4267510B70CE200F28A35 /* iPhone2.2.1-Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = F4E426B010B70DFB00F28A35 /* DebugiPhone221.xcconfig */;
+			buildSettings = {
+				GCC_PRECOMPILE_PREFIX_HEADER = YES;
+				GCC_PREFIX_HEADER = GTM_Prefix.pch;
+				GCC_WARN_SHADOW = YES;
+				GTM_EXTRA_WARNING_OVERRIDE_CFLAGS = "-Wno-unused-parameter";
+			};
+			name = "iPhone2.2.1-Debug";
+		};
+		F4E4267610B70CE200F28A35 /* iPhone2.2.1-Debug-gcov */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = F4E426B010B70DFB00F28A35 /* DebugiPhone221.xcconfig */;
+			buildSettings = {
+				GCC_PRECOMPILE_PREFIX_HEADER = YES;
+				GCC_PREFIX_HEADER = GTM_Prefix.pch;
+				GCC_WARN_SHADOW = YES;
+				GTM_EXTRA_WARNING_OVERRIDE_CFLAGS = "-Wno-unused-parameter";
+			};
+			name = "iPhone2.2.1-Debug-gcov";
+		};
+		F4E4267710B70CE200F28A35 /* iPhone2.2.1-Release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = F4E426B610B70DFB00F28A35 /* ReleaseiPhone221.xcconfig */;
+			buildSettings = {
+				GCC_PRECOMPILE_PREFIX_HEADER = YES;
+				GCC_PREFIX_HEADER = GTM_Prefix.pch;
+				GCC_WARN_SHADOW = YES;
+				GTM_EXTRA_WARNING_OVERRIDE_CFLAGS = "-Wno-unused-parameter";
+			};
+			name = "iPhone2.2.1-Release";
+		};
+		F4E4267810B70CE200F28A35 /* iPhone2.2.1-Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				PRODUCT_NAME = "All UnitTests";
+			};
+			name = "iPhone2.2.1-Debug";
+		};
+		F4E4267910B70CE200F28A35 /* iPhone2.2.1-Debug-gcov */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				PRODUCT_NAME = "All UnitTests";
+			};
+			name = "iPhone2.2.1-Debug-gcov";
+		};
+		F4E4267A10B70CE200F28A35 /* iPhone2.2.1-Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				PRODUCT_NAME = "All UnitTests";
+			};
+			name = "iPhone2.2.1-Release";
+		};
+		F4E4267B10B70CE200F28A35 /* iPhone2.2.1-Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				INFOPLIST_FILE = "GTMiPhone-Info.plist";
+				PRODUCT_NAME = GTMiPhoneTest;
+				SDKROOT = iphonesimulator2.2.1;
+			};
+			name = "iPhone2.2.1-Debug";
+		};
+		F4E4267C10B70CE200F28A35 /* iPhone2.2.1-Debug-gcov */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 8BC0498F0DAEC59100C2D1CA /* CodeCoverage.xcconfig */;
+			buildSettings = {
+				INFOPLIST_FILE = "GTMiPhone-Info.plist";
+				PRODUCT_NAME = GTMiPhoneTest;
+				SDKROOT = iphonesimulator2.2.1;
+			};
+			name = "iPhone2.2.1-Debug-gcov";
+		};
+		F4E4267D10B70CE200F28A35 /* iPhone2.2.1-Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				INFOPLIST_FILE = "GTMiPhone-Info.plist";
+				PRODUCT_NAME = GTMiPhoneTest;
+				SDKROOT = iphonesimulator2.2.1;
+			};
+			name = "iPhone2.2.1-Release";
+		};
+		F4E4267E10B70CE200F28A35 /* iPhone2.2.1-Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				PRODUCT_NAME = "All UnitTests all SDKs";
+			};
+			name = "iPhone2.2.1-Debug";
+		};
+		F4E4267F10B70CE200F28A35 /* iPhone2.2.1-Debug-gcov */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				PRODUCT_NAME = "All UnitTests all SDKs";
+			};
+			name = "iPhone2.2.1-Debug-gcov";
+		};
+		F4E4268010B70CE200F28A35 /* iPhone2.2.1-Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				PRODUCT_NAME = "All UnitTests all SDKs";
+			};
+			name = "iPhone2.2.1-Release";
+		};
+		F4E4268110B70CF900F28A35 /* iPhone3.0-Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = F4E426AE10B70DFB00F28A35 /* DebugiPhone30.xcconfig */;
+			buildSettings = {
+				GCC_PRECOMPILE_PREFIX_HEADER = YES;
+				GCC_PREFIX_HEADER = GTM_Prefix.pch;
+				GCC_WARN_SHADOW = YES;
+				GTM_EXTRA_WARNING_OVERRIDE_CFLAGS = "-Wno-unused-parameter";
+			};
+			name = "iPhone3.0-Debug";
+		};
+		F4E4268210B70CF900F28A35 /* iPhone3.0-Debug-gcov */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = F4E426B410B70DFB00F28A35 /* ReleaseiPhone30.xcconfig */;
+			buildSettings = {
+				GCC_PRECOMPILE_PREFIX_HEADER = YES;
+				GCC_PREFIX_HEADER = GTM_Prefix.pch;
+				GCC_WARN_SHADOW = YES;
+				GTM_EXTRA_WARNING_OVERRIDE_CFLAGS = "-Wno-unused-parameter";
+			};
+			name = "iPhone3.0-Debug-gcov";
+		};
+		F4E4268310B70CF900F28A35 /* iPhone3.0-Release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = F4E426B410B70DFB00F28A35 /* ReleaseiPhone30.xcconfig */;
+			buildSettings = {
+				GCC_PRECOMPILE_PREFIX_HEADER = YES;
+				GCC_PREFIX_HEADER = GTM_Prefix.pch;
+				GCC_WARN_SHADOW = YES;
+				GTM_EXTRA_WARNING_OVERRIDE_CFLAGS = "-Wno-unused-parameter";
+			};
+			name = "iPhone3.0-Release";
+		};
+		F4E4268410B70CF900F28A35 /* iPhone3.0-Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				PRODUCT_NAME = "All UnitTests";
+			};
+			name = "iPhone3.0-Debug";
+		};
+		F4E4268510B70CF900F28A35 /* iPhone3.0-Debug-gcov */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				PRODUCT_NAME = "All UnitTests";
+			};
+			name = "iPhone3.0-Debug-gcov";
+		};
+		F4E4268610B70CF900F28A35 /* iPhone3.0-Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				PRODUCT_NAME = "All UnitTests";
+			};
+			name = "iPhone3.0-Release";
+		};
+		F4E4268710B70CF900F28A35 /* iPhone3.0-Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				INFOPLIST_FILE = "GTMiPhone-Info.plist";
+				PRODUCT_NAME = GTMiPhoneTest;
+				SDKROOT = iphonesimulator3.0;
+			};
+			name = "iPhone3.0-Debug";
+		};
+		F4E4268810B70CF900F28A35 /* iPhone3.0-Debug-gcov */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 8BC0498F0DAEC59100C2D1CA /* CodeCoverage.xcconfig */;
+			buildSettings = {
+				INFOPLIST_FILE = "GTMiPhone-Info.plist";
+				PRODUCT_NAME = GTMiPhoneTest;
+				SDKROOT = iphonesimulator3.0;
+			};
+			name = "iPhone3.0-Debug-gcov";
+		};
+		F4E4268910B70CF900F28A35 /* iPhone3.0-Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				INFOPLIST_FILE = "GTMiPhone-Info.plist";
+				PRODUCT_NAME = GTMiPhoneTest;
+				SDKROOT = iphonesimulator3.0;
+			};
+			name = "iPhone3.0-Release";
+		};
+		F4E4268A10B70CF900F28A35 /* iPhone3.0-Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				PRODUCT_NAME = "All UnitTests all SDKs";
+			};
+			name = "iPhone3.0-Debug";
+		};
+		F4E4268B10B70CF900F28A35 /* iPhone3.0-Debug-gcov */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				PRODUCT_NAME = "All UnitTests all SDKs";
+			};
+			name = "iPhone3.0-Debug-gcov";
+		};
+		F4E4268C10B70CF900F28A35 /* iPhone3.0-Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				PRODUCT_NAME = "All UnitTests all SDKs";
+			};
+			name = "iPhone3.0-Release";
+		};
+		F4E4268D10B70D1800F28A35 /* iPhone3.1-Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = F4E426B510B70DFB00F28A35 /* ReleaseiPhone31.xcconfig */;
+			buildSettings = {
+				GCC_PRECOMPILE_PREFIX_HEADER = YES;
+				GCC_PREFIX_HEADER = GTM_Prefix.pch;
+				GCC_WARN_SHADOW = YES;
+				GTM_EXTRA_WARNING_OVERRIDE_CFLAGS = "-Wno-unused-parameter";
+			};
+			name = "iPhone3.1-Debug";
+		};
+		F4E4268E10B70D1800F28A35 /* iPhone3.1-Debug-gcov */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = F4E426B510B70DFB00F28A35 /* ReleaseiPhone31.xcconfig */;
+			buildSettings = {
+				GCC_PRECOMPILE_PREFIX_HEADER = YES;
+				GCC_PREFIX_HEADER = GTM_Prefix.pch;
+				GCC_WARN_SHADOW = YES;
+				GTM_EXTRA_WARNING_OVERRIDE_CFLAGS = "-Wno-unused-parameter";
+			};
+			name = "iPhone3.1-Debug-gcov";
+		};
+		F4E4268F10B70D1800F28A35 /* iPhone3.1-Release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = F4E426B510B70DFB00F28A35 /* ReleaseiPhone31.xcconfig */;
+			buildSettings = {
+				GCC_PRECOMPILE_PREFIX_HEADER = YES;
+				GCC_PREFIX_HEADER = GTM_Prefix.pch;
+				GCC_WARN_SHADOW = YES;
+				GTM_EXTRA_WARNING_OVERRIDE_CFLAGS = "-Wno-unused-parameter";
+			};
+			name = "iPhone3.1-Release";
+		};
+		F4E4269010B70D1800F28A35 /* iPhone3.1-Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				PRODUCT_NAME = "All UnitTests";
+			};
+			name = "iPhone3.1-Debug";
+		};
+		F4E4269110B70D1800F28A35 /* iPhone3.1-Debug-gcov */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				PRODUCT_NAME = "All UnitTests";
+			};
+			name = "iPhone3.1-Debug-gcov";
+		};
+		F4E4269210B70D1800F28A35 /* iPhone3.1-Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				PRODUCT_NAME = "All UnitTests";
+			};
+			name = "iPhone3.1-Release";
+		};
+		F4E4269310B70D1800F28A35 /* iPhone3.1-Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				INFOPLIST_FILE = "GTMiPhone-Info.plist";
+				PRODUCT_NAME = GTMiPhoneTest;
+				SDKROOT = iphonesimulator3.1;
+			};
+			name = "iPhone3.1-Debug";
+		};
+		F4E4269410B70D1800F28A35 /* iPhone3.1-Debug-gcov */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 8BC0498F0DAEC59100C2D1CA /* CodeCoverage.xcconfig */;
+			buildSettings = {
+				INFOPLIST_FILE = "GTMiPhone-Info.plist";
+				PRODUCT_NAME = GTMiPhoneTest;
+				SDKROOT = iphonesimulator3.1;
+			};
+			name = "iPhone3.1-Debug-gcov";
+		};
+		F4E4269510B70D1800F28A35 /* iPhone3.1-Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				INFOPLIST_FILE = "GTMiPhone-Info.plist";
+				PRODUCT_NAME = GTMiPhoneTest;
+				SDKROOT = iphonesimulator3.1;
+			};
+			name = "iPhone3.1-Release";
+		};
+		F4E4269610B70D1800F28A35 /* iPhone3.1-Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				PRODUCT_NAME = "All UnitTests all SDKs";
+			};
+			name = "iPhone3.1-Debug";
+		};
+		F4E4269710B70D1800F28A35 /* iPhone3.1-Debug-gcov */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				PRODUCT_NAME = "All UnitTests all SDKs";
+			};
+			name = "iPhone3.1-Debug-gcov";
+		};
+		F4E4269810B70D1800F28A35 /* iPhone3.1-Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				PRODUCT_NAME = "All UnitTests all SDKs";
+			};
+			name = "iPhone3.1-Release";
+		};
+		F4E4269910B70D2D00F28A35 /* iPhone3.1.2-Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = F4E426B110B70DFB00F28A35 /* DebugiPhone312.xcconfig */;
+			buildSettings = {
+				GCC_PRECOMPILE_PREFIX_HEADER = YES;
+				GCC_PREFIX_HEADER = GTM_Prefix.pch;
+				GCC_WARN_SHADOW = YES;
+				GTM_EXTRA_WARNING_OVERRIDE_CFLAGS = "-Wno-unused-parameter";
+			};
+			name = "iPhone3.1.2-Debug";
+		};
+		F4E4269A10B70D2D00F28A35 /* iPhone3.1.2-Debug-gcov */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = F4E426B110B70DFB00F28A35 /* DebugiPhone312.xcconfig */;
+			buildSettings = {
+				GCC_PRECOMPILE_PREFIX_HEADER = YES;
+				GCC_PREFIX_HEADER = GTM_Prefix.pch;
+				GCC_WARN_SHADOW = YES;
+				GTM_EXTRA_WARNING_OVERRIDE_CFLAGS = "-Wno-unused-parameter";
+			};
+			name = "iPhone3.1.2-Debug-gcov";
+		};
+		F4E4269B10B70D2D00F28A35 /* iPhone3.1.2-Release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = F4E426B710B70DFB00F28A35 /* ReleaseiPhone312.xcconfig */;
+			buildSettings = {
+				GCC_PRECOMPILE_PREFIX_HEADER = YES;
+				GCC_PREFIX_HEADER = GTM_Prefix.pch;
+				GCC_WARN_SHADOW = YES;
+				GTM_EXTRA_WARNING_OVERRIDE_CFLAGS = "-Wno-unused-parameter";
+			};
+			name = "iPhone3.1.2-Release";
+		};
+		F4E4269C10B70D2D00F28A35 /* iPhone3.1.2-Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				PRODUCT_NAME = "All UnitTests";
+			};
+			name = "iPhone3.1.2-Debug";
+		};
+		F4E4269D10B70D2D00F28A35 /* iPhone3.1.2-Debug-gcov */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				PRODUCT_NAME = "All UnitTests";
+			};
+			name = "iPhone3.1.2-Debug-gcov";
+		};
+		F4E4269E10B70D2D00F28A35 /* iPhone3.1.2-Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				PRODUCT_NAME = "All UnitTests";
+			};
+			name = "iPhone3.1.2-Release";
+		};
+		F4E4269F10B70D2D00F28A35 /* iPhone3.1.2-Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				INFOPLIST_FILE = "GTMiPhone-Info.plist";
+				PRODUCT_NAME = GTMiPhoneTest;
+				SDKROOT = iphonesimulator3.1.2;
+			};
+			name = "iPhone3.1.2-Debug";
+		};
+		F4E426A010B70D2D00F28A35 /* iPhone3.1.2-Debug-gcov */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 8BC0498F0DAEC59100C2D1CA /* CodeCoverage.xcconfig */;
+			buildSettings = {
+				INFOPLIST_FILE = "GTMiPhone-Info.plist";
+				PRODUCT_NAME = GTMiPhoneTest;
+				SDKROOT = iphonesimulator3.1.2;
+			};
+			name = "iPhone3.1.2-Debug-gcov";
+		};
+		F4E426A110B70D2D00F28A35 /* iPhone3.1.2-Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				INFOPLIST_FILE = "GTMiPhone-Info.plist";
+				PRODUCT_NAME = GTMiPhoneTest;
+				SDKROOT = iphonesimulator3.1.2;
+			};
+			name = "iPhone3.1.2-Release";
+		};
+		F4E426A210B70D2D00F28A35 /* iPhone3.1.2-Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				PRODUCT_NAME = "All UnitTests all SDKs";
+			};
+			name = "iPhone3.1.2-Debug";
+		};
+		F4E426A310B70D2D00F28A35 /* iPhone3.1.2-Debug-gcov */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				PRODUCT_NAME = "All UnitTests all SDKs";
+			};
+			name = "iPhone3.1.2-Debug-gcov";
+		};
+		F4E426A410B70D2D00F28A35 /* iPhone3.1.2-Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				PRODUCT_NAME = "All UnitTests all SDKs";
+			};
+			name = "iPhone3.1.2-Release";
+		};
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
@@ -898,6 +1643,27 @@
 				1D6058940D05DD3E006BFB54 /* Debug */,
 				8BC0497E0DAEC48600C2D1CA /* Debug-gcov */,
 				1D6058950D05DD3E006BFB54 /* Release */,
+				F4E4263C10B70C4F00F28A35 /* iPhone2.0-Debug */,
+				F4E4263D10B70C4F00F28A35 /* iPhone2.0-Debug-gcov */,
+				F4E4263E10B70C4F00F28A35 /* iPhone2.0-Release */,
+				F4E4265710B70C9300F28A35 /* iPhone2.1-Debug */,
+				F4E4265810B70C9300F28A35 /* iPhone2.1-Debug-gcov */,
+				F4E4265910B70C9300F28A35 /* iPhone2.1-Release */,
+				F4E4266410B70CAC00F28A35 /* iPhone2.2-Debug */,
+				F4E4266310B70CAC00F28A35 /* iPhone2.2-Debug-gcov */,
+				F4E4266510B70CAC00F28A35 /* iPhone2.2-Release */,
+				F4E4267B10B70CE200F28A35 /* iPhone2.2.1-Debug */,
+				F4E4267C10B70CE200F28A35 /* iPhone2.2.1-Debug-gcov */,
+				F4E4267D10B70CE200F28A35 /* iPhone2.2.1-Release */,
+				F4E4268710B70CF900F28A35 /* iPhone3.0-Debug */,
+				F4E4268810B70CF900F28A35 /* iPhone3.0-Debug-gcov */,
+				F4E4268910B70CF900F28A35 /* iPhone3.0-Release */,
+				F4E4269310B70D1800F28A35 /* iPhone3.1-Debug */,
+				F4E4269410B70D1800F28A35 /* iPhone3.1-Debug-gcov */,
+				F4E4269510B70D1800F28A35 /* iPhone3.1-Release */,
+				F4E4269F10B70D2D00F28A35 /* iPhone3.1.2-Debug */,
+				F4E426A010B70D2D00F28A35 /* iPhone3.1.2-Debug-gcov */,
+				F4E426A110B70D2D00F28A35 /* iPhone3.1.2-Release */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
@@ -908,6 +1674,27 @@
 				C01FCF4F08A954540054247B /* Debug */,
 				8BC0497D0DAEC48600C2D1CA /* Debug-gcov */,
 				C01FCF5008A954540054247B /* Release */,
+				F4E4263610B70C4F00F28A35 /* iPhone2.0-Debug */,
+				F4E4263710B70C4F00F28A35 /* iPhone2.0-Debug-gcov */,
+				F4E4263810B70C4F00F28A35 /* iPhone2.0-Release */,
+				F4E4265110B70C9300F28A35 /* iPhone2.1-Debug */,
+				F4E4265210B70C9300F28A35 /* iPhone2.1-Debug-gcov */,
+				F4E4265310B70C9300F28A35 /* iPhone2.1-Release */,
+				F4E4265E10B70CAC00F28A35 /* iPhone2.2-Debug */,
+				F4E4265D10B70CAC00F28A35 /* iPhone2.2-Debug-gcov */,
+				F4E4265F10B70CAC00F28A35 /* iPhone2.2-Release */,
+				F4E4267510B70CE200F28A35 /* iPhone2.2.1-Debug */,
+				F4E4267610B70CE200F28A35 /* iPhone2.2.1-Debug-gcov */,
+				F4E4267710B70CE200F28A35 /* iPhone2.2.1-Release */,
+				F4E4268110B70CF900F28A35 /* iPhone3.0-Debug */,
+				F4E4268210B70CF900F28A35 /* iPhone3.0-Debug-gcov */,
+				F4E4268310B70CF900F28A35 /* iPhone3.0-Release */,
+				F4E4268D10B70D1800F28A35 /* iPhone3.1-Debug */,
+				F4E4268E10B70D1800F28A35 /* iPhone3.1-Debug-gcov */,
+				F4E4268F10B70D1800F28A35 /* iPhone3.1-Release */,
+				F4E4269910B70D2D00F28A35 /* iPhone3.1.2-Debug */,
+				F4E4269A10B70D2D00F28A35 /* iPhone3.1.2-Debug-gcov */,
+				F4E4269B10B70D2D00F28A35 /* iPhone3.1.2-Release */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
@@ -918,6 +1705,27 @@
 				F4B541450E7F022B004738EC /* Debug */,
 				F4B541460E7F022B004738EC /* Debug-gcov */,
 				F4B541470E7F022B004738EC /* Release */,
+				F4E4263F10B70C4F00F28A35 /* iPhone2.0-Debug */,
+				F4E4264010B70C4F00F28A35 /* iPhone2.0-Debug-gcov */,
+				F4E4264110B70C4F00F28A35 /* iPhone2.0-Release */,
+				F4E4265A10B70C9300F28A35 /* iPhone2.1-Debug */,
+				F4E4265B10B70C9300F28A35 /* iPhone2.1-Debug-gcov */,
+				F4E4265C10B70C9300F28A35 /* iPhone2.1-Release */,
+				F4E4266710B70CAC00F28A35 /* iPhone2.2-Debug */,
+				F4E4266610B70CAC00F28A35 /* iPhone2.2-Debug-gcov */,
+				F4E4266810B70CAC00F28A35 /* iPhone2.2-Release */,
+				F4E4267E10B70CE200F28A35 /* iPhone2.2.1-Debug */,
+				F4E4267F10B70CE200F28A35 /* iPhone2.2.1-Debug-gcov */,
+				F4E4268010B70CE200F28A35 /* iPhone2.2.1-Release */,
+				F4E4268A10B70CF900F28A35 /* iPhone3.0-Debug */,
+				F4E4268B10B70CF900F28A35 /* iPhone3.0-Debug-gcov */,
+				F4E4268C10B70CF900F28A35 /* iPhone3.0-Release */,
+				F4E4269610B70D1800F28A35 /* iPhone3.1-Debug */,
+				F4E4269710B70D1800F28A35 /* iPhone3.1-Debug-gcov */,
+				F4E4269810B70D1800F28A35 /* iPhone3.1-Release */,
+				F4E426A210B70D2D00F28A35 /* iPhone3.1.2-Debug */,
+				F4E426A310B70D2D00F28A35 /* iPhone3.1.2-Debug-gcov */,
+				F4E426A410B70D2D00F28A35 /* iPhone3.1.2-Release */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
@@ -928,6 +1736,27 @@
 				F4C7F9C00DC62EC8009BEE5B /* Debug */,
 				F4C7F9C10DC62EC8009BEE5B /* Debug-gcov */,
 				F4C7F9C20DC62EC8009BEE5B /* Release */,
+				F4E4263910B70C4F00F28A35 /* iPhone2.0-Debug */,
+				F4E4263A10B70C4F00F28A35 /* iPhone2.0-Debug-gcov */,
+				F4E4263B10B70C4F00F28A35 /* iPhone2.0-Release */,
+				F4E4265410B70C9300F28A35 /* iPhone2.1-Debug */,
+				F4E4265510B70C9300F28A35 /* iPhone2.1-Debug-gcov */,
+				F4E4265610B70C9300F28A35 /* iPhone2.1-Release */,
+				F4E4266110B70CAC00F28A35 /* iPhone2.2-Debug */,
+				F4E4266010B70CAC00F28A35 /* iPhone2.2-Debug-gcov */,
+				F4E4266210B70CAC00F28A35 /* iPhone2.2-Release */,
+				F4E4267810B70CE200F28A35 /* iPhone2.2.1-Debug */,
+				F4E4267910B70CE200F28A35 /* iPhone2.2.1-Debug-gcov */,
+				F4E4267A10B70CE200F28A35 /* iPhone2.2.1-Release */,
+				F4E4268410B70CF900F28A35 /* iPhone3.0-Debug */,
+				F4E4268510B70CF900F28A35 /* iPhone3.0-Debug-gcov */,
+				F4E4268610B70CF900F28A35 /* iPhone3.0-Release */,
+				F4E4269010B70D1800F28A35 /* iPhone3.1-Debug */,
+				F4E4269110B70D1800F28A35 /* iPhone3.1-Debug-gcov */,
+				F4E4269210B70D1800F28A35 /* iPhone3.1-Release */,
+				F4E4269C10B70D2D00F28A35 /* iPhone3.1.2-Debug */,
+				F4E4269D10B70D2D00F28A35 /* iPhone3.1.2-Debug-gcov */,
+				F4E4269E10B70D2D00F28A35 /* iPhone3.1.2-Release */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt
index a1bdfa2..cc2a282 100644
--- a/ReleaseNotes.txt
+++ b/ReleaseNotes.txt
@@ -349,6 +349,11 @@ Changes since 1.5.1
 - GTMNSAnimation+Duration.m adds support for checking for control and shift
   keys when trying to decide how to calculate durations for animations.
 
+- Added Xcode configs for iPhone 2.2, 2.2.1, 3.0, 3.1, 3.1.2.
+
+- Added configurations GTMiPhone for all the new configs, updated the build
+  scripts to build all iPhone SDKs also.
+
 
 Release 1.5.1
 Changes since 1.5.0
diff --git a/XcodeConfig/Project/DebugiPhone20.xcconfig b/XcodeConfig/Project/DebugiPhone20.xcconfig
index 7424704..c459154 100644
--- a/XcodeConfig/Project/DebugiPhone20.xcconfig
+++ b/XcodeConfig/Project/DebugiPhone20.xcconfig
@@ -30,7 +30,7 @@
 // iPhone settings
 #include "../subconfig/iPhone20.xcconfig"
 
-// Release settings
+// Debug settings
 #include "../subconfig/Debug.xcconfig"
 
 // Merge settings
diff --git a/XcodeConfig/Project/DebugiPhone21.xcconfig b/XcodeConfig/Project/DebugiPhone21.xcconfig
index 18c923a..f64ed64 100644
--- a/XcodeConfig/Project/DebugiPhone21.xcconfig
+++ b/XcodeConfig/Project/DebugiPhone21.xcconfig
@@ -30,7 +30,7 @@
 // iPhone settings
 #include "../subconfig/iPhone21.xcconfig"
 
-// Release settings
+// Debug settings
 #include "../subconfig/Debug.xcconfig"
 
 // Merge settings
diff --git a/XcodeConfig/Project/DebugiPhone22.xcconfig b/XcodeConfig/Project/DebugiPhone22.xcconfig
new file mode 100644
index 0000000..7565fc2
--- /dev/null
+++ b/XcodeConfig/Project/DebugiPhone22.xcconfig
@@ -0,0 +1,37 @@
+//
+//  DebugiPhone22.xcconfig
+//
+//  Xcode configuration file for building a Debug configuration of a project
+//  for iPhone OS 2.2.
+//
+//  Copyright 2009 Google Inc.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License"); you may not
+//  use this file except in compliance with the License.  You may obtain a copy
+//  of the License at
+// 
+//  http://www.apache.org/licenses/LICENSE-2.0
+// 
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+//  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+//  License for the specific language governing permissions and limitations under
+//  the License.
+
+//
+//  This is a _Configuration_ Xcode config file for use in the "Based on" popup
+//  of the project configuration editor. Do _not_ use this as the config base
+//  and individual Xcode target, there are other configuration files for that
+//  purpose.
+
+// Pull in the general settings
+#include "../subconfig/General.xcconfig"
+
+// iPhone settings.
+#include "../subconfig/iPhone22.xcconfig"
+
+// Debug settings
+#include "../subconfig/Debug.xcconfig"
+
+// Merge settings
+#include "../subconfig/GTMMerge.xcconfig"
diff --git a/XcodeConfig/Project/DebugiPhone221.xcconfig b/XcodeConfig/Project/DebugiPhone221.xcconfig
new file mode 100644
index 0000000..bda69d9
--- /dev/null
+++ b/XcodeConfig/Project/DebugiPhone221.xcconfig
@@ -0,0 +1,37 @@
+//
+//  DebugiPhone221.xcconfig
+//
+//  Xcode configuration file for building a Debug configuration of a project
+//  for iPhone OS 2.2.1.
+//
+//  Copyright 2009 Google Inc.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License"); you may not
+//  use this file except in compliance with the License.  You may obtain a copy
+//  of the License at
+// 
+//  http://www.apache.org/licenses/LICENSE-2.0
+// 
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+//  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+//  License for the specific language governing permissions and limitations under
+//  the License.
+
+//
+//  This is a _Configuration_ Xcode config file for use in the "Based on" popup
+//  of the project configuration editor. Do _not_ use this as the config base
+//  and individual Xcode target, there are other configuration files for that
+//  purpose.
+
+// Pull in the general settings
+#include "../subconfig/General.xcconfig"
+
+// iPhone settings.
+#include "../subconfig/iPhone221.xcconfig"
+
+// Debug settings
+#include "../subconfig/Debug.xcconfig"
+
+// Merge settings
+#include "../subconfig/GTMMerge.xcconfig"
diff --git a/XcodeConfig/Project/DebugiPhone30.xcconfig b/XcodeConfig/Project/DebugiPhone30.xcconfig
new file mode 100644
index 0000000..7341fc4
--- /dev/null
+++ b/XcodeConfig/Project/DebugiPhone30.xcconfig
@@ -0,0 +1,37 @@
+//
+//  DebugiPhone30.xcconfig
+//
+//  Xcode configuration file for building a Debug configuration of a project
+//  for iPhone OS 3.0.
+//
+//  Copyright 2009 Google Inc.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License"); you may not
+//  use this file except in compliance with the License.  You may obtain a copy
+//  of the License at
+// 
+//  http://www.apache.org/licenses/LICENSE-2.0
+// 
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+//  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+//  License for the specific language governing permissions and limitations under
+//  the License.
+
+//
+//  This is a _Configuration_ Xcode config file for use in the "Based on" popup
+//  of the project configuration editor. Do _not_ use this as the config base
+//  and individual Xcode target, there are other configuration files for that
+//  purpose.
+
+// Pull in the general settings
+#include "../subconfig/General.xcconfig"
+
+// iPhone settings.
+#include "../subconfig/iPhone30.xcconfig"
+
+// Debug settings
+#include "../subconfig/Debug.xcconfig"
+
+// Merge settings
+#include "../subconfig/GTMMerge.xcconfig"
diff --git a/XcodeConfig/Project/DebugiPhone31.xcconfig b/XcodeConfig/Project/DebugiPhone31.xcconfig
new file mode 100644
index 0000000..c94c809
--- /dev/null
+++ b/XcodeConfig/Project/DebugiPhone31.xcconfig
@@ -0,0 +1,37 @@
+//
+//  DebugiPhone31.xcconfig
+//
+//  Xcode configuration file for building a Debug configuration of a project
+//  for iPhone OS 3.1.
+//
+//  Copyright 2009 Google Inc.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License"); you may not
+//  use this file except in compliance with the License.  You may obtain a copy
+//  of the License at
+// 
+//  http://www.apache.org/licenses/LICENSE-2.0
+// 
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+//  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+//  License for the specific language governing permissions and limitations under
+//  the License.
+
+//
+//  This is a _Configuration_ Xcode config file for use in the "Based on" popup
+//  of the project configuration editor. Do _not_ use this as the config base
+//  and individual Xcode target, there are other configuration files for that
+//  purpose.
+
+// Pull in the general settings
+#include "../subconfig/General.xcconfig"
+
+// iPhone settings.
+#include "../subconfig/iPhone31.xcconfig"
+
+// Debug settings
+#include "../subconfig/Debug.xcconfig"
+
+// Merge settings
+#include "../subconfig/GTMMerge.xcconfig"
diff --git a/XcodeConfig/Project/DebugiPhone312.xcconfig b/XcodeConfig/Project/DebugiPhone312.xcconfig
new file mode 100644
index 0000000..aae9255
--- /dev/null
+++ b/XcodeConfig/Project/DebugiPhone312.xcconfig
@@ -0,0 +1,37 @@
+//
+//  DebugiPhone312.xcconfig
+//
+//  Xcode configuration file for building a Debug configuration of a project
+//  for iPhone OS 3.1.2.
+//
+//  Copyright 2009 Google Inc.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License"); you may not
+//  use this file except in compliance with the License.  You may obtain a copy
+//  of the License at
+// 
+//  http://www.apache.org/licenses/LICENSE-2.0
+// 
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+//  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+//  License for the specific language governing permissions and limitations under
+//  the License.
+
+//
+//  This is a _Configuration_ Xcode config file for use in the "Based on" popup
+//  of the project configuration editor. Do _not_ use this as the config base
+//  and individual Xcode target, there are other configuration files for that
+//  purpose.
+
+// Pull in the general settings
+#include "../subconfig/General.xcconfig"
+
+// iPhone settings.
+#include "../subconfig/iPhone312.xcconfig"
+
+// Debug settings
+#include "../subconfig/Debug.xcconfig"
+
+// Merge settings
+#include "../subconfig/GTMMerge.xcconfig"
diff --git a/XcodeConfig/Project/ReleaseiPhone20.xcconfig b/XcodeConfig/Project/ReleaseiPhone20.xcconfig
index 8d31ead..324254b 100644
--- a/XcodeConfig/Project/ReleaseiPhone20.xcconfig
+++ b/XcodeConfig/Project/ReleaseiPhone20.xcconfig
@@ -27,7 +27,7 @@
 // Pull in the general settings
 #include "../subconfig/General.xcconfig"
 
-// iPhone Settings.
+// iPhone settings.
 #include "../subconfig/iPhone20.xcconfig"
 
 // Release settings
diff --git a/XcodeConfig/Project/ReleaseiPhone21.xcconfig b/XcodeConfig/Project/ReleaseiPhone21.xcconfig
index 8a9a0c3..66b9a1c 100644
--- a/XcodeConfig/Project/ReleaseiPhone21.xcconfig
+++ b/XcodeConfig/Project/ReleaseiPhone21.xcconfig
@@ -27,7 +27,7 @@
 // Pull in the general settings
 #include "../subconfig/General.xcconfig"
 
-// iPhone Settings.
+// iPhone settings.
 #include "../subconfig/iPhone21.xcconfig"
 
 // Release settings
diff --git a/XcodeConfig/Project/ReleaseiPhone22.xcconfig b/XcodeConfig/Project/ReleaseiPhone22.xcconfig
new file mode 100644
index 0000000..3a73269
--- /dev/null
+++ b/XcodeConfig/Project/ReleaseiPhone22.xcconfig
@@ -0,0 +1,37 @@
+//
+//  ReleaseiPhone22.xcconfig
+//
+//  Xcode configuration file for building a Release configuration of a project
+//  for iPhone OS 2.2.
+//
+//  Copyright 2009 Google Inc.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License"); you may not
+//  use this file except in compliance with the License.  You may obtain a copy
+//  of the License at
+// 
+//  http://www.apache.org/licenses/LICENSE-2.0
+// 
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+//  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+//  License for the specific language governing permissions and limitations under
+//  the License.
+
+//
+//  This is a _Configuration_ Xcode config file for use in the "Based on" popup
+//  of the project configuration editor. Do _not_ use this as the config base
+//  and individual Xcode target, there are other configuration files for that
+//  purpose.
+
+// Pull in the general settings
+#include "../subconfig/General.xcconfig"
+
+// iPhone settings.
+#include "../subconfig/iPhone22.xcconfig"
+
+// Release settings
+#include "../subconfig/Release.xcconfig"
+
+// Merge settings
+#include "../subconfig/GTMMerge.xcconfig"
diff --git a/XcodeConfig/Project/ReleaseiPhone221.xcconfig b/XcodeConfig/Project/ReleaseiPhone221.xcconfig
new file mode 100644
index 0000000..d00ee69
--- /dev/null
+++ b/XcodeConfig/Project/ReleaseiPhone221.xcconfig
@@ -0,0 +1,37 @@
+//
+//  ReleaseiPhone221.xcconfig
+//
+//  Xcode configuration file for building a Release configuration of a project
+//  for iPhone OS 2.2.1.
+//
+//  Copyright 2009 Google Inc.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License"); you may not
+//  use this file except in compliance with the License.  You may obtain a copy
+//  of the License at
+// 
+//  http://www.apache.org/licenses/LICENSE-2.0
+// 
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+//  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+//  License for the specific language governing permissions and limitations under
+//  the License.
+
+//
+//  This is a _Configuration_ Xcode config file for use in the "Based on" popup
+//  of the project configuration editor. Do _not_ use this as the config base
+//  and individual Xcode target, there are other configuration files for that
+//  purpose.
+
+// Pull in the general settings
+#include "../subconfig/General.xcconfig"
+
+// iPhone settings.
+#include "../subconfig/iPhone221.xcconfig"
+
+// Release settings
+#include "../subconfig/Release.xcconfig"
+
+// Merge settings
+#include "../subconfig/GTMMerge.xcconfig"
diff --git a/XcodeConfig/Project/ReleaseiPhone30.xcconfig b/XcodeConfig/Project/ReleaseiPhone30.xcconfig
new file mode 100644
index 0000000..abba742
--- /dev/null
+++ b/XcodeConfig/Project/ReleaseiPhone30.xcconfig
@@ -0,0 +1,37 @@
+//
+//  ReleaseiPhone30.xcconfig
+//
+//  Xcode configuration file for building a Release configuration of a project
+//  for iPhone OS 3.0.
+//
+//  Copyright 2009 Google Inc.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License"); you may not
+//  use this file except in compliance with the License.  You may obtain a copy
+//  of the License at
+// 
+//  http://www.apache.org/licenses/LICENSE-2.0
+// 
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+//  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+//  License for the specific language governing permissions and limitations under
+//  the License.
+
+//
+//  This is a _Configuration_ Xcode config file for use in the "Based on" popup
+//  of the project configuration editor. Do _not_ use this as the config base
+//  and individual Xcode target, there are other configuration files for that
+//  purpose.
+
+// Pull in the general settings
+#include "../subconfig/General.xcconfig"
+
+// iPhone settings.
+#include "../subconfig/iPhone30.xcconfig"
+
+// Release settings
+#include "../subconfig/Release.xcconfig"
+
+// Merge settings
+#include "../subconfig/GTMMerge.xcconfig"
diff --git a/XcodeConfig/Project/ReleaseiPhone31.xcconfig b/XcodeConfig/Project/ReleaseiPhone31.xcconfig
new file mode 100644
index 0000000..b6e2d25
--- /dev/null
+++ b/XcodeConfig/Project/ReleaseiPhone31.xcconfig
@@ -0,0 +1,37 @@
+//
+//  ReleaseiPhone31.xcconfig
+//
+//  Xcode configuration file for building a Release configuration of a project
+//  for iPhone OS 3.1.
+//
+//  Copyright 2009 Google Inc.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License"); you may not
+//  use this file except in compliance with the License.  You may obtain a copy
+//  of the License at
+// 
+//  http://www.apache.org/licenses/LICENSE-2.0
+// 
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+//  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+//  License for the specific language governing permissions and limitations under
+//  the License.
+
+//
+//  This is a _Configuration_ Xcode config file for use in the "Based on" popup
+//  of the project configuration editor. Do _not_ use this as the config base
+//  and individual Xcode target, there are other configuration files for that
+//  purpose.
+
+// Pull in the general settings
+#include "../subconfig/General.xcconfig"
+
+// iPhone settings.
+#include "../subconfig/iPhone31.xcconfig"
+
+// Release settings
+#include "../subconfig/Release.xcconfig"
+
+// Merge settings
+#include "../subconfig/GTMMerge.xcconfig"
diff --git a/XcodeConfig/Project/ReleaseiPhone312.xcconfig b/XcodeConfig/Project/ReleaseiPhone312.xcconfig
new file mode 100644
index 0000000..6ad382c
--- /dev/null
+++ b/XcodeConfig/Project/ReleaseiPhone312.xcconfig
@@ -0,0 +1,37 @@
+//
+//  ReleaseiPhone312.xcconfig
+//
+//  Xcode configuration file for building a Release configuration of a project
+//  for iPhone OS 3.1.2.
+//
+//  Copyright 2009 Google Inc.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License"); you may not
+//  use this file except in compliance with the License.  You may obtain a copy
+//  of the License at
+// 
+//  http://www.apache.org/licenses/LICENSE-2.0
+// 
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+//  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+//  License for the specific language governing permissions and limitations under
+//  the License.
+
+//
+//  This is a _Configuration_ Xcode config file for use in the "Based on" popup
+//  of the project configuration editor. Do _not_ use this as the config base
+//  and individual Xcode target, there are other configuration files for that
+//  purpose.
+
+// Pull in the general settings
+#include "../subconfig/General.xcconfig"
+
+// iPhone settings.
+#include "../subconfig/iPhone312.xcconfig"
+
+// Release settings
+#include "../subconfig/Release.xcconfig"
+
+// Merge settings
+#include "../subconfig/GTMMerge.xcconfig"
diff --git a/XcodeConfig/subconfig/iPhone22.xcconfig b/XcodeConfig/subconfig/iPhone22.xcconfig
new file mode 100644
index 0000000..0b63278
--- /dev/null
+++ b/XcodeConfig/subconfig/iPhone22.xcconfig
@@ -0,0 +1,24 @@
+//
+//  iPhone22.xcconfig
+//
+//  Xcode configuration file for building a Debug target on iPhone OS 2.2
+//
+//  Copyright 2009 Google Inc.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License"); you may not
+//  use this file except in compliance with the License.  You may obtain a copy
+//  of the License at
+// 
+//  http://www.apache.org/licenses/LICENSE-2.0
+// 
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+//  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+//  License for the specific language governing permissions and limitations under
+//  the License.
+
+// Set default SDK.
+SDKROOT = iphoneos2.2
+
+// iPhone currently deploys on 10.5 only
+MACOSX_DEPLOYMENT_TARGET = 10.5
diff --git a/XcodeConfig/subconfig/iPhone221.xcconfig b/XcodeConfig/subconfig/iPhone221.xcconfig
new file mode 100644
index 0000000..1ce6e24
--- /dev/null
+++ b/XcodeConfig/subconfig/iPhone221.xcconfig
@@ -0,0 +1,24 @@
+//
+//  iPhone221.xcconfig
+//
+//  Xcode configuration file for building a Debug target on iPhone OS 2.2.1
+//
+//  Copyright 2009 Google Inc.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License"); you may not
+//  use this file except in compliance with the License.  You may obtain a copy
+//  of the License at
+// 
+//  http://www.apache.org/licenses/LICENSE-2.0
+// 
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+//  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+//  License for the specific language governing permissions and limitations under
+//  the License.
+
+// Set default SDK.
+SDKROOT = iphoneos2.2.1
+
+// iPhone currently deploys on 10.5 only
+MACOSX_DEPLOYMENT_TARGET = 10.5
diff --git a/XcodeConfig/subconfig/iPhone30.xcconfig b/XcodeConfig/subconfig/iPhone30.xcconfig
new file mode 100644
index 0000000..df60b05
--- /dev/null
+++ b/XcodeConfig/subconfig/iPhone30.xcconfig
@@ -0,0 +1,24 @@
+//
+//  iPhone30.xcconfig
+//
+//  Xcode configuration file for building a Debug target on iPhone OS 3.0
+//
+//  Copyright 2009 Google Inc.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License"); you may not
+//  use this file except in compliance with the License.  You may obtain a copy
+//  of the License at
+// 
+//  http://www.apache.org/licenses/LICENSE-2.0
+// 
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+//  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+//  License for the specific language governing permissions and limitations under
+//  the License.
+
+// Set default SDK.
+SDKROOT = iphoneos3.0
+
+// iPhone currently deploys on 10.5 only
+MACOSX_DEPLOYMENT_TARGET = 10.5
diff --git a/XcodeConfig/subconfig/iPhone31.xcconfig b/XcodeConfig/subconfig/iPhone31.xcconfig
new file mode 100644
index 0000000..af7cee7
--- /dev/null
+++ b/XcodeConfig/subconfig/iPhone31.xcconfig
@@ -0,0 +1,24 @@
+//
+//  iPhone31.xcconfig
+//
+//  Xcode configuration file for building a Debug target on iPhone OS 3.1
+//
+//  Copyright 2009 Google Inc.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License"); you may not
+//  use this file except in compliance with the License.  You may obtain a copy
+//  of the License at
+// 
+//  http://www.apache.org/licenses/LICENSE-2.0
+// 
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+//  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+//  License for the specific language governing permissions and limitations under
+//  the License.
+
+// Set default SDK.
+SDKROOT = iphoneos3.1
+
+// iPhone currently deploys on 10.5 only
+MACOSX_DEPLOYMENT_TARGET = 10.5
diff --git a/XcodeConfig/subconfig/iPhone312.xcconfig b/XcodeConfig/subconfig/iPhone312.xcconfig
new file mode 100644
index 0000000..5480e0a
--- /dev/null
+++ b/XcodeConfig/subconfig/iPhone312.xcconfig
@@ -0,0 +1,24 @@
+//
+//  iPhone312.xcconfig
+//
+//  Xcode configuration file for building a Debug target on iPhone OS 3.1.2
+//
+//  Copyright 2009 Google Inc.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License"); you may not
+//  use this file except in compliance with the License.  You may obtain a copy
+//  of the License at
+// 
+//  http://www.apache.org/licenses/LICENSE-2.0
+// 
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+//  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+//  License for the specific language governing permissions and limitations under
+//  the License.
+
+// Set default SDK.
+SDKROOT = iphoneos3.1.2
+
+// iPhone currently deploys on 10.5 only
+MACOSX_DEPLOYMENT_TARGET = 10.5