aboutsummaryrefslogtreecommitdiff
path: root/XcodeConfig/Project
diff options
context:
space:
mode:
authorGravatar thomasvl@gmail.com <thomasvl@gmail.com@7dc7ac4e-7543-0410-b95c-c1676fc8e2a3>2008-09-22 23:33:44 +0000
committerGravatar thomasvl@gmail.com <thomasvl@gmail.com@7dc7ac4e-7543-0410-b95c-c1676fc8e2a3>2008-09-22 23:33:44 +0000
commit7bb8e9b9b24141f373ed70d7e6674a245c0227cf (patch)
tree8fab3cad46943aee24f213e041b2a7f6b71ea5df /XcodeConfig/Project
parentbfaf8705cccb15c0c2a7704b17ba011ddba8242f (diff)
- 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.
Diffstat (limited to 'XcodeConfig/Project')
-rw-r--r--XcodeConfig/Project/DebugiPhone.xcconfig18
-rw-r--r--XcodeConfig/Project/DebugiPhone20.xcconfig34
-rw-r--r--XcodeConfig/Project/DebugiPhone21.xcconfig34
-rw-r--r--XcodeConfig/Project/ReleaseiPhone.xcconfig18
-rw-r--r--XcodeConfig/Project/ReleaseiPhone20.xcconfig34
-rw-r--r--XcodeConfig/Project/ReleaseiPhone21.xcconfig34
6 files changed, 146 insertions, 26 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"