- Added GTMExceptionalInlines for dealing with cases where you get

  warning: variable 'r' might be clobbered by 'longjmp' or 'vfork'
  when using certain Apple inlined functions in @synchronized/@try blocks.
  
- Updated to Xcode 3.1 so the GTM and iPhone project have the same baseline.
  The code should work in other version of xcode, but the projects and
  xcconfig files now use 3.1 features.

- Added GTMABAddressBook which is a cocoa wrapper for the 'C' AddressBook
  APIs on the iPhone.

- Added several set environment variable statements to RunIPhoneUnitTest.sh
  to encourage bugs to come out of the woodwork.

17 files changed, 41 insertions, 62 deletions

diff --git a/XcodeConfig/Project/DebugLeopardOrLater.xcconfig b/XcodeConfig/Project/DebugLeopardOrLater.xcconfig
index 6aebf12..5bbd4a2 100644
--- a/XcodeConfig/Project/DebugLeopardOrLater.xcconfig
+++ b/XcodeConfig/Project/DebugLeopardOrLater.xcconfig
@@ -1,7 +1,8 @@
 //
 //  DebugLeopardOrLater.xcconfig
 //
-//  Xcode configuration file for building a Debug target on Leopard or later.
+//  Xcode configuration file for building a Debug configuration of a project
+//  on Leopard or later.
 //
 //  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
diff --git a/XcodeConfig/Project/DebugTigerOrLater.xcconfig b/XcodeConfig/Project/DebugTigerOrLater.xcconfig
index 725ea49..b8893ce 100644
--- a/XcodeConfig/Project/DebugTigerOrLater.xcconfig
+++ b/XcodeConfig/Project/DebugTigerOrLater.xcconfig
@@ -1,7 +1,8 @@
 //
 //  DebugTigerOrLater.xcconfig
 //
-//  Xcode configuration file for building a Debug target on Tiger or later.
+//  Xcode configuration file for building a Debug configuration of a project
+//  on Tiger or later.
 //
 //  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
diff --git a/XcodeConfig/Project/DebugiPhone.xcconfig b/XcodeConfig/Project/DebugiPhone.xcconfig
index 1ba99b4..4af17bd 100644
--- a/XcodeConfig/Project/DebugiPhone.xcconfig
+++ b/XcodeConfig/Project/DebugiPhone.xcconfig
@@ -1,7 +1,8 @@
 //
 //  DebugiPhoneSimulator.xcconfig
 //
-//  Xcode configuration file for building a Debug target on iPhone
+//  Xcode configuration file for building a Debug configuration of a project
+//  for iPhone.
 //
 //  Copyright 2006-2008 Google Inc.
 //
diff --git a/XcodeConfig/Project/ReleaseLeopardOrLater.xcconfig b/XcodeConfig/Project/ReleaseLeopardOrLater.xcconfig
index 0188d10..f62b287 100644
--- a/XcodeConfig/Project/ReleaseLeopardOrLater.xcconfig
+++ b/XcodeConfig/Project/ReleaseLeopardOrLater.xcconfig
@@ -1,7 +1,8 @@
 //
 //  ReleaseLeopardOrLater.xcconfig
 //
-//  Xcode configuration file for building a Release target on Leopard or later.
+//  Xcode configuration file for building a Release configuration of a project
+//  on Leopard or later.
 //
 //  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
diff --git a/XcodeConfig/Project/ReleaseTigerOrLater.xcconfig b/XcodeConfig/Project/ReleaseTigerOrLater.xcconfig
index a024c4b..d604d88 100644
--- a/XcodeConfig/Project/ReleaseTigerOrLater.xcconfig
+++ b/XcodeConfig/Project/ReleaseTigerOrLater.xcconfig
@@ -1,7 +1,8 @@
 //
 //  ReleaseTigerOrLater.xcconfig
 //
-//  Xcode configuration file for building a Release target on Tiger or later.
+//  Xcode configuration file for building a Release configuration of a project
+//  on Tiger or later.
 //
 //  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
diff --git a/XcodeConfig/Project/ReleaseiPhone.xcconfig b/XcodeConfig/Project/ReleaseiPhone.xcconfig
index d6c0127..1473a5a 100644
--- a/XcodeConfig/Project/ReleaseiPhone.xcconfig
+++ b/XcodeConfig/Project/ReleaseiPhone.xcconfig
@@ -1,7 +1,8 @@
 //
 //  ReleaseAspenSimulator.xcconfig
 //
-//  Xcode configuration file for building a Release target on iPhone
+//  Xcode configuration file for building a Release configuration of a project
+//  for iPhone.
 //
 //  Copyright 2006-2008 Google Inc.
 //
