Changeset 42631 in webkit for trunk/JavaScriptCore/Configurations/JavaScriptCore.xcconfig

Timestamp:

Apr 17, 2009, 4:11:46 PM (16 years ago)

Author:

[email protected]

Message:

Simplify FEATURE_DEFINES definition

Reviewed by Darin Adler.

This moves FEATURE_DEFINES and its related ENABLE_FEATURE_NAME
variables to their own FeatureDefines.xcconfig file. It also
extracts a new ENABLE_GEOLOCATION variable so that
FEATURE_DEFINES only needs to be defined once.

JavaScriptCore:

• Configurations/FeatureDefines.xcconfig: Added.
• Configurations/JavaScriptCore.xcconfig: Removed definition of ENABLE_SVG_DOM_OBJC_BINDINGS and FEATURE_DEFINES. Added include of FeatureDefines.xcconfig.
• JavaScriptCore.xcodeproj/project.pbxproj: Added FeatureDefines.xcconfig file.

WebCore:

• Configurations/FeatureDefines.xcconfig: Added.
• Configurations/WebCore.xcconfig: Removed definition of ENABLE_SVG_DOM_OBJC_BINDINGS and FEATURE_DEFINES. Added include of FeatureDefines.xcconfig.
• WebCore.xcodeproj/project.pbxproj: Added FeatureDefines.xcconfig file.
• bindings/scripts/CodeGeneratorObjC.pm: When creating a list of command-line macro definitions, split on one-or-more spaces instead of a single space since the FEATURE_DEFINES macro may now contain more than one space between macros if some macros aren't defined.

WebKit:

• WebKit.xcodeproj/project.pbxproj: Added FeatureDefines.xcconfig file.

WebKit/mac:

• Configurations/FeatureDefines.xcconfig: Added.
• Configurations/WebKit.xcconfig: Removed definition of ENABLE_SVG_DOM_OBJC_BINDINGS and FEATURE_DEFINES. Added include of FeatureDefines.xcconfig.

WebKitTools:

• Scripts/build-webkit: Realphabetized code related to enabling Geolation features for WebKit. Also set ENABLE_GEOLOCATION variable for xcodebuild.

File:

• trunk/JavaScriptCore/Configurations/JavaScriptCore.xcconfig (modified) (2 diffs)

trunk/JavaScriptCore/Configurations/JavaScriptCore.xcconfig

@@ +1 @@
+#include "FeatureDefines.xcconfig"
 #include "Version.xcconfig"
+
 EXPORTED_SYMBOLS_FILE = $(EXPORTED_SYMBOLS_FILE_$(CURRENT_ARCH));
 EXPORTED_SYMBOLS_FILE_ = JavaScriptCore.exp;
@@ -13 +15 @@
 PRODUCT_NAME = JavaScriptCore;
 
-// Set to an empty string to disable this feature
-ENABLE_SVG_DOM_OBJC_BINDINGS = ENABLE_SVG_DOM_OBJC_BINDINGS;
-
-// This needs to be kept sorted, and in sync with FEATURE_DEFINES in WebCore.xcconfig, WebKit.xcconfig and
-// the default settings of build-webkit to prevent needless rebuilding when using both Xcode and build-webkit.
-FEATURE_DEFINES = $(FEATURE_DEFINES_$(MAC_OS_X_VERSION_MAJOR));
-FEATURE_DEFINES_BASE = ENABLE_DATABASE ENABLE_DOM_STORAGE ENABLE_ICONDATABASE ENABLE_OFFLINE_WEB_APPLICATIONS ENABLE_SVG ENABLE_SVG_ANIMATION ENABLE_SVG_AS_IMAGE $(ENABLE_SVG_DOM_OBJC_BINDINGS) ENABLE_SVG_FONTS ENABLE_SVG_FOREIGN_OBJECT ENABLE_SVG_USE ENABLE_VIDEO ENABLE_WORKERS ENABLE_XPATH ENABLE_XSLT;
-FEATURE_DEFINES_ = $(FEATURE_DEFINES_1040);
-FEATURE_DEFINES_1040 = $(FEATURE_DEFINES_BASE);
-FEATURE_DEFINES_1050 = $(FEATURE_DEFINES_BASE);
-FEATURE_DEFINES_1060 = $(FEATURE_DEFINES_BASE) ENABLE_GEOLOCATION;
-
 OTHER_CFLAGS = $(OTHER_CFLAGS_$(CONFIGURATION)_$(CURRENT_VARIANT));
 OTHER_CFLAGS_Release_normal = $(OTHER_CFLAGS_normal_$(XCODE_VERSION_ACTUAL));