See the ReleaseNotes for the full details, highlights:

- bug fixes
- code coverage support
- more complete unittests
- full support for unittesting UIs
- support for the iphone sdk (include ui unittesting)

17 files changed, 228 insertions, 19 deletions

diff --git a/XcodeConfig/Project/DebugLeopardOrLater.xcconfig b/XcodeConfig/Project/DebugLeopardOrLater.xcconfig
new file mode 100644
index 0000000..7bc3257
--- /dev/null
+++ b/XcodeConfig/Project/DebugLeopardOrLater.xcconfig
@@ -0,0 +1,34 @@
+//
+//  DebugLeopardOrLater.xcconfig
+//
+//  Xcode configuration file for building a Debug target 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
+//  and individual Xcode target, there are other configuration files for that
+//  purpose.
+//
+//  Copyright 2006-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.
+//
+
+// Pull in our general Google settings
+#include "../subconfig/General.xcconfig"
+
+// Leopard or later
+#include "../subconfig/LeopardOrLater.xcconfig"
+
+// Debug settings
+#include "../subconfig/Debug.xcconfig"
+
diff --git a/XcodeConfig/DebugTigerOrLater.xcconfig b/XcodeConfig/Project/DebugTigerOrLater.xcconfig
index 7a78a13..76d2e27 100644
--- a/XcodeConfig/DebugTigerOrLater.xcconfig
+++ b/XcodeConfig/Project/DebugTigerOrLater.xcconfig
@@ -24,11 +24,11 @@
 //
 
 // Pull in our general Google settings
-#include "subconfig/General.xcconfig"
+#include "../subconfig/General.xcconfig"
 
 // Tiger or later
-#include "subconfig/TigerOrLater.xcconfig"
+#include "../subconfig/TigerOrLater.xcconfig"
 
 // Debug settings
-#include "subconfig/Debug.xcconfig"
+#include "../subconfig/Debug.xcconfig"
 
diff --git a/XcodeConfig/Project/DebugiPhone.xcconfig b/XcodeConfig/Project/DebugiPhone.xcconfig
new file mode 100644
index 0000000..45c5ba5
--- /dev/null
+++ b/XcodeConfig/Project/DebugiPhone.xcconfig
@@ -0,0 +1,33 @@
+//
+//  DebugiPhoneSimulator.xcconfig
+//
+//  Xcode configuration file for building a Debug target on iPhone
+//
+//  Copyright 2006-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.
+
+//
+//  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 our general Google settings
+#include "../subconfig/General.xcconfig"
+
+// iPhone settings
+#include "../subconfig/iPhone.xcconfig"
+
+// Release settings
+#include "../subconfig/Debug.xcconfig"
diff --git a/XcodeConfig/Project/ReleaseLeopardOrLater.xcconfig b/XcodeConfig/Project/ReleaseLeopardOrLater.xcconfig
new file mode 100644
index 0000000..52f0383
--- /dev/null
+++ b/XcodeConfig/Project/ReleaseLeopardOrLater.xcconfig
@@ -0,0 +1,33 @@
+//
+//  ReleaseLeopardOrLater.xcconfig
+//
+//  Xcode configuration file for building a Release target 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
+//  and individual Xcode target, there are other configuration files for that
+//  purpose.
+//
+//  Copyright 2006-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.
+//
+
+// Pull in our general Google settings
+#include "../subconfig/General.xcconfig"
+
+// Leopard or later
+#include "../subconfig/LeopardOrLater.xcconfig"
+
+// Release settings
+#include "../subconfig/Release.xcconfig"
diff --git a/XcodeConfig/ReleaseTigerOrLater.xcconfig b/XcodeConfig/Project/ReleaseTigerOrLater.xcconfig
index ee30238..d14e739 100644
--- a/XcodeConfig/ReleaseTigerOrLater.xcconfig
+++ b/XcodeConfig/Project/ReleaseTigerOrLater.xcconfig
@@ -24,10 +24,10 @@
 //
 
 // Pull in our general Google settings
-#include "subconfig/General.xcconfig"
+#include "../subconfig/General.xcconfig"
 
 // Tiger or later
