diff options
Diffstat (limited to 'JavaScriptCore/Configurations')
| -rw-r--r-- | JavaScriptCore/Configurations/Base.xcconfig | 31 | ||||
| -rw-r--r-- | JavaScriptCore/Configurations/DebugRelease.xcconfig | 9 | ||||
| -rw-r--r-- | JavaScriptCore/Configurations/JavaScriptCore.xcconfig | 8 | ||||
| -rw-r--r-- | JavaScriptCore/Configurations/Version.xcconfig | 25 |
4 files changed, 58 insertions, 15 deletions
diff --git a/JavaScriptCore/Configurations/Base.xcconfig b/JavaScriptCore/Configurations/Base.xcconfig index 5244f8d..0abb45d 100644 --- a/JavaScriptCore/Configurations/Base.xcconfig +++ b/JavaScriptCore/Configurations/Base.xcconfig @@ -1,22 +1,21 @@ -DEAD_CODE_STRIPPING = YES; DEBUG_INFORMATION_FORMAT = dwarf; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DEBUGGING_SYMBOLS = default; GCC_DYNAMIC_NO_PIC = NO; -GCC_STRICT_ALIASING = YES; -GCC_INLINES_ARE_PRIVATE_EXTERN = YES; 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_INLINES_ARE_PRIVATE_EXTERN = YES; GCC_MODEL_TUNING = G5; -GCC_OPTIMIZATION_LEVEL = 3; GCC_PRECOMPILE_PREFIX_HEADER = YES; -GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) $(GCC_PREPROCESSOR_DEFINITIONS); +GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) WEBKIT_VERSION_MIN_REQUIRED=WEBKIT_VERSION_LATEST $(GCC_PREPROCESSOR_DEFINITIONS); +GCC_STRICT_ALIASING = 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; @@ -34,10 +33,31 @@ WARNING_CFLAGS_x86_64 = $(WARNING_CFLAGS_BASE); HEADER_SEARCH_PATHS = . icu $(HEADER_SEARCH_PATHS); +// 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 = ; +DEBUG_DEFINES_normal = NDEBUG; +DEBUG_DEFINES = $(DEBUG_DEFINES_$(CURRENT_VARIANT)); + +GCC_OPTIMIZATION_LEVEL = $(GCC_OPTIMIZATION_LEVEL_$(CURRENT_VARIANT)); +GCC_OPTIMIZATION_LEVEL_normal = 3; +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)); + + // <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; @@ -45,3 +65,4 @@ GCC_GENERATE_DEBUGGING_SYMBOLS_ppc_Production = $(GCC_GENERATE_DEBUGGING_SYMBOLS GCC_GENERATE_DEBUGGING_SYMBOLS_ppc_Production_ = NO; GCC_GENERATE_DEBUGGING_SYMBOLS_ppc_Production_1040 = NO; GCC_GENERATE_DEBUGGING_SYMBOLS_ppc_Production_1050 = YES; +GCC_GENERATE_DEBUGGING_SYMBOLS_ppc_Production_1060 = YES; diff --git a/JavaScriptCore/Configurations/DebugRelease.xcconfig b/JavaScriptCore/Configurations/DebugRelease.xcconfig index f93e177..0515da4 100644 --- a/JavaScriptCore/Configurations/DebugRelease.xcconfig +++ b/JavaScriptCore/Configurations/DebugRelease.xcconfig @@ -1,5 +1,14 @@ #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; diff --git a/JavaScriptCore/Configurations/JavaScriptCore.xcconfig b/JavaScriptCore/Configurations/JavaScriptCore.xcconfig index 453dbb8..8e3d3c0 100644 --- a/JavaScriptCore/Configurations/JavaScriptCore.xcconfig +++ b/JavaScriptCore/Configurations/JavaScriptCore.xcconfig @@ -5,10 +5,16 @@ EXPORTED_SYMBOLS_FILE_i386 = JavaScriptCore.exp; EXPORTED_SYMBOLS_FILE_ppc = JavaScriptCore.exp; EXPORTED_SYMBOLS_FILE_ppc64 = $(BUILT_PRODUCTS_DIR)/DerivedSources/JavaScriptCore/JavaScriptCore.LP64.exp; EXPORTED_SYMBOLS_FILE_x86_64 = $(BUILT_PRODUCTS_DIR)/DerivedSources/JavaScriptCore/JavaScriptCore.LP64.exp; -FEATURE_DEFINES = ENABLE_DATABASE ENABLE_ICONDATABASE ENABLE_SVG ENABLE_SVG_FONTS ENABLE_SVG_AS_IMAGE ENABLE_SVG_USE ENABLE_SVG_FOREIGN_OBJECT ENABLE_XPATH ENABLE_XSLT ENABLE_VIDEO; OTHER_LDFLAGS = -lobjc -sub_library libobjc -Wl,-Y,3; GCC_PREFIX_HEADER = JavaScriptCorePrefix.h; HEADER_SEARCH_PATHS = "${BUILT_PRODUCTS_DIR}/DerivedSources/JavaScriptCore" $(HEADER_SEARCH_PATHS); INFOPLIST_FILE = Info.plist; INSTALL_PATH = $(SYSTEM_LIBRARY_DIR)/Frameworks; PRODUCT_NAME = JavaScriptCore; + +// This needs to be kept sorted, and in sync with FEATURE_DEFINES in WebCore.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; + +OTHER_CFLAGS = $(OTHER_CFLAGS_$(CONFIGURATION)_$(CURRENT_VARIANT)); +OTHER_CFLAGS_Release_normal = -fomit-frame-pointer; +OTHER_CFLAGS_Production_normal = -fomit-frame-pointer; diff --git a/JavaScriptCore/Configurations/Version.xcconfig b/JavaScriptCore/Configurations/Version.xcconfig index 33e1e70..16698b9 100644 --- a/JavaScriptCore/Configurations/Version.xcconfig +++ b/JavaScriptCore/Configurations/Version.xcconfig @@ -1,14 +1,11 @@ -MAJOR_VERSION = 525; -MINOR_VERSION = 13; +MAJOR_VERSION = 528; +MINOR_VERSION = 5; TINY_VERSION = 0; FULL_VERSION = $(MAJOR_VERSION).$(MINOR_VERSION); -// The bundle version is set based on the current build configuration, see below. +// The bundle version and short version string are set based on the current build configuration, see below. BUNDLE_VERSION = $(BUNDLE_VERSION_$(CONFIGURATION)); - -// The local builds are always just the major version with a Plus suffix. -BUNDLE_VERSION_Release = $(FULL_VERSION)+; -BUNDLE_VERSION_Debug = $(BUNDLE_VERSION_Release); +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)); @@ -19,9 +16,19 @@ 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); - -// If $(CONFIGURATION) is undefined, use the Production 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); |