diff --git a/XcodeConfig/Target/LoadableBundle.xcconfig b/XcodeConfig/Target/LoadableBundle.xcconfig
index 78ed39a..8b824d7 100644
--- a/XcodeConfig/Target/LoadableBundle.xcconfig
+++ b/XcodeConfig/Target/LoadableBundle.xcconfig
@@ -1,8 +1,8 @@
 //
 //  LoadableBundle.xcconfig
 //
-//  Xcode configuration file for a loadable bundle. Usually a Cocoa plugin or
-//  similar.
+//  Xcode configuration file for a loadable bundle target. Usually a Cocoa
+//  plugin or similar.
 //
 //  This is a _Target_ config file, for use in the "Based on" popup of the
 //  settings dialog for a target. Do not attempt to apply this as the base
diff --git a/XcodeConfig/Target/LoadableBundleGCSupported.xcconfig b/XcodeConfig/Target/LoadableBundleGCSupported.xcconfig
index 861845a..aa8d5a7 100644
--- a/XcodeConfig/Target/LoadableBundleGCSupported.xcconfig
+++ b/XcodeConfig/Target/LoadableBundleGCSupported.xcconfig
@@ -1,7 +1,7 @@
 //
 //  LoadableBundleGCSupported.xcconfig
 //
-//  Xcode configuration file for a loadable bundle that supports garbage
+//  Xcode configuration file for a loadable bundle target that supports garbage
 //  collection. Usually a Cocoa plugin or similar.
 //
 //  This is a _Target_ config file, for use in the "Based on" popup of the
diff --git a/XcodeConfig/Target/SharedLibrary.xcconfig b/XcodeConfig/Target/SharedLibrary.xcconfig
index 7593392..7c37d50 100644
--- a/XcodeConfig/Target/SharedLibrary.xcconfig
+++ b/XcodeConfig/Target/SharedLibrary.xcconfig
@@ -1,7 +1,7 @@
 //
 //  SharedLibrary.xcconfig
 //
-//  Xcode configuration file for a shared library.
+//  Xcode configuration file for a shared library target.
 //
 //  This is a _Target_ config file, for use in the "Based on" popup of the
 //  settings dialog for a target. Do not attempt to apply this as the base
diff --git a/XcodeConfig/Target/SharedLibraryGCSupported.xcconfig b/XcodeConfig/Target/SharedLibraryGCSupported.xcconfig
index e6b56f7..74ab907 100644
--- a/XcodeConfig/Target/SharedLibraryGCSupported.xcconfig
+++ b/XcodeConfig/Target/SharedLibraryGCSupported.xcconfig
@@ -1,7 +1,7 @@
 //
 //  SharedLibraryGCSupported.xcconfig
 //
-//  Xcode configuration file for a shared library that support garbage
+//  Xcode configuration file for a shared library target that support garbage
 //  collection.
 //
 //  This is a _Target_ config file, for use in the "Based on" popup of the
diff --git a/XcodeConfig/Target/StaticLibrary.xcconfig b/XcodeConfig/Target/StaticLibrary.xcconfig
index f459e83..df1016b 100644
--- a/XcodeConfig/Target/StaticLibrary.xcconfig
+++ b/XcodeConfig/Target/StaticLibrary.xcconfig
@@ -1,7 +1,7 @@
 //
 //  StaticLibrary.xcconfig
 //
-//  Xcode configuration file for a static library.
+//  Xcode configuration file for a static library target.
 //
 //  This is a _Target_ config file, for use in the "Based on" popup of the
 //  settings dialog for a target. Do not attempt to apply this as the base
diff --git a/XcodeConfig/Target/StaticLibraryGCSupported.xcconfig b/XcodeConfig/Target/StaticLibraryGCSupported.xcconfig
index 6a57a0c..07ea1d5 100644
--- a/XcodeConfig/Target/StaticLibraryGCSupported.xcconfig
+++ b/XcodeConfig/Target/StaticLibraryGCSupported.xcconfig
@@ -1,7 +1,7 @@
 //
 //  StaticLibraryGCSupported.xcconfig
 //
-//  Xcode configuration file for a static library that supports garbage
+//  Xcode configuration file for a static library target that supports garbage
 //  collection.
 //
 //  This is a _Target_ config file, for use in the "Based on" popup of the
