From 0dbbef56964ff39968225f3a1739da6c5baa9eb3 Mon Sep 17 00:00:00 2001 From: "gtm.daemon" Date: Mon, 29 Nov 2010 16:00:18 +0000 Subject: [Author: hdm] Prep GTM for building on Snow Leopard. Unfortunately our Snow Leopard build agents only support the latest SDKs, which is 3.2 and 4.1 right now, so I've had to: - Add support for 4.1. - Remove support for other iPhone configurations. R=thomasvl DELTA=320 (247 added, 63 deleted, 10 changed) --- GTMiPhone.xcodeproj/project.pbxproj | 144 +++++++++++++++++++++++++++ XcodeConfig/Project/DebugiPhone41.xcconfig | 37 +++++++ XcodeConfig/Project/ReleaseiPhone41.xcconfig | 37 +++++++ XcodeConfig/subconfig/iPhone41.xcconfig | 21 ++++ 4 files changed, 239 insertions(+) create mode 100644 XcodeConfig/Project/DebugiPhone41.xcconfig create mode 100644 XcodeConfig/Project/ReleaseiPhone41.xcconfig create mode 100644 XcodeConfig/subconfig/iPhone41.xcconfig diff --git a/GTMiPhone.xcodeproj/project.pbxproj b/GTMiPhone.xcodeproj/project.pbxproj index 306852b..b059c29 100644 --- a/GTMiPhone.xcodeproj/project.pbxproj +++ b/GTMiPhone.xcodeproj/project.pbxproj @@ -155,6 +155,8 @@ 32CA4F630368D1EE00C91783 /* GTM_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTM_Prefix.pch; sourceTree = ""; }; 448D61B011AC1AAD0097ACBC /* GTMUIImage+Resize_50x100_flipped.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "GTMUIImage+Resize_50x100_flipped.png"; path = "TestData/GTMUIImage+Resize_50x100_flipped.png"; sourceTree = ""; }; 448D61B111AC1AAD0097ACBC /* GTMUIImage+Resize_100x50_flipped.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "GTMUIImage+Resize_100x50_flipped.png"; path = "TestData/GTMUIImage+Resize_100x50_flipped.png"; sourceTree = ""; }; + 5729E6D512A3F99300BF1B8A /* DebugiPhone41.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = DebugiPhone41.xcconfig; path = XcodeConfig/Project/DebugiPhone41.xcconfig; sourceTree = SOURCE_ROOT; }; + 5729E6D612A3F99300BF1B8A /* ReleaseiPhone41.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = ReleaseiPhone41.xcconfig; path = XcodeConfig/Project/ReleaseiPhone41.xcconfig; sourceTree = SOURCE_ROOT; }; 629446170EDE177A009295EA /* GTMNSArray+Merge.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "GTMNSArray+Merge.h"; sourceTree = ""; }; 629446180EDE177A009295EA /* GTMNSArray+Merge.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "GTMNSArray+Merge.m"; sourceTree = ""; }; 629446190EDE177A009295EA /* GTMNSArray+MergeTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "GTMNSArray+MergeTest.m"; sourceTree = ""; }; @@ -604,6 +606,8 @@ CAD23A761174AE7800EA94E5 /* ReleaseiPhone32.xcconfig */, 8B23010811C180E2001FA319 /* DebugiPhone40.xcconfig */, 8B23010911C180E2001FA319 /* ReleaseiPhone40.xcconfig */, + 5729E6D512A3F99300BF1B8A /* DebugiPhone41.xcconfig */, + 5729E6D612A3F99300BF1B8A /* ReleaseiPhone41.xcconfig */, ); path = Project; sourceTree = ""; @@ -851,6 +855,131 @@ /* End PBXTargetDependency section */ /* Begin XCBuildConfiguration section */ + 5729E6D712A3FA6400BF1B8A /* iPhone4.1-Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 5729E6D512A3F99300BF1B8A /* DebugiPhone41.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 = "iPhone4.1-Debug"; + }; + 5729E6D812A3FA6400BF1B8A /* iPhone4.1-Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + PRODUCT_NAME = "All UnitTests"; + }; + name = "iPhone4.1-Debug"; + }; + 5729E6D912A3FA6400BF1B8A /* iPhone4.1-Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + INFOPLIST_FILE = "GTMiPhone-Info.plist"; + PRODUCT_NAME = GTMiPhoneTest; + SDKROOT = iphonesimulator3.2; + }; + name = "iPhone4.1-Debug"; + }; + 5729E6DA12A3FA6400BF1B8A /* iPhone4.1-Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + PRODUCT_NAME = "All UnitTests all SDKs"; + }; + name = "iPhone4.1-Debug"; + }; + 5729E6DB12A3FA6400BF1B8A /* iPhone4.1-Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + PRODUCT_NAME = "All UnitTests all SDKs"; + }; + name = "iPhone4.1-Debug"; + }; + 5729E6DC12A3FA6C00BF1B8A /* iPhone4.1-Debug-gcov */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 5729E6D512A3F99300BF1B8A /* DebugiPhone41.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"; + LIBRARY_SEARCH_PATHS = SnowLeopardGcov; + }; + name = "iPhone4.1-Debug-gcov"; + }; + 5729E6DD12A3FA6C00BF1B8A /* iPhone4.1-Debug-gcov */ = { + isa = XCBuildConfiguration; + buildSettings = { + PRODUCT_NAME = "All UnitTests"; + }; + name = "iPhone4.1-Debug-gcov"; + }; + 5729E6DE12A3FA6C00BF1B8A /* iPhone4.1-Debug-gcov */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 8BC0498F0DAEC59100C2D1CA /* CodeCoverage.xcconfig */; + buildSettings = { + INFOPLIST_FILE = "GTMiPhone-Info.plist"; + PRODUCT_NAME = GTMiPhoneTest; + SDKROOT = iphonesimulator3.2; + }; + name = "iPhone4.1-Debug-gcov"; + }; + 5729E6DF12A3FA6C00BF1B8A /* iPhone4.1-Debug-gcov */ = { + isa = XCBuildConfiguration; + buildSettings = { + PRODUCT_NAME = "All UnitTests all SDKs"; + }; + name = "iPhone4.1-Debug-gcov"; + }; + 5729E6E012A3FA6C00BF1B8A /* iPhone4.1-Debug-gcov */ = { + isa = XCBuildConfiguration; + buildSettings = { + PRODUCT_NAME = "All UnitTests all SDKs"; + }; + name = "iPhone4.1-Debug-gcov"; + }; + 5729E6E112A3FA7400BF1B8A /* iPhone4.1-Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 5729E6D612A3F99300BF1B8A /* ReleaseiPhone41.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 = "iPhone4.1-Release"; + }; + 5729E6E212A3FA7400BF1B8A /* iPhone4.1-Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + PRODUCT_NAME = "All UnitTests"; + }; + name = "iPhone4.1-Release"; + }; + 5729E6E312A3FA7400BF1B8A /* iPhone4.1-Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + INFOPLIST_FILE = "GTMiPhone-Info.plist"; + PRODUCT_NAME = GTMiPhoneTest; + SDKROOT = iphonesimulator3.2; + }; + name = "iPhone4.1-Release"; + }; + 5729E6E412A3FA7400BF1B8A /* iPhone4.1-Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + PRODUCT_NAME = "All UnitTests all SDKs"; + }; + name = "iPhone4.1-Release"; + }; + 5729E6E512A3FA7400BF1B8A /* iPhone4.1-Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + PRODUCT_NAME = "All UnitTests all SDKs"; + }; + name = "iPhone4.1-Release"; + }; 8B23011211C1810E001FA319 /* iPhone4.0-Debug */ = { isa = XCBuildConfiguration; baseConfigurationReference = 8B23010811C180E2001FA319 /* DebugiPhone40.xcconfig */; @@ -2137,6 +2266,9 @@ 8B23011811C1810E001FA319 /* iPhone4.0-Debug */, 8B23011911C1810E001FA319 /* iPhone4.0-Debug-gcov */, 8B23011A11C1810E001FA319 /* iPhone4.0-Release */, + 5729E6D912A3FA6400BF1B8A /* iPhone4.1-Debug */, + 5729E6DE12A3FA6C00BF1B8A /* iPhone4.1-Debug-gcov */, + 5729E6E312A3FA7400BF1B8A /* iPhone4.1-Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = "iPhone3.1.2-Debug"; @@ -2174,6 +2306,9 @@ 8B23011E11C1810E001FA319 /* iPhone4.0-Debug */, 8B23011F11C1810E001FA319 /* iPhone4.0-Debug-gcov */, 8B23012011C1810E001FA319 /* iPhone4.0-Release */, + 5729E6DB12A3FA6400BF1B8A /* iPhone4.1-Debug */, + 5729E6E012A3FA6C00BF1B8A /* iPhone4.1-Debug-gcov */, + 5729E6E512A3FA7400BF1B8A /* iPhone4.1-Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = "iPhone3.1.2-Debug"; @@ -2211,6 +2346,9 @@ 8B23011211C1810E001FA319 /* iPhone4.0-Debug */, 8B23011311C1810E001FA319 /* iPhone4.0-Debug-gcov */, 8B23011411C1810E001FA319 /* iPhone4.0-Release */, + 5729E6D712A3FA6400BF1B8A /* iPhone4.1-Debug */, + 5729E6DC12A3FA6C00BF1B8A /* iPhone4.1-Debug-gcov */, + 5729E6E112A3FA7400BF1B8A /* iPhone4.1-Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = "iPhone3.1.2-Debug"; @@ -2248,6 +2386,9 @@ 8B23011B11C1810E001FA319 /* iPhone4.0-Debug */, 8B23011C11C1810E001FA319 /* iPhone4.0-Debug-gcov */, 8B23011D11C1810E001FA319 /* iPhone4.0-Release */, + 5729E6DA12A3FA6400BF1B8A /* iPhone4.1-Debug */, + 5729E6DF12A3FA6C00BF1B8A /* iPhone4.1-Debug-gcov */, + 5729E6E412A3FA7400BF1B8A /* iPhone4.1-Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = "iPhone3.1.2-Debug"; @@ -2285,6 +2426,9 @@ 8B23011511C1810E001FA319 /* iPhone4.0-Debug */, 8B23011611C1810E001FA319 /* iPhone4.0-Debug-gcov */, 8B23011711C1810E001FA319 /* iPhone4.0-Release */, + 5729E6D812A3FA6400BF1B8A /* iPhone4.1-Debug */, + 5729E6DD12A3FA6C00BF1B8A /* iPhone4.1-Debug-gcov */, + 5729E6E212A3FA7400BF1B8A /* iPhone4.1-Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = "iPhone3.1.2-Debug"; diff --git a/XcodeConfig/Project/DebugiPhone41.xcconfig b/XcodeConfig/Project/DebugiPhone41.xcconfig new file mode 100644 index 0000000..8541e4f --- /dev/null +++ b/XcodeConfig/Project/DebugiPhone41.xcconfig @@ -0,0 +1,37 @@ +// +// DebugiPhone41.xcconfig +// +// Xcode configuration file for building a Debug configuration of a project +// for iOS 4.1. +// +// Copyright 2010 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/iPhone41.xcconfig" + +// Debug settings +#include "../subconfig/Debug.xcconfig" + +// Merge settings +#include "../subconfig/GTMMerge.xcconfig" diff --git a/XcodeConfig/Project/ReleaseiPhone41.xcconfig b/XcodeConfig/Project/ReleaseiPhone41.xcconfig new file mode 100644 index 0000000..7ed3698 --- /dev/null +++ b/XcodeConfig/Project/ReleaseiPhone41.xcconfig @@ -0,0 +1,37 @@ +// +// ReleaseiPhone41.xcconfig +// +// Xcode configuration file for building a Release configuration of a project +// for iOS 4.1. +// +// Copyright 2010 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/iPhone41.xcconfig" + +// Release settings +#include "../subconfig/Release.xcconfig" + +// Merge settings +#include "../subconfig/GTMMerge.xcconfig" diff --git a/XcodeConfig/subconfig/iPhone41.xcconfig b/XcodeConfig/subconfig/iPhone41.xcconfig new file mode 100644 index 0000000..1edddc3 --- /dev/null +++ b/XcodeConfig/subconfig/iPhone41.xcconfig @@ -0,0 +1,21 @@ +// +// iPhone41.xcconfig +// +// Xcode configuration file for building a Debug target on iOS 4.0. +// +// Copyright 2010 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 = iphoneos4.1 -- cgit v1.2.3