Index: Source/bindings/derived_sources.gyp |
diff --git a/Source/bindings/bindings.gyp b/Source/bindings/derived_sources.gyp |
similarity index 61% |
copy from Source/bindings/bindings.gyp |
copy to Source/bindings/derived_sources.gyp |
index d20c7de763d5ff5834c36ef77e7bd6c6087f9644..a5de56e6465c5ef49401cdbdebd6b58ec5f8f047 100644 |
--- a/Source/bindings/bindings.gyp |
+++ b/Source/bindings/derived_sources.gyp |
@@ -38,40 +38,15 @@ |
], |
'variables': { |
- # If set to 1, doesn't compile debug symbols into webcore reducing the |
- # size of the binary and increasing the speed of gdb. gcc only. |
- 'remove_webcore_debug_symbols%': 0, |
- |
- 'bindings_idl_files': [ |
- '<@(webcore_idl_files)', |
+ 'idl_files': [ |
+ '<@(core_idl_files)', |
'<@(modules_idl_files)', |
], |
- 'bindings_idl_files!': [ |
- # Custom bindings in bindings/v8/custom exist for these. |
- '../core/dom/EventListener.idl', |
- |
- '../core/page/AbstractView.idl', |
- |
- # These bindings are excluded, as they're only used through inheritance and don't define constants that would need a constructor. |
- '../core/svg/ElementTimeControl.idl', |
- '../core/svg/SVGExternalResourcesRequired.idl', |
- '../core/svg/SVGFilterPrimitiveStandardAttributes.idl', |
- '../core/svg/SVGFitToViewBox.idl', |
- '../core/svg/SVGLangSpace.idl', |
- '../core/svg/SVGLocatable.idl', |
- '../core/svg/SVGTests.idl', |
- '../core/svg/SVGTransformable.idl', |
- |
- # FIXME: I don't know why these are excluded, either. |
- # Someone (me?) should figure it out and add appropriate comments. |
- '../core/css/CSSUnknownRule.idl', |
- ], |
- |
'conditions': [ |
['enable_svg!=0', { |
- 'bindings_idl_files': [ |
- '<@(webcore_svg_idl_files)', |
+ 'idl_files': [ |
+ '<@(svg_idl_files)', |
], |
}], |
['OS=="win" and buildtype=="Official"', { |
@@ -111,36 +86,6 @@ |
}, |
}, |
- 'conditions': [ |
- ['OS!="win" and remove_webcore_debug_symbols==1', { |
- # Remove -g from all targets defined here. |
- 'target_defaults': { |
- 'cflags!': ['-g'], |
- }, |
- }], |
- ['os_posix==1 and OS!="mac" and gcc_version>=46', { |
- 'target_defaults': { |
- # Disable warnings about c++0x compatibility, as some names (such as nullptr) conflict |
- # with upcoming c++0x types. |
- 'cflags_cc': ['-Wno-c++0x-compat'], |
- }, |
- }], |
- ['OS=="linux" and target_arch=="arm"', { |
- # Due to a bug in gcc arm, we get warnings about uninitialized timesNewRoman.unstatic.3258 |
- # and colorTransparent.unstatic.4879. |
- 'target_defaults': { |
- 'cflags': ['-Wno-uninitialized'], |
- }, |
- }], |
- ['clang==1', { |
- 'target_defaults': { |
- 'cflags': ['-Wglobal-constructors', '-Wunused-parameter'], |
- 'xcode_settings': { |
- 'WARNING_CFLAGS': ['-Wglobal-constructors', '-Wunused-parameter'], |
- }, |
- }, |
- }], |
- ], |
'targets': [{ |
'target_name': 'supplemental_dependencies', |
'type': 'none', |
@@ -149,7 +94,7 @@ |
'variables': { |
# Write sources into a file, so that the action command line won't |
# exceed OS limits. |
- 'idl_files_list': '<|(idl_files_list.tmp <@(bindings_idl_files))', |
+ 'idl_files_list': '<|(idl_files_list.tmp <@(idl_files))', |
}, |
'inputs': [ |
'scripts/preprocess-idls.pl', |
@@ -177,14 +122,15 @@ |
}] |
}, |
{ |
- 'target_name': 'bindings_sources', |
+ 'target_name': 'bindings_derived_sources', |
'type': 'none', |
'hard_dependency': 1, |
'dependencies': [ |
'supplemental_dependencies', |
+ '../core/core.gyp/derived_sources.gyp:generate_settings', |
], |
'sources': [ |
- '<@(bindings_idl_files)', |
+ '<@(idl_files)', |
'<@(webcore_test_support_idl_files)', |
], |
'actions': [{ |
@@ -215,7 +161,7 @@ |
'scripts/IDLParser.pm', |
'scripts/IDLAttributes.txt', |
'../core/scripts/preprocessor.pm', |
- '<!@pymod_do_main(supplemental_idl_files <@(bindings_idl_files))', |
+ '<!@pymod_do_main(supplemental_idl_files <@(idl_files))', |
], |
'outputs': [ |
# FIXME: The .cpp file should be in webkit/bindings once |
@@ -258,7 +204,7 @@ |
'-w', |
'-Iscripts', |
'-I../core/scripts', |
- '<(bindings_dir)/scripts/generate-bindings.pl', |
+ 'scripts/generate-bindings.pl', |
'--outputHeadersDir', |
'<(SHARED_INTERMEDIATE_DIR)/webkit/bindings', |
'--outputDir', |
@@ -278,80 +224,5 @@ |
'message': 'Generating binding from <(RULE_INPUT_PATH)', |
}], |
}, |
- { |
- 'target_name': 'bindings', |
- 'type': 'static_library', |
- 'hard_dependency': 1, |
- 'dependencies': [ |
- 'bindings_sources', |
- '../core/core.gyp/core.gyp:webcore_prerequisites', |
- '../yarr/yarr.gyp:yarr', |
- '../wtf/wtf.gyp:wtf', |
- '<(DEPTH)/build/temp_gyp/googleurl.gyp:googleurl', |
- '<(DEPTH)/skia/skia.gyp:skia', |
- '<(DEPTH)/third_party/iccjpeg/iccjpeg.gyp:iccjpeg', |
- '<(DEPTH)/third_party/libpng/libpng.gyp:libpng', |
- '<(DEPTH)/third_party/libxml/libxml.gyp:libxml', |
- '<(DEPTH)/third_party/libxslt/libxslt.gyp:libxslt', |
- '<(DEPTH)/third_party/libwebp/libwebp.gyp:libwebp', |
- '<(DEPTH)/third_party/npapi/npapi.gyp:npapi', |
- '<(DEPTH)/third_party/qcms/qcms.gyp:qcms', |
- '<(DEPTH)/third_party/sqlite/sqlite.gyp:sqlite', |
- '<(DEPTH)/third_party/v8-i18n/build/all.gyp:v8-i18n', |
- '<(DEPTH)/v8/tools/gyp/v8.gyp:v8', |
- '<(libjpeg_gyp_path):libjpeg', |
- ], |
- 'include_dirs': [ |
- '<(INTERMEDIATE_DIR)', |
- # FIXME: Remove <(SHARED_INTERMEDIATE_DIR)/webcore when we |
- # can entice gyp into letting us put both the .cpp and .h |
- # files in the same output directory. |
- '<(SHARED_INTERMEDIATE_DIR)/webcore', |
- '<(SHARED_INTERMEDIATE_DIR)/webkit', |
- '<(SHARED_INTERMEDIATE_DIR)/webkit/bindings', |
- ], |
- 'xcode_settings': { |
- # Some Mac-specific parts of WebKit won't compile without having this |
- # prefix header injected. |
- # FIXME: make this a first-class setting. |
- 'GCC_PREFIX_HEADER': '../core/WebCorePrefix.h', |
- }, |
- 'direct_dependent_settings': { |
- 'include_dirs': [ |
- '<(SHARED_INTERMEDIATE_DIR)/webkit', |
- '<(SHARED_INTERMEDIATE_DIR)/webkit/bindings', |
- ], |
- }, |
- 'sources': [ |
- '<@(derived_sources_aggregate_files)', |
- '<@(bindings_files)', |
- ], |
- 'conditions': [ |
- ['OS=="win" and component=="shared_library"', { |
- 'defines': [ |
- 'USING_V8_SHARED', |
- ], |
- }], |
- ['OS=="win"', { |
- 'defines': [ |
- '__PRETTY_FUNCTION__=__FUNCTION__', |
- ], |
- # This is needed because Event.h in this directory is blocked |
- # by a system header on windows. |
- 'include_dirs++': ['../core/dom'], |
- 'direct_dependent_settings': { |
- 'include_dirs+++': ['../core/dom'], |
- }, |
- # In generated bindings code: 'switch contains default but no case'. |
- # Disable c4267 warnings until we fix size_t to int truncations. |
- 'msvs_disabled_warnings': [ 4065, 4267 ], |
- }], |
- ['OS in ("linux", "android") and "WTF_USE_WEBAUDIO_IPP=1" in feature_defines', { |
- 'cflags': [ |
- '<!@(pkg-config --cflags-only-I ipp)', |
- ], |
- }], |
- ], |
- }, |
], |
} |