diff --git a/XcodeConfig/subconfig/64bit.xcconfig b/XcodeConfig/subconfig/64bit.xcconfig
deleted file mode 100644
index bb9cae6..0000000
--- a/XcodeConfig/subconfig/64bit.xcconfig
+++ /dev/null
@@ -1,26 +0,0 @@
-//
-//  64bit.xcconfig
-//
-//  Xcode configuration file to include for builds wanting 64bit support.
-//
-//  Copyright 2008 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.
-//
-
-// Compile all flavors: 32 & 64bit on both PPC and Intel
-ARCHS = i386 x86_64 ppc ppc64
-
-// Warn on implicit data conversions in 64bit builds
-GCC_WARN_64_TO_32_BIT_CONVERSION[arch=ppc64] = YES
-GCC_WARN_64_TO_32_BIT_CONVERSION[arch=x86_64] = YES
diff --git a/XcodeConfig/subconfig/General.xcconfig b/XcodeConfig/subconfig/General.xcconfig
index b6a9a02..6031f46 100644
--- a/XcodeConfig/subconfig/General.xcconfig
+++ b/XcodeConfig/subconfig/General.xcconfig
@@ -19,8 +19,22 @@
 //  the License.
 //
 
-// Build for PPC and Intel
-ARCHS = i386 ppc
+// NOTE: as of Xcode 3.1, for iPhone development, the two SDKs you can match are:
+//   SDK_NAME iphoneos2.0
+//   SDK_NAME iphonesimulator2.0
+// for Mac OS developement, the values are:
+//   SDK_NAME macosx10.4
+//   SDK_NAME macosx10.5
+
+// Build for PPC and Intel (Leopard gets 64bit also)
+ARCHS[sdk=macosx10.4*] = i386 ppc
+ARCHS[sdk=macosx10.5*] = i386 x86_64 ppc ppc64
+// Build for arm for iPhone or Intel for the iPhone Simulator
+ARCHS[sdk=iphoneos*] = armv6
+ARCHS[sdk=iphonesimulator*] = i386
+
+// Build only the active architecture on iphone device targets
+ONLY_ACTIVE_ARCH[sdk=iphoneos*] = YES
 
 // Zerolink prevents link warnings so turn it off
 ZERO_LINK = NO
@@ -46,3 +60,9 @@ ALWAYS_SEARCH_USER_PATHS = NO
 
 // Turn on position dependent code for most cases (overridden where appropriate)
 GCC_DYNAMIC_NO_PIC = YES
+
+// Warn on implicit data conversions in 64bit builds
+GCC_WARN_64_TO_32_BIT_CONVERSION[arch=*64*] = YES
+
+// Use Obj-C fast dispatch (configs don't support 10.2 where you don't want it)
+GCC_FAST_OBJC_DISPATCH = YES
diff --git a/XcodeConfig/subconfig/LeopardOrLater.xcconfig b/XcodeConfig/subconfig/LeopardOrLater.xcconfig
index 6cc1a08..fa4dfce 100644
--- a/XcodeConfig/subconfig/LeopardOrLater.xcconfig
+++ b/XcodeConfig/subconfig/LeopardOrLater.xcconfig
@@ -23,10 +23,3 @@
 SDKROOT = ${DEVELOPER_SDK_DIR}/MacOSX10.5.sdk
 MACOSX_DEPLOYMENT_TARGET = 10.5
 GCC_VERSION = 4.0
-
-// On Leopard use Obj-C fast dispatch
-GCC_FAST_OBJC_DISPATCH = YES
-
-// For Leopard, pull in 64bit support
-#include "64bit.xcconfig"
-
diff --git a/XcodeConfig/subconfig/TigerOrLater.xcconfig b/XcodeConfig/subconfig/TigerOrLater.xcconfig
index a693a58..bc0f8f4 100644
--- a/XcodeConfig/subconfig/TigerOrLater.xcconfig
+++ b/XcodeConfig/subconfig/TigerOrLater.xcconfig
@@ -23,6 +23,3 @@
 SDKROOT = $(DEVELOPER_SDK_DIR)/MacOSX10.4u.sdk
 MACOSX_DEPLOYMENT_TARGET = 10.4
 GCC_VERSION = 4.0
-
-// On Tiger use Obj-C fast dispatch
-GCC_FAST_OBJC_DISPATCH = YES
diff --git a/XcodeConfig/subconfig/iPhone.xcconfig b/XcodeConfig/subconfig/iPhone.xcconfig
index 42445f1..0948db8 100644
--- a/XcodeConfig/subconfig/iPhone.xcconfig
+++ b/XcodeConfig/subconfig/iPhone.xcconfig
@@ -17,21 +17,10 @@
 //  License for the specific language governing permissions and limitations under
 //  the License.
 
-// Build for ARM
-ARCHS = armv6
-
-// Build only the active architecture
-ONLY_ACTIVE_ARCH = YES
-
 // Code signing. Should be overridden if releasing
 CODE_SIGN_IDENTITY[sdk=iphoneos*] = iPhone Developer
 
 // Default SDK and minimum OS version is the iphone SDK.
 SDKROOT = iphoneos2.0
-
 MACOSX_DEPLOYMENT_TARGET = 10.5
 GCC_VERSION = 4.0
-
-// On iPhone use Obj-C fast dispatch
-GCC_FAST_OBJC_DISPATCH = YES
-