-#include "subconfig/TigerOrLater.xcconfig"
+#include "../subconfig/TigerOrLater.xcconfig"
 
 // Release settings
-#include "subconfig/Release.xcconfig"
+#include "../subconfig/Release.xcconfig"
diff --git a/XcodeConfig/Project/ReleaseiPhone.xcconfig b/XcodeConfig/Project/ReleaseiPhone.xcconfig
new file mode 100644
index 0000000..e61d1b6
--- /dev/null
+++ b/XcodeConfig/Project/ReleaseiPhone.xcconfig
@@ -0,0 +1,33 @@
+//
+//  ReleaseAspenSimulator.xcconfig
+//
+//  Xcode configuration file for building a Release target on iPhone
+//
+//  Copyright 2006-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.
+
+//
+//  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 our general Google settings
+#include "../subconfig/General.xcconfig"
+
+// iPhone Settings.
+#include "../subconfig/iPhone.xcconfig"
+
+// Release settings
+#include "../subconfig/Release.xcconfig"
diff --git a/XcodeConfig/DebugUnittest.xcconfig b/XcodeConfig/Target/DebugUnittest.xcconfig
index c32c63d..3f4d342 100644
--- a/XcodeConfig/DebugUnittest.xcconfig
+++ b/XcodeConfig/Target/DebugUnittest.xcconfig
@@ -23,7 +23,7 @@
 //
 
 // Unittests are loadable bundles
-#include "subconfig/Unittest.xcconfig"
+#include "../subconfig/Unittest.xcconfig"
 
 // See comments in ReleaseUnittest.xcconfig regarding BUNDLE_LOADER and
 // how it should be set if you are running into link errors.
\ No newline at end of file
diff --git a/XcodeConfig/LoadableBundle.xcconfig b/XcodeConfig/Target/LoadableBundle.xcconfig
index 78ed39a..78ed39a 100644
--- a/XcodeConfig/LoadableBundle.xcconfig
+++ b/XcodeConfig/Target/LoadableBundle.xcconfig
diff --git a/XcodeConfig/ReleaseUnittest.xcconfig b/XcodeConfig/Target/ReleaseUnittest.xcconfig
index 9ec14de..f9a85d3 100644
--- a/XcodeConfig/ReleaseUnittest.xcconfig
+++ b/XcodeConfig/Target/ReleaseUnittest.xcconfig
@@ -23,7 +23,7 @@
 //
 
 // Unittests are loadable bundles
-#include "subconfig/Unittest.xcconfig"
+#include "../subconfig/Unittest.xcconfig"
 
 // When running OCUnit tests in Release mode the unittests BUNDLE_LOADER
 // is probably stripped (or at least it will be if they are using our
diff --git a/XcodeConfig/SharedLibrary.xcconfig b/XcodeConfig/Target/SharedLibrary.xcconfig
index 7593392..7593392 100644
--- a/XcodeConfig/SharedLibrary.xcconfig
+++ b/XcodeConfig/Target/SharedLibrary.xcconfig
diff --git a/XcodeConfig/StaticLibrary.xcconfig b/XcodeConfig/Target/StaticLibrary.xcconfig
index f459e83..f459e83 100644
--- a/XcodeConfig/StaticLibrary.xcconfig
+++ b/XcodeConfig/Target/StaticLibrary.xcconfig
diff --git a/XcodeConfig/subconfig/General.xcconfig b/XcodeConfig/subconfig/General.xcconfig
index b9f7313..b6a9a02 100644
--- a/XcodeConfig/subconfig/General.xcconfig
+++ b/XcodeConfig/subconfig/General.xcconfig
@@ -2,7 +2,7 @@
 //  General.xcconfig
 //
 //  Xcode configuration file for general build settings applicable to all
-//  Google projects and targets.
+//  projects and targets.
 //
 //  Copyright 2006-2008 Google Inc.
 //
@@ -20,7 +20,7 @@
 //
 
 // Build for PPC and Intel
-ARCHS = ppc i386
+ARCHS = i386 ppc
 
 // Zerolink prevents link warnings so turn it off
 ZERO_LINK = NO
