- Added GTMTestTimer.h for doing high fidelity timings.

 
- Added leaks checking to iPhone unit test script. It can be controlled by
  the GTM_DISABLE_LEAKS environment variable

- Added ability to control using zombies to iPhone unit test script. It can be
  controlled by the GTM_DISABLE_ZOMBIES environment variable

- Added ability to control termination to iPhone unit test script. It can be
  controlled by the GTM_DISABLE_TERMINATION environment variable

- Fixed several leaks found with leak checking enabled.

- Added configs for different iPhone OS versions.

9 files changed, 177 insertions, 29 deletions

diff --git a/XcodeConfig/Project/DebugiPhone.xcconfig b/XcodeConfig/Project/DebugiPhone.xcconfig
index 4af17bd..6067fff 100644
--- a/XcodeConfig/Project/DebugiPhone.xcconfig
+++ b/XcodeConfig/Project/DebugiPhone.xcconfig
@@ -1,10 +1,10 @@
 //
-//  DebugiPhoneSimulator.xcconfig
+//  DebugiPhone.xcconfig
 //
 //  Xcode configuration file for building a Debug configuration of a project
 //  for iPhone.
 //
-//  Copyright 2006-2008 Google Inc.
+//  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
@@ -19,16 +19,8 @@
 //  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"
+//  This file is deprecated, please use the version specific one instead.
+//
 
-// iPhone settings
-#include "../subconfig/iPhone.xcconfig"
+#include "DebugiPhone20.xcconfig"
 
-// Release settings
-#include "../subconfig/Debug.xcconfig"
diff --git a/XcodeConfig/Project/DebugiPhone20.xcconfig b/XcodeConfig/Project/DebugiPhone20.xcconfig
new file mode 100644
index 0000000..1f08ee4
--- /dev/null
+++ b/XcodeConfig/Project/DebugiPhone20.xcconfig
@@ -0,0 +1,34 @@
+//
+//  DebugiPhone20.xcconfig
+//
+//  Xcode configuration file for building a Debug configuration of a project
+//  for iPhone OS 2.0.
+//
+//  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.
+
+//
+//  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/iPhone20.xcconfig"
+
+// Release settings
+#include "../subconfig/Debug.xcconfig"
diff --git a/XcodeConfig/Project/DebugiPhone21.xcconfig b/XcodeConfig/Project/DebugiPhone21.xcconfig
new file mode 100644
index 0000000..b718cfa
--- /dev/null
+++ b/XcodeConfig/Project/DebugiPhone21.xcconfig
@@ -0,0 +1,34 @@
+//
+//  DebugiPhone21.xcconfig
+//
+//  Xcode configuration file for building a Debug configuration of a project
+//  for iPhone OS 2.1.
+//
+//  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.
+
+//
+//  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/iPhone21.xcconfig"
+
+// Release settings
+#include "../subconfig/Debug.xcconfig"
diff --git a/XcodeConfig/Project/ReleaseiPhone.xcconfig b/XcodeConfig/Project/ReleaseiPhone.xcconfig
index 1473a5a..49c1141 100644
--- a/XcodeConfig/Project/ReleaseiPhone.xcconfig
+++ b/XcodeConfig/Project/ReleaseiPhone.xcconfig
@@ -1,10 +1,10 @@
 //
-//  ReleaseAspenSimulator.xcconfig
+//  ReleaseiPhone.xcconfig
 //
 //  Xcode configuration file for building a Release configuration of a project
 //  for iPhone.
 //
-//  Copyright 2006-2008 Google Inc.
+//  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
@@ -19,16 +19,8 @@
 //  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"
+//  This file is deprecated, please use the version specific one instead.
+//
 
-// iPhone Settings.
-#include "../subconfig/iPhone.xcconfig"
+#include "ReleaseiPhone20.xcconfig"
 
-// Release settings
-#include "../subconfig/Release.xcconfig"
diff --git a/XcodeConfig/Project/ReleaseiPhone20.xcconfig b/XcodeConfig/Project/ReleaseiPhone20.xcconfig
new file mode 100644
index 0000000..16895c5
--- /dev/null
+++ b/XcodeConfig/Project/ReleaseiPhone20.xcconfig
@@ -0,0 +1,34 @@
+//
+//  ReleaseiPhone20.xcconfig
+//
+//  Xcode configuration file for building a Release configuration of a project
+//  for iPhone OS 2.0.
+//
+//  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.
+
+//
+//  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/iPhone20.xcconfig"
+
+// Release settings
+#include "../subconfig/Release.xcconfig"
diff --git a/XcodeConfig/Project/ReleaseiPhone21.xcconfig b/XcodeConfig/Project/ReleaseiPhone21.xcconfig
new file mode 100644
index 0000000..4ea90d6
--- /dev/null
+++ b/XcodeConfig/Project/ReleaseiPhone21.xcconfig
@@ -0,0 +1,34 @@
+//
+//  ReleaseiPhone21.xcconfig
+//
+//  Xcode configuration file for building a Release configuration of a project
+//  for iPhone OS 2.1.
+//
+//  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.
+
+//
+//  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/iPhone21.xcconfig"
+
+// Release settings
+#include "../subconfig/Release.xcconfig"
diff --git a/XcodeConfig/subconfig/General.xcconfig b/XcodeConfig/subconfig/General.xcconfig
index 6031f46..114b718 100644
--- a/XcodeConfig/subconfig/General.xcconfig
+++ b/XcodeConfig/subconfig/General.xcconfig
@@ -21,7 +21,9 @@
 
 // NOTE: as of Xcode 3.1, for iPhone development, the two SDKs you can match are:
 //   SDK_NAME iphoneos2.0
+//   SDK_NAME iphoneos2.1
 //   SDK_NAME iphonesimulator2.0
+//   SDK_NAME iphonesimulator2.1
 // for Mac OS developement, the values are:
 //   SDK_NAME macosx10.4
 //   SDK_NAME macosx10.5
diff --git a/XcodeConfig/subconfig/iPhone.xcconfig b/XcodeConfig/subconfig/iPhone20.xcconfig
index 0948db8..fea781b 100644
--- a/XcodeConfig/subconfig/iPhone.xcconfig
+++ b/XcodeConfig/subconfig/iPhone20.xcconfig
@@ -1,9 +1,9 @@
 //
-//  iPhone.xcconfig
+//  iPhone20.xcconfig
 //
-//  Xcode configuration file for building a Debug target on iPhone
+//  Xcode configuration file for building a Debug target on iPhone OS 2.0
 //
-//  Copyright 2006-2008 Google Inc.
+//  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
diff --git a/XcodeConfig/subconfig/iPhone21.xcconfig b/XcodeConfig/subconfig/iPhone21.xcconfig
new file mode 100644
index 0000000..6265000
--- /dev/null
+++ b/XcodeConfig/subconfig/iPhone21.xcconfig
@@ -0,0 +1,26 @@
+//
+//  iPhone21.xcconfig
+//
+//  Xcode configuration file for building a Debug target on iPhone OS 2.1
+//
+//  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.
+
+// 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.1
+MACOSX_DEPLOYMENT_TARGET = 10.5
+GCC_VERSION = 4.0