Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update inspector in v6.x #8832

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ test: all
$(MAKE) build-addons
$(MAKE) cctest
$(PYTHON) tools/test.py --mode=release -J \
addons doctool known_issues message pseudo-tty parallel sequential
addons doctool inspector known_issues message pseudo-tty parallel sequential
$(MAKE) lint

test-parallel: all
Expand Down Expand Up @@ -193,7 +193,7 @@ test-all-valgrind: test-build
$(PYTHON) tools/test.py --mode=debug,release --valgrind

CI_NATIVE_SUITES := addons
CI_JS_SUITES := doctool known_issues message parallel pseudo-tty sequential
CI_JS_SUITES := doctool inspector known_issues message parallel pseudo-tty sequential

# Build and test addons without building anything else
test-ci-native: | test/addons/.buildstamp
Expand Down Expand Up @@ -233,6 +233,9 @@ test-internet: all
test-debugger: all
$(PYTHON) tools/test.py debugger

test-inspector: all
$(PYTHON) tools/test.py inspector

test-known-issues: all
$(PYTHON) tools/test.py known_issues

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,6 @@
'InspectedContext.h',
'JavaScriptCallFrame.cpp',
'JavaScriptCallFrame.h',
'MuteConsoleScope.h',
'PlatformSTL.h',
'RemoteObjectId.cpp',
'RemoteObjectId.h',
Expand Down Expand Up @@ -307,11 +306,9 @@
'V8StringUtil.h',
'V8ValueCopier.cpp',
'V8ValueCopier.h',
'public/V8EventListenerInfo.h',
'public/V8ContextInfo.h',
'public/V8Inspector.h',
'public/V8InspectorClient.h',
'public/V8HeapProfilerAgent.h',
'public/V8InspectorSession.h',
'public/V8StackTrace.h',

Expand Down
4 changes: 4 additions & 0 deletions deps/zlib/zlib.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
{
'target_name': 'zlib',
'type': 'static_library',
'defines': [ 'ZLIB_CONST' ],
'sources': [
'adler32.c',
'compress.c',
Expand Down Expand Up @@ -44,6 +45,7 @@
'.',
],
'direct_dependent_settings': {
'defines': [ 'ZLIB_CONST' ],
'include_dirs': [
'.',
],
Expand Down Expand Up @@ -72,10 +74,12 @@
'direct_dependent_settings': {
'defines': [
'USE_SYSTEM_ZLIB',
'ZLIB_CONST',
],
},
'defines': [
'USE_SYSTEM_ZLIB',
'ZLIB_CONST',
],
'link_settings': {
'libraries': [
Expand Down
29 changes: 29 additions & 0 deletions node.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -322,6 +322,7 @@
'dependencies': [
'deps/v8_inspector/third_party/v8_inspector/platform/'
'v8_inspector/v8_inspector.gyp:v8_inspector_stl',
'v8_inspector_compress_protocol_json#host',
],
'include_dirs': [
'deps/v8_inspector/third_party/v8_inspector',
Expand Down Expand Up @@ -650,6 +651,34 @@
} ]
]
},
{
'target_name': 'v8_inspector_compress_protocol_json',
'type': 'none',
'toolsets': ['host'],
'conditions': [
[ 'v8_inspector=="true"', {
'actions': [
{
'action_name': 'v8_inspector_compress_protocol_json',
'process_outputs_as_sources': 1,
'inputs': [
'deps/v8_inspector/third_party/'
'v8_inspector/platform/v8_inspector/js_protocol.json',
],
'outputs': [
'<(SHARED_INTERMEDIATE_DIR)/v8_inspector_protocol_json.h',
],
'action': [
'python',
'tools/compress_json.py',
'<@(_inputs)',
'<@(_outputs)',
],
},
],
}],
],
},
{
'target_name': 'node_js2c',
'type': 'none',
Expand Down
Loading