Index: third_party/WebKit/Source/platform/v8_inspector/v8_inspector.gyp |
diff --git a/third_party/WebKit/Source/platform/v8_inspector/v8_inspector.gyp b/third_party/WebKit/Source/platform/v8_inspector/v8_inspector.gyp |
index 177d89c4ab0ab6a26493cebf9ff157e3bfc6337d..6c5e09aeecf5e1dcfdf65488aed1c378c5392218 100644 |
--- a/third_party/WebKit/Source/platform/v8_inspector/v8_inspector.gyp |
+++ b/third_party/WebKit/Source/platform/v8_inspector/v8_inspector.gyp |
@@ -52,41 +52,47 @@ |
'target_name': 'protocol_sources', |
'type': 'none', |
'dependencies': ['protocol_version'], |
- 'variables': { |
- 'conditions': [ |
- ['debug_devtools=="node"', { |
- # Node build |
- 'jinja_module_files': [ |
- '../../../jinja2/jinja2/__init__.py', |
- '../../../markupsafe/markupsafe/__init__.py', # jinja2 dep |
- ], |
- }, { |
- 'jinja_module_files': [ |
- '<(DEPTH)/third_party/jinja2/__init__.py', |
- '<(DEPTH)/third_party/markupsafe/__init__.py', # jinja2 dep |
- ], |
- } |
- ], |
- ], |
- }, |
'actions': [ |
{ |
'action_name': 'generateV8InspectorProtocolBackendSources', |
'inputs': [ |
- '<@(jinja_module_files)', |
- # The python script in action below. |
- '../inspector_protocol/CodeGenerator.py', |
+ '<(DEPTH)/third_party/jinja2/__init__.py', |
+ '<(DEPTH)/third_party/markupsafe/__init__.py', # jinja2 dep |
# Source code templates. |
- '../inspector_protocol/TypeBuilder_h.template', |
- '../inspector_protocol/TypeBuilder_cpp.template', |
+ '../inspector_protocol/Allocator_h.template', |
+ '../inspector_protocol/Array_h.template', |
+ '../inspector_protocol/BackendCallback_h.template', |
+ '../inspector_protocol/CodeGenerator.py', |
+ '../inspector_protocol/Collections_h.template', |
+ '../inspector_protocol/DispatcherBase_cpp.template', |
+ '../inspector_protocol/DispatcherBase_h.template', |
+ '../inspector_protocol/ErrorSupport_cpp.template', |
+ '../inspector_protocol/ErrorSupport_h.template', |
'../inspector_protocol/Exported_h.template', |
+ '../inspector_protocol/FrontendChannel_h.template', |
'../inspector_protocol/Imported_h.template', |
+ '../inspector_protocol/InspectorProtocol_cpp.template', |
+ '../inspector_protocol/Maybe_h.template', |
+ '../inspector_protocol/Object_cpp.template', |
+ '../inspector_protocol/Object_h.template', |
+ '../inspector_protocol/Parser_cpp.template', |
+ '../inspector_protocol/Parser_h.template', |
+ '../inspector_protocol/Platform_h.template', |
+ '../inspector_protocol/String16_cpp.template', |
+ '../inspector_protocol/String16_h.template', |
+ '../inspector_protocol/TypeBuilder_cpp.template', |
+ '../inspector_protocol/TypeBuilder_h.template', |
+ '../inspector_protocol/ValueConversions_h.template', |
+ '../inspector_protocol/Values_cpp.template', |
+ '../inspector_protocol/Values_h.template', |
# Protocol definitions |
'js_protocol.json', |
# Config |
'inspector_protocol_config.json', |
], |
'outputs': [ |
+ '<(blink_platform_output_dir)/inspector_protocol/InspectorProtocol.cpp', |
+ '<(blink_platform_output_dir)/inspector_protocol/InspectorProtocol.h', |
'<(blink_platform_output_dir)/v8_inspector/protocol/Console.cpp', |
'<(blink_platform_output_dir)/v8_inspector/protocol/Console.h', |
'<(blink_platform_output_dir)/v8_inspector/protocol/Debugger.cpp', |
@@ -136,15 +142,81 @@ |
] |
}, |
{ |
+ 'target_name': 'protocol_sources_stl', |
+ 'type': 'none', |
+ 'dependencies': ['protocol_version'], |
+ }, |
+ 'actions': [ |
+ { |
+ 'action_name': 'generateV8InspectorProtocolBackendSourcesSTL', |
+ 'inputs': [ |
+ '../../../jinja2/jinja2/__init__.py', |
+ '../../../markupsafe/markupsafe/__init__.py', # jinja2 dep |
+ # Source code templates. |
+ '../inspector_protocol/Allocator_h.template', |
+ '../inspector_protocol/Array_h.template', |
+ '../inspector_protocol/BackendCallback_h.template', |
+ '../inspector_protocol/CodeGenerator.py', |
+ '../inspector_protocol/Collections_h.template', |
+ '../inspector_protocol/DispatcherBase_cpp.template', |
+ '../inspector_protocol/DispatcherBase_h.template', |
+ '../inspector_protocol/ErrorSupport_cpp.template', |
+ '../inspector_protocol/ErrorSupport_h.template', |
+ '../inspector_protocol/Exported_h.template', |
+ '../inspector_protocol/FrontendChannel_h.template', |
+ '../inspector_protocol/Imported_h.template', |
+ '../inspector_protocol/InspectorProtocol_cpp.template', |
+ '../inspector_protocol/Maybe_h.template', |
+ '../inspector_protocol/Object_cpp.template', |
+ '../inspector_protocol/Object_h.template', |
+ '../inspector_protocol/Parser_cpp.template', |
+ '../inspector_protocol/Parser_h.template', |
+ '../inspector_protocol/Platform_h.template', |
+ '../inspector_protocol/String16_cpp.template', |
+ '../inspector_protocol/String16_h.template', |
+ '../inspector_protocol/TypeBuilder_cpp.template', |
+ '../inspector_protocol/TypeBuilder_h.template', |
+ '../inspector_protocol/ValueConversions_h.template', |
+ '../inspector_protocol/Values_cpp.template', |
+ '../inspector_protocol/Values_h.template', |
+ # Protocol definitions |
+ 'js_protocol.json', |
+ # Config |
+ 'inspector_protocol_config_stl.json', |
+ ], |
+ 'outputs': [ |
+ '<(blink_platform_output_dir)/inspector_protocol/InspectorProtocol.cpp', |
+ '<(blink_platform_output_dir)/inspector_protocol/InspectorProtocol.h', |
+ '<(blink_platform_output_dir)/v8_inspector/protocol/Console.cpp', |
+ '<(blink_platform_output_dir)/v8_inspector/protocol/Console.h', |
+ '<(blink_platform_output_dir)/v8_inspector/protocol/Debugger.cpp', |
+ '<(blink_platform_output_dir)/v8_inspector/protocol/Debugger.h', |
+ '<(blink_platform_output_dir)/v8_inspector/protocol/HeapProfiler.cpp', |
+ '<(blink_platform_output_dir)/v8_inspector/protocol/HeapProfiler.h', |
+ '<(blink_platform_output_dir)/v8_inspector/protocol/Profiler.cpp', |
+ '<(blink_platform_output_dir)/v8_inspector/protocol/Profiler.h', |
+ '<(blink_platform_output_dir)/v8_inspector/protocol/Runtime.cpp', |
+ '<(blink_platform_output_dir)/v8_inspector/protocol/Runtime.h', |
+ '<(blink_platform_output_dir)/v8_inspector/public/protocol/Runtime.h', |
+ '<(blink_platform_output_dir)/v8_inspector/public/protocol/Debugger.h', |
+ ], |
+ 'action': [ |
+ 'python', |
+ '../inspector_protocol/CodeGenerator.py', |
+ '--output_base', '<(blink_platform_output_dir)', |
+ '--config', 'v8_inspector/inspector_protocol_config.json', |
+ ], |
+ 'message': 'Generating protocol backend sources from json definitions.', |
+ }, |
+ ] |
+ }, |
+ { |
'target_name': 'v8_inspector_stl', |
'type': '<(component)', |
'dependencies': [ |
':inspector_injected_script', |
':inspector_debugger_script', |
- ':protocol_sources', |
- ], |
- 'defines': [ |
- 'V8_INSPECTOR_USE_STL=1' |
+ ':protocol_sources_stl', |
], |
'include_dirs': [ |
'../..', |
@@ -153,6 +225,8 @@ |
'<(SHARED_INTERMEDIATE_DIR)/blink', |
], |
'sources': [ |
+ '<(blink_platform_output_dir)/inspector_protocol/InspectorProtocol.cpp', |
+ '<(blink_platform_output_dir)/inspector_protocol/InspectorProtocol.h', |
'<(blink_platform_output_dir)/v8_inspector/protocol/Console.cpp', |
'<(blink_platform_output_dir)/v8_inspector/protocol/Console.h', |
'<(blink_platform_output_dir)/v8_inspector/protocol/Debugger.cpp', |
@@ -163,25 +237,8 @@ |
'<(blink_platform_output_dir)/v8_inspector/protocol/Profiler.h', |
'<(blink_platform_output_dir)/v8_inspector/protocol/Runtime.cpp', |
'<(blink_platform_output_dir)/v8_inspector/protocol/Runtime.h', |
- |
- '../inspector_protocol/Allocator.h', |
- '../inspector_protocol/Array.h', |
- '../inspector_protocol/Collections.h', |
- '../inspector_protocol/DispatcherBase.cpp', |
- '../inspector_protocol/DispatcherBase.h', |
- '../inspector_protocol/ErrorSupport.cpp', |
- '../inspector_protocol/ErrorSupport.h', |
- '../inspector_protocol/Maybe.h', |
- '../inspector_protocol/Parser.cpp', |
- '../inspector_protocol/Parser.h', |
- '../inspector_protocol/FrontendChannel.h', |
- '../inspector_protocol/String16.cpp', |
- '../inspector_protocol/String16.h', |
- '../inspector_protocol/String16STL.cpp', |
- '../inspector_protocol/String16STL.h', |
- '../inspector_protocol/Values.cpp', |
- '../inspector_protocol/Values.h', |
- '../inspector_protocol/ValueConversions.h', |
+ '<(blink_platform_output_dir)/v8_inspector/public/protocol/Runtime.h', |
+ '<(blink_platform_output_dir)/v8_inspector/public/protocol/Debugger.h', |
'Atomics.h', |
'InjectedScript.cpp', |
@@ -193,9 +250,12 @@ |
'JavaScriptCallFrame.cpp', |
'JavaScriptCallFrame.h', |
'MuteConsoleScope.h', |
- 'ScriptBreakpoint.h', |
+ 'PlatformSTL.h', |
'RemoteObjectId.cpp', |
'RemoteObjectId.h', |
+ 'ScriptBreakpoint.h', |
+ 'String16STL.cpp', |
+ 'String16STL.h', |
'V8Console.cpp', |
'V8Console.h', |
'V8ConsoleAgentImpl.cpp', |