Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(333)

Unified Diff: Source/bindings/derived_sources.gyp

Issue 24156003: Revert IDL compiler build flow to Perl, rename 'deprecated' (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | Source/bindings/scripts/blink_idl_lexer.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/bindings/derived_sources.gyp
diff --git a/Source/bindings/derived_sources.gyp b/Source/bindings/derived_sources.gyp
index dc58fbabeb79a94990ee1ec9856b504bee584661..2675fbe584e9a956d6b9f33c0dcacc8e3906d97d 100644
--- a/Source/bindings/derived_sources.gyp
+++ b/Source/bindings/derived_sources.gyp
@@ -37,23 +37,10 @@
],
'variables': {
- 'deprecated_perl_idl_files': [
- '<@(deprecated_perl_core_idl_files)',
- '<@(deprecated_perl_modules_idl_files)',
- '<@(deprecated_perl_svg_idl_files)',
- ],
- 'python_idl_files': [
- '<@(python_core_idl_files)',
- '<@(python_modules_idl_files)',
- '<@(python_svg_idl_files)',
- ],
- 'perl_and_python_idl_files': [
- '<@(deprecated_perl_idl_files)',
- '<@(python_idl_files)',
- ],
- 'webcore_test_support_idl_files': [
- '<@(deprecated_perl_webcore_test_support_idl_files)',
- '<@(python_webcore_test_support_idl_files)',
+ 'idl_files': [
+ '<@(core_idl_files)',
+ '<@(modules_idl_files)',
+ '<@(svg_idl_files)',
],
'compiler_module_files': [
'scripts/idl_compiler.py',
@@ -153,7 +140,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 <@(perl_and_python_idl_files))',
+ 'idl_files_list': '<|(idl_files_list.tmp <@(idl_files))',
},
'inputs': [
'scripts/compute_dependencies.py',
@@ -189,7 +176,7 @@
}]
},
{
- 'target_name': 'deprecated_perl_bindings_sources',
+ 'target_name': 'bindings_sources',
'type': 'none',
# The 'binding' rule generates .h files, so mark as hard_dependency, per:
# https://code.google.com/p/gyp/wiki/InputFormatReference#Linking_Dependencies
@@ -199,18 +186,18 @@
'../core/core_derived_sources.gyp:generate_test_support_idls',
],
'sources': [
- '<@(deprecated_perl_idl_files)',
- '<@(deprecated_perl_webcore_test_support_idl_files)',
+ '<@(idl_files)',
+ '<@(webcore_test_support_idl_files)',
],
'rules': [{
- 'rule_name': 'deprecated_perl_binding',
+ 'rule_name': 'binding',
'extension': 'idl',
'msvs_external_rule': 1,
'inputs': [
- 'scripts/deprecated_generate_bindings.pl',
- 'scripts/deprecated_code_generator_v8.pm',
- 'scripts/deprecated_idl_parser.pm',
- 'scripts/deprecated_idl_serializer.pm',
+ 'scripts/generate_bindings.pl',
+ 'scripts/code_generator_v8.pm',
+ 'scripts/idl_parser.pm',
+ 'scripts/idl_serializer.pm',
'../core/scripts/preprocessor.pm',
'scripts/IDLAttributes.txt',
# FIXME: If the dependency structure changes, we rebuild all files,
@@ -222,7 +209,7 @@
#
# If a new partial interface is added, need to regyp to update these
# dependencies, as these are computed statically at gyp runtime.
- '<!@pymod_do_main(list_idl_files_with_partial_interface <@(perl_and_python_idl_files))',
+ '<!@pymod_do_main(list_idl_files_with_partial_interface <@(idl_files))',
# Generated IDLs are all partial interfaces, hence everything
# potentially depends on them.
'<@(generated_global_constructors_idl_files)',
@@ -252,7 +239,7 @@
'-Iscripts',
'-I../core/scripts',
'-I<(DEPTH)/third_party/JSON/out/lib/perl5',
- 'scripts/deprecated_generate_bindings.pl',
+ 'scripts/generate_bindings.pl',
'--outputDir',
'<(bindings_output_dir)',
'--idlAttributesFile',
@@ -262,79 +249,8 @@
'--interfaceDependenciesFile',
'<(SHARED_INTERMEDIATE_DIR)/blink/InterfaceDependencies.txt',
'--additionalIdlFiles',
- '<(deprecated_perl_webcore_test_support_idl_files)',
- '<@(preprocessor)',
- '<@(write_file_only_if_changed)',
- '<(RULE_INPUT_PATH)',
- ],
- 'message': 'Generating binding from <(RULE_INPUT_PATH)',
- }],
- },
- {
- 'target_name': 'python_bindings_sources',
- 'type': 'none',
- # The 'binding' rule generates .h files, so mark as hard_dependency, per:
- # https://code.google.com/p/gyp/wiki/InputFormatReference#Linking_Dependencies
- 'hard_dependency': 1,
- 'dependencies': [
- 'interface_dependencies',
- '../core/core_derived_sources.gyp:generate_test_support_idls',
- ],
- 'sources': [
- '<@(python_idl_files)',
- '<@(python_webcore_test_support_idl_files)',
- ],
- 'rules': [{
- 'rule_name': 'python_binding',
- 'extension': 'idl',
- 'msvs_external_rule': 1,
- 'inputs': [
- '<@(compiler_module_files)',
- '<@(code_generator_template_files)',
- 'scripts/IDLAttributes.txt',
- # FIXME: If the dependency structure changes, we rebuild all files,
- # since we're not computing dependencies file-by-file in the build.
- '<(SHARED_INTERMEDIATE_DIR)/blink/InterfaceDependencies.txt',
- # FIXME: Similarly, if any partial interface changes, rebuild
- # everything, since every IDL potentially depends on them, because
- # we're not computing dependencies file-by-file.
- '<!@pymod_do_main(list_idl_files_with_partial_interface <@(perl_and_python_idl_files))',
- # Generated IDLs are all partial interfaces, hence everything
- # potentially depends on them.
- '<@(generated_global_constructors_idl_files)',
- ],
- 'outputs': [
- '<(bindings_output_dir)/V8<(RULE_INPUT_ROOT).cpp',
- '<(bindings_output_dir)/V8<(RULE_INPUT_ROOT).h',
- ],
- 'variables': {
- # IDL include paths. The generator will search recursively for IDL
- # files under these locations.
- 'generator_include_dirs': [
- '--include', '../core',
- '--include', '../modules',
- '--include', '<(SHARED_INTERMEDIATE_DIR)/blink',
- ],
- # Hook for embedders to specify extra directories to find IDL files.
- 'extra_blink_generator_include_dirs%': [],
- },
- 'msvs_cygwin_shell': 0,
- # sanitize-win-build-log.sed uses a regex which matches this command
- # line (Python script + .idl file being processed).
- # Update that regex if command line changes (other than changing flags)
- 'action': [
- 'python',
- 'scripts/idl_compiler.py',
- '--output-dir',
- '<(bindings_output_dir)',
- '--idl-attributes-file',
- 'scripts/IDLAttributes.txt',
- '<@(generator_include_dirs)',
- '<@(extra_blink_generator_include_dirs)',
- '--interface-dependencies-file',
- '<(SHARED_INTERMEDIATE_DIR)/blink/InterfaceDependencies.txt',
- '--additional-idl-files',
'<(webcore_test_support_idl_files)',
+ '<@(preprocessor)',
'<@(write_file_only_if_changed)',
'<(RULE_INPUT_PATH)',
],
@@ -346,8 +262,7 @@
'type': 'none',
'dependencies': [
'interface_dependencies',
- 'deprecated_perl_bindings_sources',
- 'python_bindings_sources',
+ 'bindings_sources',
],
'actions': [{
'action_name': 'derived_sources_all_in_one',
« no previous file with comments | « no previous file | Source/bindings/scripts/blink_idl_lexer.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698