From f90bcf3263b80b96754977ddbd5309704cf817fb Mon Sep 17 00:00:00 2001 From: thomasvl Date: Fri, 9 May 2008 18:53:09 +0000 Subject: Flush out suppport for 64bit, GC support. Added some more xcode configs related to the above. Removed some classes that the unittesting doesn't need (and aren't able to support 64bit). add base64, httpfetcher, and progress monitor stream. --- .../Target/LoadableBundleGCSupported.xcconfig | 30 ++++++++++++++++++++++ .../Target/SharedLibraryGCSupported.xcconfig | 30 ++++++++++++++++++++++ .../Target/StaticLibraryGCSupported.xcconfig | 30 ++++++++++++++++++++++ XcodeConfig/subconfig/64bit.xcconfig | 26 +++++++++++++++++++ XcodeConfig/subconfig/GCSupported.xcconfig | 23 +++++++++++++++++ XcodeConfig/subconfig/LeopardOrLater.xcconfig | 4 +++ XcodeConfig/subconfig/TigerOrLater.xcconfig | 2 +- 7 files changed, 144 insertions(+), 1 deletion(-) create mode 100644 XcodeConfig/Target/LoadableBundleGCSupported.xcconfig create mode 100644 XcodeConfig/Target/SharedLibraryGCSupported.xcconfig create mode 100644 XcodeConfig/Target/StaticLibraryGCSupported.xcconfig create mode 100644 XcodeConfig/subconfig/64bit.xcconfig create mode 100644 XcodeConfig/subconfig/GCSupported.xcconfig (limited to 'XcodeConfig') diff --git a/XcodeConfig/Target/LoadableBundleGCSupported.xcconfig b/XcodeConfig/Target/LoadableBundleGCSupported.xcconfig new file mode 100644 index 0000000..861845a --- /dev/null +++ b/XcodeConfig/Target/LoadableBundleGCSupported.xcconfig @@ -0,0 +1,30 @@ +// +// LoadableBundleGCSupported.xcconfig +// +// Xcode configuration file for a loadable bundle that supports garbage +// collection. Usually a Cocoa plugin or similar. +// +// 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. +// +// 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. +// + +// Include the basic Loadable Bundle config +#include "LoadableBundle.xcconfig" + +// Include the GC flag(s) +#include "../subconfig/GCSupported.xcconfig" diff --git a/XcodeConfig/Target/SharedLibraryGCSupported.xcconfig b/XcodeConfig/Target/SharedLibraryGCSupported.xcconfig new file mode 100644 index 0000000..e6b56f7 --- /dev/null +++ b/XcodeConfig/Target/SharedLibraryGCSupported.xcconfig @@ -0,0 +1,30 @@ +// +// SharedLibraryGCSupported.xcconfig +// +// Xcode configuration file for a shared library that support garbage +// collection. +// +// 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. +// +// 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. +// + +// Include the basic Shared Library config +#include "SharedLibrary.xcconfig" + +// Include the GC flag(s) +#include "../subconfig/GCSupported.xcconfig" diff --git a/XcodeConfig/Target/StaticLibraryGCSupported.xcconfig b/XcodeConfig/Target/StaticLibraryGCSupported.xcconfig new file mode 100644 index 0000000..6a57a0c --- /dev/null +++ b/XcodeConfig/Target/StaticLibraryGCSupported.xcconfig @@ -0,0 +1,30 @@ +// +// StaticLibraryGCSupported.xcconfig +// +// Xcode configuration file for a static library that supports garbage +// collection. +// +// 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. +// +// 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. +// + +// Include the basic Static Library config +#include "StaticLibrary.xcconfig" + +// Include the GC flag(s) +#include "../subconfig/GCSupported.xcconfig" diff --git a/XcodeConfig/subconfig/64bit.xcconfig b/XcodeConfig/subconfig/64bit.xcconfig new file mode 100644 index 0000000..bb9cae6 --- /dev/null +++ b/XcodeConfig/subconfig/64bit.xcconfig @@ -0,0 +1,26 @@ +// +// 64bit.xcconfig +// +// Xcode configuration file to include for builds wanting 64bit support. +// +// 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. +// + +// Compile all flavors: 32 & 64bit on both PPC and Intel +ARCHS = i386 x86_64 ppc ppc64 + +// Warn on implicit data conversions in 64bit builds +GCC_WARN_64_TO_32_BIT_CONVERSION[arch=ppc64] = YES +GCC_WARN_64_TO_32_BIT_CONVERSION[arch=x86_64] = YES diff --git a/XcodeConfig/subconfig/GCSupported.xcconfig b/XcodeConfig/subconfig/GCSupported.xcconfig new file mode 100644 index 0000000..74bd027 --- /dev/null +++ b/XcodeConfig/subconfig/GCSupported.xcconfig @@ -0,0 +1,23 @@ +// +// GCSupported.xcconfig +// +// Xcode configuration file for making a build Garbage Collection enabled. +// Use the *GCSupported specific configs in the Target folder. +// +// 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. +// + +// enable garbage collection (but don't require it) +GCC_ENABLE_OBJC_GC = supported diff --git a/XcodeConfig/subconfig/LeopardOrLater.xcconfig b/XcodeConfig/subconfig/LeopardOrLater.xcconfig index b2828d7..6cc1a08 100644 --- a/XcodeConfig/subconfig/LeopardOrLater.xcconfig +++ b/XcodeConfig/subconfig/LeopardOrLater.xcconfig @@ -26,3 +26,7 @@ GCC_VERSION = 4.0 // On Leopard use Obj-C fast dispatch GCC_FAST_OBJC_DISPATCH = YES + +// For Leopard, pull in 64bit support +#include "64bit.xcconfig" + diff --git a/XcodeConfig/subconfig/TigerOrLater.xcconfig b/XcodeConfig/subconfig/TigerOrLater.xcconfig index d8f7a3d..a693a58 100644 --- a/XcodeConfig/subconfig/TigerOrLater.xcconfig +++ b/XcodeConfig/subconfig/TigerOrLater.xcconfig @@ -20,7 +20,7 @@ // // Default SDK and minimum OS version is 10.4 -SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk +SDKROOT = $(DEVELOPER_SDK_DIR)/MacOSX10.4u.sdk MACOSX_DEPLOYMENT_TARGET = 10.4 GCC_VERSION = 4.0 -- cgit v1.2.3