diff --git a/XcodeConfig/subconfig/LeopardOrLater.xcconfig b/XcodeConfig/subconfig/LeopardOrLater.xcconfig
new file mode 100644
index 0000000..b2828d7
--- /dev/null
+++ b/XcodeConfig/subconfig/LeopardOrLater.xcconfig
@@ -0,0 +1,28 @@
+//
+//  LeopardOrLater.xcconfig
+//
+//  Xcode configuration file for projects targeting 10.4 Tiger or later. These
+//  settings produce a Universal binary compatible with 10.4 for PPC and Intel.
+//
+//  Copyright 2006-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.
+//
+
+// Default SDK and minimum OS version is 10.5
+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
diff --git a/XcodeConfig/subconfig/TigerOrLater.xcconfig b/XcodeConfig/subconfig/TigerOrLater.xcconfig
index d46e1a2..d8f7a3d 100644
--- a/XcodeConfig/subconfig/TigerOrLater.xcconfig
+++ b/XcodeConfig/subconfig/TigerOrLater.xcconfig
@@ -1,9 +1,8 @@
 //
 //  TigerOrLater.xcconfig
 //
-//  Xcode configuration file for Google applications targeting 10.4 Tiger or
-//  later. These settings produce a Universal binary compatible with 10.4 for
-//  PPC and Intel.
+//  Xcode configuration file for projects targeting 10.4 Tiger or later. These
+//  settings produce a Universal binary compatible with 10.4 for PPC and Intel.
 //
 //  Copyright 2006-2008 Google Inc.
 //
diff --git a/XcodeConfig/subconfig/Unittest.xcconfig b/XcodeConfig/subconfig/Unittest.xcconfig
index a35dc61..96121ee 100644
--- a/XcodeConfig/subconfig/Unittest.xcconfig
+++ b/XcodeConfig/subconfig/Unittest.xcconfig
@@ -1,11 +1,8 @@
 //
 //  Unittest.xcconfig
 //
-//  Xcode configuration file for a unittest 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
-//  of an Xcode configuration in the project settings dialog.
+//  Xcode configuration file for a basic unittest targets.  Use the debug or
+//  release build specific configs in the Target folder.
 //
 //  Copyright 2006-2008 Google Inc.
 //
@@ -23,7 +20,7 @@
 //
 
 // Unittests are loadable bundles
-#include "../LoadableBundle.xcconfig"
+#include "../Target/LoadableBundle.xcconfig"
 
 // Force C99 dialect with GNU extensions (needed for OCUnit)
 GCC_C_LANGUAGE_STANDARD = gnu99
@@ -31,3 +28,6 @@ GCC_C_LANGUAGE_STANDARD = gnu99
 // Deploment postprocessing is what triggers Xcode to strip, we don't strip
 // unittests
 DEPLOYMENT_POSTPROCESSING = NO
+
+// Most common unittests will be objective-c
+WRAPPER_EXTENSION = octest
diff --git a/XcodeConfig/subconfig/iPhone.xcconfig b/XcodeConfig/subconfig/iPhone.xcconfig
new file mode 100644
index 0000000..42445f1
--- /dev/null
+++ b/XcodeConfig/subconfig/iPhone.xcconfig
@@ -0,0 +1,37 @@
+//
+//  iPhone.xcconfig
+//
+//  Xcode configuration file for building a Debug target on iPhone
+//
+//  Copyright 2006-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.
+
+// 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
+
diff --git a/XcodeConfig/xcconfigs-readme.txt b/XcodeConfig/xcconfigs-readme.txt
new file mode 100644
index 0000000..23fde4b
--- /dev/null
+++ b/XcodeConfig/xcconfigs-readme.txt
@@ -0,0 +1,12 @@
+
+Configs w/in Project folder are configs expected to be set at the project level.
+
+Configs w/in the Target folder are configs expected to be set on the per target
+level.
+
+Configs w/in subconfig are not meant to be used directly; they are referenced by
+the other configs.
+
+
+Remember: when using the configs at any given layer, make sure you set them for
+each build configuration.