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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: Source/core/core.gyp

Issue 314783004: Separate the generated files from core and modules to their own sub-dirs. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: minor cleanup. Created 6 years, 7 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
« Source/bindings/bindings.gypi ('K') | « Source/bindings/modules/generated.gyp ('k') | Source/core/core.gypi » ('j') | Source/modules/modules.gyp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/core.gyp
diff --git a/Source/core/core.gyp b/Source/core/core.gyp
index d3544a5d6bd05ac47447c45b9b067871f891d471..e242485fd2a962403ed740db26e7bec09851685c 100644
--- a/Source/core/core.gyp
+++ b/Source/core/core.gyp
@@ -43,9 +43,13 @@
'webcore_include_dirs': [
'../..',
'..',
+ '<(core_output_dir)',
Nils Barth (inactive) 2014/06/04 06:09:28 Could you put this dir *below* the "qualified incl
c.shu 2014/06/04 16:00:42 Done.
+ # FIXME: Remove this after cleaning up platform dependecies on core and modules.
Nils Barth (inactive) 2014/06/04 06:09:28 Thanks for the great explanation!
+ # Needed now for RuntimeEnabledFeatures.h, etc. http://crbug.com/380361
'<(SHARED_INTERMEDIATE_DIR)/blink',
# FIXME: Remove these once core scripts generates qualified
# includes correctly: http://crbug.com/358074
+ '<(modules_output_dir)',
'<(bindings_core_v8_output_dir)',
'<(bindings_modules_v8_output_dir)',
],
@@ -84,12 +88,12 @@
'../devtools/protocol.json',
],
'outputs': [
- '<(SHARED_INTERMEDIATE_DIR)/blink/InspectorBackendDispatcher.cpp',
- '<(SHARED_INTERMEDIATE_DIR)/blink/InspectorBackendDispatcher.h',
- '<(SHARED_INTERMEDIATE_DIR)/blink/InspectorFrontend.cpp',
- '<(SHARED_INTERMEDIATE_DIR)/blink/InspectorFrontend.h',
- '<(SHARED_INTERMEDIATE_DIR)/blink/InspectorTypeBuilder.cpp',
- '<(SHARED_INTERMEDIATE_DIR)/blink/InspectorTypeBuilder.h',
+ '<(core_output_dir)/InspectorBackendDispatcher.cpp',
+ '<(core_output_dir)/InspectorBackendDispatcher.h',
+ '<(core_output_dir)/InspectorFrontend.cpp',
+ '<(core_output_dir)/InspectorFrontend.h',
+ '<(core_output_dir)/InspectorTypeBuilder.cpp',
+ '<(core_output_dir)/InspectorTypeBuilder.h',
],
'variables': {
'generator_include_dirs': [
@@ -99,7 +103,7 @@
'python',
'inspector/CodeGeneratorInspector.py',
'../devtools/protocol.json',
- '--output_dir', '<(SHARED_INTERMEDIATE_DIR)/blink',
+ '--output_dir', '<(core_output_dir)',
],
'message': 'Generating Inspector protocol backend sources from protocol.json',
},
@@ -119,18 +123,18 @@
'inspector/InspectorInstrumentation.idl',
],
'outputs': [
- '<(SHARED_INTERMEDIATE_DIR)/blink/InspectorCanvasInstrumentationInl.h',
- '<(SHARED_INTERMEDIATE_DIR)/blink/InspectorConsoleInstrumentationInl.h',
- '<(SHARED_INTERMEDIATE_DIR)/blink/InspectorInstrumentationInl.h',
- '<(SHARED_INTERMEDIATE_DIR)/blink/InspectorOverridesInl.h',
- '<(SHARED_INTERMEDIATE_DIR)/blink/InstrumentingAgentsInl.h',
- '<(SHARED_INTERMEDIATE_DIR)/blink/InspectorInstrumentationImpl.cpp',
+ '<(core_output_dir)/InspectorCanvasInstrumentationInl.h',
+ '<(core_output_dir)/InspectorConsoleInstrumentationInl.h',
+ '<(core_output_dir)/InspectorInstrumentationInl.h',
+ '<(core_output_dir)/InspectorOverridesInl.h',
+ '<(core_output_dir)/InstrumentingAgentsInl.h',
+ '<(core_output_dir)/InspectorInstrumentationImpl.cpp',
],
'action': [
'python',
'inspector/CodeGeneratorInstrumentation.py',
'inspector/InspectorInstrumentation.idl',
- '--output_dir', '<(SHARED_INTERMEDIATE_DIR)/blink',
+ '--output_dir', '<(core_output_dir)',
],
'message': 'Generating Inspector instrumentation code from InspectorInstrumentation.idl',
}
@@ -147,7 +151,7 @@
'../devtools/protocol.json',
],
'outputs': [
- '<(SHARED_INTERMEDIATE_DIR)/blink/InspectorProtocolVersion.h',
+ '<(core_output_dir)/InspectorProtocolVersion.h',
],
'variables': {
'generator_include_dirs': [
@@ -169,7 +173,7 @@
'type': 'none',
'variables': {
'input_file_path': 'inspector/InspectorOverlayPage.html',
- 'output_file_path': '<(SHARED_INTERMEDIATE_DIR)/blink/InspectorOverlayPage.h',
+ 'output_file_path': '<(core_output_dir)/InspectorOverlayPage.h',
'character_array_name': 'InspectorOverlayPage_html',
},
'includes': [ '../build/ConvertFileToHeaderWithCharacterArray.gypi' ],
@@ -179,7 +183,7 @@
'type': 'none',
'variables': {
'input_file_path': 'inspector/InjectedScriptCanvasModuleSource.js',
- 'output_file_path': '<(SHARED_INTERMEDIATE_DIR)/blink/InjectedScriptCanvasModuleSource.h',
+ 'output_file_path': '<(core_output_dir)/InjectedScriptCanvasModuleSource.h',
'character_array_name': 'InjectedScriptCanvasModuleSource_js',
},
'includes': [ '../build/ConvertFileToHeaderWithCharacterArray.gypi' ],
@@ -189,7 +193,7 @@
'type': 'none',
'variables': {
'input_file_path': 'inspector/InjectedScriptSource.js',
- 'output_file_path': '<(SHARED_INTERMEDIATE_DIR)/blink/InjectedScriptSource.h',
+ 'output_file_path': '<(core_output_dir)/InjectedScriptSource.h',
'character_array_name': 'InjectedScriptSource_js',
},
'includes': [ '../build/ConvertFileToHeaderWithCharacterArray.gypi' ],
@@ -199,7 +203,7 @@
'type': 'none',
'variables': {
'input_file_path': '<(bindings_v8_dir)/DebuggerScript.js',
- 'output_file_path': '<(SHARED_INTERMEDIATE_DIR)/blink/DebuggerScriptSource.h',
+ 'output_file_path': '<(core_output_dir)/DebuggerScriptSource.h',
'character_array_name': 'DebuggerScriptSource_js',
},
'includes': [ '../build/ConvertFileToHeaderWithCharacterArray.gypi' ],
@@ -256,82 +260,82 @@
'<@(bindings_core_generated_aggregate_files)',
# Additional .cpp files for HashTools.h
- '<(SHARED_INTERMEDIATE_DIR)/blink/CSSPropertyNames.cpp',
- '<(SHARED_INTERMEDIATE_DIR)/blink/CSSValueKeywords.cpp',
+ '<(core_output_dir)/CSSPropertyNames.cpp',
+ '<(core_output_dir)/CSSValueKeywords.cpp',
# Additional .cpp files from make_core_generated actions.
- '<(SHARED_INTERMEDIATE_DIR)/blink/Event.cpp',
- '<(SHARED_INTERMEDIATE_DIR)/blink/EventHeaders.h',
- '<(SHARED_INTERMEDIATE_DIR)/blink/EventInterfaces.h',
- '<(SHARED_INTERMEDIATE_DIR)/blink/EventNames.cpp',
- '<(SHARED_INTERMEDIATE_DIR)/blink/EventNames.h',
- '<(SHARED_INTERMEDIATE_DIR)/blink/EventTargetHeaders.h',
- '<(SHARED_INTERMEDIATE_DIR)/blink/EventTargetInterfaces.h',
- '<(SHARED_INTERMEDIATE_DIR)/blink/EventTargetNames.cpp',
- '<(SHARED_INTERMEDIATE_DIR)/blink/EventTargetNames.h',
- '<(SHARED_INTERMEDIATE_DIR)/blink/EventTypeNames.cpp',
- '<(SHARED_INTERMEDIATE_DIR)/blink/EventTypeNames.h',
- '<(SHARED_INTERMEDIATE_DIR)/blink/FetchInitiatorTypeNames.cpp',
- '<(SHARED_INTERMEDIATE_DIR)/blink/HTMLElementFactory.cpp',
- '<(SHARED_INTERMEDIATE_DIR)/blink/HTMLElementFactory.h',
- '<(SHARED_INTERMEDIATE_DIR)/blink/HTMLElementLookupTrie.cpp',
- '<(SHARED_INTERMEDIATE_DIR)/blink/HTMLElementLookupTrie.h',
- '<(SHARED_INTERMEDIATE_DIR)/blink/HTMLNames.cpp',
- '<(SHARED_INTERMEDIATE_DIR)/blink/HTMLTokenizerNames.cpp',
- '<(SHARED_INTERMEDIATE_DIR)/blink/InputTypeNames.cpp',
- '<(SHARED_INTERMEDIATE_DIR)/blink/MathMLNames.cpp',
- '<(SHARED_INTERMEDIATE_DIR)/blink/SVGNames.cpp',
- '<(SHARED_INTERMEDIATE_DIR)/blink/UserAgentStyleSheetsData.cpp',
- '<(SHARED_INTERMEDIATE_DIR)/blink/V8HTMLElementWrapperFactory.cpp',
- '<(SHARED_INTERMEDIATE_DIR)/blink/XLinkNames.cpp',
- '<(SHARED_INTERMEDIATE_DIR)/blink/XMLNSNames.cpp',
- '<(SHARED_INTERMEDIATE_DIR)/blink/XMLNames.cpp',
+ '<(core_output_dir)/Event.cpp',
+ '<(core_output_dir)/EventHeaders.h',
+ '<(core_output_dir)/EventInterfaces.h',
+ '<(core_output_dir)/EventNames.cpp',
+ '<(core_output_dir)/EventNames.h',
+ '<(core_output_dir)/EventTargetHeaders.h',
+ '<(core_output_dir)/EventTargetInterfaces.h',
+ '<(core_output_dir)/EventTargetNames.cpp',
+ '<(core_output_dir)/EventTargetNames.h',
+ '<(core_output_dir)/EventTypeNames.cpp',
+ '<(core_output_dir)/EventTypeNames.h',
+ '<(core_output_dir)/FetchInitiatorTypeNames.cpp',
+ '<(core_output_dir)/HTMLElementFactory.cpp',
+ '<(core_output_dir)/HTMLElementFactory.h',
+ '<(core_output_dir)/HTMLElementLookupTrie.cpp',
+ '<(core_output_dir)/HTMLElementLookupTrie.h',
+ '<(core_output_dir)/HTMLNames.cpp',
+ '<(core_output_dir)/HTMLTokenizerNames.cpp',
+ '<(core_output_dir)/InputTypeNames.cpp',
+ '<(core_output_dir)/MathMLNames.cpp',
+ '<(core_output_dir)/SVGNames.cpp',
+ '<(core_output_dir)/UserAgentStyleSheetsData.cpp',
+ '<(core_output_dir)/V8HTMLElementWrapperFactory.cpp',
+ '<(core_output_dir)/XLinkNames.cpp',
+ '<(core_output_dir)/XMLNSNames.cpp',
+ '<(core_output_dir)/XMLNames.cpp',
# Generated from HTMLEntityNames.in
- '<(SHARED_INTERMEDIATE_DIR)/blink/HTMLEntityTable.cpp',
+ '<(core_output_dir)/HTMLEntityTable.cpp',
# Generated from MediaFeatureNames.in
- '<(SHARED_INTERMEDIATE_DIR)/blink/MediaFeatureNames.cpp',
+ '<(core_output_dir)/MediaFeatureNames.cpp',
# Generated from MediaTypeNames.in
- '<(SHARED_INTERMEDIATE_DIR)/blink/MediaTypeNames.cpp',
+ '<(core_output_dir)/MediaTypeNames.cpp',
# Generated from CSSTokenizer-in.cpp
- '<(SHARED_INTERMEDIATE_DIR)/blink/CSSTokenizer.cpp',
+ '<(core_output_dir)/CSSTokenizer.cpp',
# Generated from BisonCSSParser-in.cpp
- '<(SHARED_INTERMEDIATE_DIR)/blink/BisonCSSParser.cpp',
+ '<(core_output_dir)/BisonCSSParser.cpp',
# Generated from HTMLMetaElement-in.cpp
- '<(SHARED_INTERMEDIATE_DIR)/blink/HTMLMetaElement.cpp',
+ '<(core_output_dir)/HTMLMetaElement.cpp',
# Additional .cpp files from the make_core_generated rules.
- '<(SHARED_INTERMEDIATE_DIR)/blink/CSSGrammar.cpp',
- '<(SHARED_INTERMEDIATE_DIR)/blink/XPathGrammar.cpp',
+ '<(core_output_dir)/CSSGrammar.cpp',
+ '<(core_output_dir)/XPathGrammar.cpp',
# Additional .cpp files from the inspector_protocol_sources list.
- '<(SHARED_INTERMEDIATE_DIR)/blink/InspectorFrontend.cpp',
- '<(SHARED_INTERMEDIATE_DIR)/blink/InspectorBackendDispatcher.cpp',
- '<(SHARED_INTERMEDIATE_DIR)/blink/InspectorTypeBuilder.cpp',
+ '<(core_output_dir)/InspectorFrontend.cpp',
+ '<(core_output_dir)/InspectorBackendDispatcher.cpp',
+ '<(core_output_dir)/InspectorTypeBuilder.cpp',
# Additional .cpp files from the inspector_instrumentation_sources list.
- '<(SHARED_INTERMEDIATE_DIR)/blink/InspectorCanvasInstrumentationInl.h',
- '<(SHARED_INTERMEDIATE_DIR)/blink/InspectorConsoleInstrumentationInl.h',
- '<(SHARED_INTERMEDIATE_DIR)/blink/InspectorInstrumentationInl.h',
- '<(SHARED_INTERMEDIATE_DIR)/blink/InspectorOverridesInl.h',
- '<(SHARED_INTERMEDIATE_DIR)/blink/InstrumentingAgentsInl.h',
- '<(SHARED_INTERMEDIATE_DIR)/blink/InspectorInstrumentationImpl.cpp',
+ '<(core_output_dir)/InspectorCanvasInstrumentationInl.h',
+ '<(core_output_dir)/InspectorConsoleInstrumentationInl.h',
+ '<(core_output_dir)/InspectorInstrumentationInl.h',
+ '<(core_output_dir)/InspectorOverridesInl.h',
+ '<(core_output_dir)/InstrumentingAgentsInl.h',
+ '<(core_output_dir)/InspectorInstrumentationImpl.cpp',
# Additional .cpp files for SVG.
- '<(SHARED_INTERMEDIATE_DIR)/blink/SVGElementFactory.cpp',
- '<(SHARED_INTERMEDIATE_DIR)/blink/V8SVGElementWrapperFactory.cpp',
+ '<(core_output_dir)/SVGElementFactory.cpp',
+ '<(core_output_dir)/V8SVGElementWrapperFactory.cpp',
# Generated from make_style_shorthands.py
- '<(SHARED_INTERMEDIATE_DIR)/blink/StylePropertyShorthand.cpp',
+ '<(core_output_dir)/StylePropertyShorthand.cpp',
# Generated from make_style_builder.py
- '<(SHARED_INTERMEDIATE_DIR)/blink/StyleBuilder.cpp',
- '<(SHARED_INTERMEDIATE_DIR)/blink/StyleBuilderFunctions.cpp',
+ '<(core_output_dir)/StyleBuilder.cpp',
+ '<(core_output_dir)/StyleBuilderFunctions.cpp',
],
'conditions': [
['OS=="win" and component=="shared_library"', {
« Source/bindings/bindings.gypi ('K') | « Source/bindings/modules/generated.gyp ('k') | Source/core/core.gypi » ('j') | Source/modules/modules.gyp » ('J')

Powered by Google App Engine
This is Rietveld 408576698