From 5254e4910abd5fbb5d915ff033edd9212bf0d7fd Mon Sep 17 00:00:00 2001 From: "gtm.daemon" Date: Tue, 23 Aug 2011 20:30:21 +0000 Subject: [Author: thomasvl] This will need followup, but this is a quick and dirty to fix the things that have gone very stale. - Stop setting mac min sdk for iOS, there is an iOS version now (and setting it can cause linker errors on newer xcodes). - Add iOS xcconfigs that use the current SDK and have projects set their min version as that's how Apple wants things. - Add new config that uses the current SDK to make development workable. - Block codesigning on the iOS unittests for now. - Block format string warnings on logger until we can sort out a way to shut it up for gcc 4.2 or actually make it work. R=dmaclach DELTA=289 (277 added, 3 deleted, 9 changed) --- XcodeConfig/Project/DebugiOS.xcconfig | 37 +++++++++++++++++++++++++++++++++ XcodeConfig/Project/ReleaseiOS.xcconfig | 37 +++++++++++++++++++++++++++++++++ XcodeConfig/subconfig/General.xcconfig | 5 +---- XcodeConfig/subconfig/iOS.xcconfig | 23 ++++++++++++++++++++ 4 files changed, 98 insertions(+), 4 deletions(-) create mode 100644 XcodeConfig/Project/DebugiOS.xcconfig create mode 100644 XcodeConfig/Project/ReleaseiOS.xcconfig create mode 100644 XcodeConfig/subconfig/iOS.xcconfig (limited to 'XcodeConfig') diff --git a/XcodeConfig/Project/DebugiOS.xcconfig b/XcodeConfig/Project/DebugiOS.xcconfig new file mode 100644 index 0000000..e4998d3 --- /dev/null +++ b/XcodeConfig/Project/DebugiOS.xcconfig @@ -0,0 +1,37 @@ +// +// DebugiOS.xcconfig +// +// Xcode configuration file for building a Debug configuration of a project +// for iOS. +// +// Copyright 2011 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" + +// iOS settings. +#include "../subconfig/iOS.xcconfig" + +// Debug settings +#include "../subconfig/Debug.xcconfig" + +// Merge settings +#include "../subconfig/GTMMerge.xcconfig" diff --git a/XcodeConfig/Project/ReleaseiOS.xcconfig b/XcodeConfig/Project/ReleaseiOS.xcconfig new file mode 100644 index 0000000..a6686fc --- /dev/null +++ b/XcodeConfig/Project/ReleaseiOS.xcconfig @@ -0,0 +1,37 @@ +// +// ReleaseiOS.xcconfig +// +// Xcode configuration file for building a Release configuration of a project +// for iOS. +// +// Copyright 2011 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" + +// iOS settings. +#include "../subconfig/iOS.xcconfig" + +// Release settings +#include "../subconfig/Release.xcconfig" + +// Merge settings +#include "../subconfig/GTMMerge.xcconfig" diff --git a/XcodeConfig/subconfig/General.xcconfig b/XcodeConfig/subconfig/General.xcconfig index ffe3454..03f5b50 100644 --- a/XcodeConfig/subconfig/General.xcconfig +++ b/XcodeConfig/subconfig/General.xcconfig @@ -4,7 +4,7 @@ // Xcode configuration file for general build settings applicable to all // projects and targets. // -// Copyright 2006-2008 Google Inc. +// Copyright 2011 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 @@ -46,9 +46,6 @@ ARCHS[sdk=iphonesimulator*] = i386 // Build only the active architecture on iphone device targets ONLY_ACTIVE_ARCH[sdk=iphoneos*] = YES -// iPhone currently deploys on 10.5 only -MACOSX_DEPLOYMENT_TARGET[sdk=iphone*] = 10.5 - // We want our pngs compressed when they are copied COMPRESS_PNG_FILES = YES diff --git a/XcodeConfig/subconfig/iOS.xcconfig b/XcodeConfig/subconfig/iOS.xcconfig new file mode 100644 index 0000000..2b8de4f --- /dev/null +++ b/XcodeConfig/subconfig/iOS.xcconfig @@ -0,0 +1,23 @@ +// +// iOS.xcconfig +// +// Xcode configuration file for building a Debug target on iOS. +// +// Copyright 2011 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 = iphoneos + +// Use IPHONEOS_DEPLOYMENT_TARGET to set the min iOS version you will require. -- cgit v1.2.3