diff options
author | The Android Open Source Project <initial-contribution@android.com> | 2009-03-03 18:28:41 -0800 |
---|---|---|
committer | The Android Open Source Project <initial-contribution@android.com> | 2009-03-03 18:28:41 -0800 |
commit | 648161bb0edfc3d43db63caed5cc5213bc6cb78f (patch) | |
tree | 4b825dc642cb6eb9a060e54bf8d69288fbee4904 /WebCore/Configurations | |
parent | a65af38181ac7d34544586bdb5cd004de93897ad (diff) | |
download | external_webkit-648161bb0edfc3d43db63caed5cc5213bc6cb78f.zip external_webkit-648161bb0edfc3d43db63caed5cc5213bc6cb78f.tar.gz external_webkit-648161bb0edfc3d43db63caed5cc5213bc6cb78f.tar.bz2 |
auto import from //depot/cupcake/@135843
Diffstat (limited to 'WebCore/Configurations')
-rw-r--r-- | WebCore/Configurations/Base.xcconfig | 70 | ||||
-rw-r--r-- | WebCore/Configurations/DebugRelease.xcconfig | 16 | ||||
-rw-r--r-- | WebCore/Configurations/Version.xcconfig | 34 | ||||
-rw-r--r-- | WebCore/Configurations/WebCore.xcconfig | 24 |
4 files changed, 0 insertions, 144 deletions
diff --git a/WebCore/Configurations/Base.xcconfig b/WebCore/Configurations/Base.xcconfig deleted file mode 100644 index c7e18e7..0000000 --- a/WebCore/Configurations/Base.xcconfig +++ /dev/null @@ -1,70 +0,0 @@ -DEBUG_INFORMATION_FORMAT = dwarf; -GCC_C_LANGUAGE_STANDARD = gnu99; -GCC_DEBUGGING_SYMBOLS = default; -GCC_DYNAMIC_NO_PIC = NO; -GCC_ENABLE_CPP_EXCEPTIONS = NO; -GCC_ENABLE_CPP_RTTI = NO; -GCC_ENABLE_OBJC_EXCEPTIONS = YES; -GCC_ENABLE_OBJC_GC = supported; -GCC_ENABLE_SYMBOL_SEPARATION = NO; -GCC_FAST_OBJC_DISPATCH = YES; -GCC_MODEL_TUNING = G5; -GCC_PRECOMPILE_PREFIX_HEADER = YES; -GCC_THREADSAFE_STATICS = NO; -GCC_TREAT_WARNINGS_AS_ERRORS = YES; -GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO; -GCC_WARN_ABOUT_MISSING_NEWLINE = YES; -GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; -GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES; -LINKER_DISPLAYS_MANGLED_NAMES = YES; -PREBINDING = NO; -VALID_ARCHS = i386 ppc x86_64 ppc64; -WARNING_CFLAGS = $(WARNING_CFLAGS_$(CURRENT_ARCH)); -WARNING_CFLAGS_BASE = -Wall -W -Wcast-align -Wchar-subscripts -Wformat-security -Wmissing-format-attribute -Wpointer-arith -Wwrite-strings -Wno-format-y2k -Wno-unused-parameter -Wundef; -WARNING_CFLAGS_ = $(WARNING_CFLAGS_BASE) -Wshorten-64-to-32; -WARNING_CFLAGS_i386 = $(WARNING_CFLAGS_BASE) -Wshorten-64-to-32; -WARNING_CFLAGS_ppc = $(WARNING_CFLAGS_BASE) -Wshorten-64-to-32; -// FIXME: WebCore 64-bit builds should build with -Wshorten-64-to-32 -WARNING_CFLAGS_ppc64 = $(WARNING_CFLAGS_BASE); -WARNING_CFLAGS_x86_64 = $(WARNING_CFLAGS_BASE); - - -// DEBUG_DEFINES, GCC_OPTIMIZATION_LEVEL, STRIP_INSTALLED_PRODUCT and DEAD_CODE_STRIPPING vary between the debug and normal variants. -// We set up the values for each variant here, and have the Debug configuration in the Xcode project use the _debug variant. -DEBUG_DEFINES_debug = DISABLE_THREAD_CHECK; -DEBUG_DEFINES_normal = NDEBUG; -DEBUG_DEFINES = $(DEBUG_DEFINES_$(CURRENT_VARIANT)); - -GCC_OPTIMIZATION_LEVEL = $(GCC_OPTIMIZATION_LEVEL_$(CURRENT_VARIANT)); -GCC_OPTIMIZATION_LEVEL_normal = 2; -GCC_OPTIMIZATION_LEVEL_debug = 0; - -STRIP_INSTALLED_PRODUCT = $(STRIP_INSTALLED_PRODUCT_$(CURRENT_VARIANT)); -STRIP_INSTALLED_PRODUCT_normal = YES; -STRIP_INSTALLED_PRODUCT_debug = NO; - -DEAD_CODE_STRIPPING_debug = NO; -DEAD_CODE_STRIPPING_normal = YES; -DEAD_CODE_STRIPPING = $(DEAD_CODE_STRIPPING_$(CURRENT_VARIANT)); - -WEBCORE_SQLITE3_HEADER_SEARCH_PATHS = $(NEXT_ROOT)/usr/local/include/WebCoreSQLite3; -SQLITE3_HEADER_SEARCH_PATHS = $(SQLITE3_HEADER_SEARCH_PATHS_$(MAC_OS_X_VERSION_MAJOR)); -SQLITE3_HEADER_SEARCH_PATHS_ = $(SQLITE3_HEADER_SEARCH_PATHS_1040); -SQLITE3_HEADER_SEARCH_PATHS_1040 = $(WEBCORE_SQLITE3_HEADER_SEARCH_PATHS); -SQLITE3_HEADER_SEARCH_PATHS_1050 = $(WEBCORE_SQLITE3_HEADER_SEARCH_PATHS); -SQLITE3_HEADER_SEARCH_PATHS_1060 = ; - - -// <rdar://problem/5488678>: Production builds on 10.4 PowerPC need to have debugging symbols disabled to prevent a huge STABS section being generated. -// Xcode on 10.4 does not define MAC_OS_X_VERSION_MAJOR, so the default Mac OS X version is treated as 10.4. -GCC_GENERATE_DEBUGGING_SYMBOLS = $(GCC_GENERATE_DEBUGGING_SYMBOLS_$(CURRENT_ARCH)); -GCC_GENERATE_DEBUGGING_SYMBOLS_i386 = YES; -GCC_GENERATE_DEBUGGING_SYMBOLS_x86_64 = YES; -GCC_GENERATE_DEBUGGING_SYMBOLS_ppc64 = YES; -GCC_GENERATE_DEBUGGING_SYMBOLS_ppc = $(GCC_GENERATE_DEBUGGING_SYMBOLS_$(CURRENT_ARCH)_$(CONFIGURATION)); -GCC_GENERATE_DEBUGGING_SYMBOLS_ppc_Debug = YES; -GCC_GENERATE_DEBUGGING_SYMBOLS_ppc_Release = YES; -GCC_GENERATE_DEBUGGING_SYMBOLS_ppc_Production = $(GCC_GENERATE_DEBUGGING_SYMBOLS_$(CURRENT_ARCH)_$(CONFIGURATION)_$(MAC_OS_X_VERSION_MAJOR)); -GCC_GENERATE_DEBUGGING_SYMBOLS_ppc_Production_ = NO; -GCC_GENERATE_DEBUGGING_SYMBOLS_ppc_Production_1040 = NO; -GCC_GENERATE_DEBUGGING_SYMBOLS_ppc_Production_1050 = YES; diff --git a/WebCore/Configurations/DebugRelease.xcconfig b/WebCore/Configurations/DebugRelease.xcconfig deleted file mode 100644 index 793c64c..0000000 --- a/WebCore/Configurations/DebugRelease.xcconfig +++ /dev/null @@ -1,16 +0,0 @@ -#include "Base.xcconfig" -ARCHS = $(NATIVE_ARCH); - -MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(MAC_OS_X_VERSION_MAJOR)); -MACOSX_DEPLOYMENT_TARGET_ = 10.4; -MACOSX_DEPLOYMENT_TARGET_1040 = 10.4; -MACOSX_DEPLOYMENT_TARGET_1050 = 10.5; -MACOSX_DEPLOYMENT_TARGET_1060 = 10.6; - -GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES; - -GCC_VERSION = $(GCC_VERSION_$(XCODE_VERSION_ACTUAL)); -GCC_VERSION_0310 = 4.2; -GCC_VERSION_0311 = 4.2; - -WEBCORE_SQLITE3_HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/WebCoreSQLite3; diff --git a/WebCore/Configurations/Version.xcconfig b/WebCore/Configurations/Version.xcconfig deleted file mode 100644 index 16698b9..0000000 --- a/WebCore/Configurations/Version.xcconfig +++ /dev/null @@ -1,34 +0,0 @@ -MAJOR_VERSION = 528; -MINOR_VERSION = 5; -TINY_VERSION = 0; -FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION); - -// The bundle version and short version string are set based on the current build configuration, see below. -BUNDLE_VERSION = $(BUNDLE_VERSION_$(CONFIGURATION)); -SHORT_VERSION_STRING = $(SHORT_VERSION_STRING_$(CONFIGURATION)) - -// The system version prefix is based on the current system version. -SYSTEM_VERSION_PREFIX = $(SYSTEM_VERSION_PREFIX_$(MAC_OS_X_VERSION_MAJOR)); -SYSTEM_VERSION_PREFIX_ = 4; // Some Tiger versions of Xcode don't set MAC_OS_X_VERSION_MAJOR. -SYSTEM_VERSION_PREFIX_1040 = 4; -SYSTEM_VERSION_PREFIX_1050 = 5; -SYSTEM_VERSION_PREFIX_1060 = 6; - -// The production build always uses the full version with a system version prefix. -BUNDLE_VERSION_Production = $(SYSTEM_VERSION_PREFIX)$(FULL_VERSION); -BUNDLE_VERSION_ = $(BUNDLE_VERSION_Production); - -// The production build always uses the major version with a system version prefix -SHORT_VERSION_STRING_Production = $(SYSTEM_VERSION_PREFIX)$(MAJOR_VERSION); -SHORT_VERSION_STRING_ = $(SHORT_VERSION_STRING_Production); - -// Local builds are the full version with a plus suffix. -BUNDLE_VERSION_Release = $(FULL_VERSION)+; -BUNDLE_VERSION_Debug = $(BUNDLE_VERSION_Release); - -// Local builds use the major version with a plus suffix -SHORT_VERSION_STRING_Release = $(MAJOR_VERSION)+; -SHORT_VERSION_STRING_Debug = $(SHORT_VERSION_STRING_Release); - -DYLIB_COMPATIBILITY_VERSION = 1; -DYLIB_CURRENT_VERSION = $(FULL_VERSION); diff --git a/WebCore/Configurations/WebCore.xcconfig b/WebCore/Configurations/WebCore.xcconfig deleted file mode 100644 index 7907fba..0000000 --- a/WebCore/Configurations/WebCore.xcconfig +++ /dev/null @@ -1,24 +0,0 @@ -#include "Version.xcconfig" -EXPORTED_SYMBOLS_FILE = $(EXPORTED_SYMBOLS_FILE_$(CURRENT_ARCH)); -EXPORTED_SYMBOLS_FILE_ = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/WebCore.exp; -EXPORTED_SYMBOLS_FILE_i386 = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/WebCore.exp; -EXPORTED_SYMBOLS_FILE_ppc = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/WebCore.exp; -EXPORTED_SYMBOLS_FILE_ppc64 = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/WebCore.LP64.exp; -EXPORTED_SYMBOLS_FILE_x86_64 = $(BUILT_PRODUCTS_DIR)/DerivedSources/WebCore/WebCore.LP64.exp; -GCC_PREFIX_HEADER = WebCorePrefix.h; -GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) $(FEATURE_DEFINES) WEBKIT_VERSION_MIN_REQUIRED=WEBKIT_VERSION_LATEST $(GCC_PREPROCESSOR_DEFINITIONS); -FRAMEWORK_SEARCH_PATHS = $(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Frameworks $(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Frameworks $(FRAMEWORK_SEARCH_PATHS); -HEADER_SEARCH_PATHS = ForwardingHeaders icu /usr/include/libxslt /usr/include/libxml2 $(SQLITE3_HEADER_SEARCH_PATHS) "${BUILT_PRODUCTS_DIR}/DerivedSources/WebCore" $(HEADER_SEARCH_PATHS); -INFOPLIST_FILE = Info.plist; -INSTALL_PATH = $(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Versions/A/Frameworks; -PRODUCT_NAME = WebCore; -OTHER_LDFLAGS = -l$(SQLITE3_LIBRARY) -lobjc -sub_library libobjc -umbrella WebKit; - -// This needs to be kept sorted, and in sync with FEATURE_DEFINES in JavaScriptCore.xcconfig, WebKit.xcconfig and the default settings of build-webkit. -FEATURE_DEFINES = ENABLE_DATABASE ENABLE_DOM_STORAGE ENABLE_ICONDATABASE ENABLE_OFFLINE_WEB_APPLICATIONS ENABLE_SVG ENABLE_SVG_ANIMATION ENABLE_SVG_AS_IMAGE ENABLE_SVG_FONTS ENABLE_SVG_FOREIGN_OBJECT ENABLE_SVG_USE ENABLE_VIDEO ENABLE_XPATH ENABLE_XSLT; - -SQLITE3_LIBRARY = $(SQLITE3_LIBRARY_$(MAC_OS_X_VERSION_MAJOR)); -SQLITE3_LIBRARY_ = WebCoreSQLite3; -SQLITE3_LIBRARY_1040 = WebCoreSQLite3; -SQLITE3_LIBRARY_1050 = WebCoreSQLite3; -SQLITE3_LIBRARY_1060 = sqlite3; |