deps,build: move gypfiles out 1/2 - required changes

* Add `<(V8_ROOT)` to file paths

PR-URL: https://github.com/nodejs/node/pull/26685
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Refael Ackermann <refack@gmail.com>
This commit is contained in:
Refael Ackermann
2019-03-24 22:34:29 -04:00
parent fff922afee
commit 3d8b844112
4 changed files with 1873 additions and 1877 deletions

View File

@@ -4,8 +4,8 @@
{
'variables': {
'inspector_protocol_path': '../third_party/inspector_protocol',
'inspector_path': '../src/inspector',
'inspector_protocol_path': '<(V8_ROOT)/third_party/inspector_protocol',
'inspector_path': '<(V8_ROOT)/src/inspector',
'inspector_generated_output_root': '<(SHARED_INTERMEDIATE_DIR)/inspector-generated-output-root',
'inspector_generated_sources': [
'<(inspector_generated_output_root)/src/inspector/protocol/Forward.h',
@@ -29,62 +29,62 @@
],
'inspector_all_sources': [
'../include/v8-inspector.h',
'../include/v8-inspector-protocol.h',
'../src/inspector/custom-preview.cc',
'../src/inspector/custom-preview.h',
'../src/inspector/injected-script.cc',
'../src/inspector/injected-script.h',
'../src/inspector/inspected-context.cc',
'../src/inspector/inspected-context.h',
'../src/inspector/remote-object-id.cc',
'../src/inspector/remote-object-id.h',
'../src/inspector/search-util.cc',
'../src/inspector/search-util.h',
'../src/inspector/string-16.cc',
'../src/inspector/string-16.h',
'../src/inspector/string-util.cc',
'../src/inspector/string-util.h',
'../src/inspector/test-interface.cc',
'../src/inspector/test-interface.h',
'../src/inspector/v8-console.cc',
'../src/inspector/v8-console.h',
'../src/inspector/v8-console-agent-impl.cc',
'../src/inspector/v8-console-agent-impl.h',
'../src/inspector/v8-console-message.cc',
'../src/inspector/v8-console-message.h',
'../src/inspector/v8-debugger.cc',
'../src/inspector/v8-debugger.h',
'../src/inspector/v8-debugger-agent-impl.cc',
'../src/inspector/v8-debugger-agent-impl.h',
'../src/inspector/v8-debugger-script.cc',
'../src/inspector/v8-debugger-script.h',
'../src/inspector/v8-heap-profiler-agent-impl.cc',
'../src/inspector/v8-heap-profiler-agent-impl.h',
'../src/inspector/v8-inspector-impl.cc',
'../src/inspector/v8-inspector-impl.h',
'../src/inspector/v8-inspector-session-impl.cc',
'../src/inspector/v8-inspector-session-impl.h',
'../src/inspector/v8-profiler-agent-impl.cc',
'../src/inspector/v8-profiler-agent-impl.h',
'../src/inspector/v8-regex.cc',
'../src/inspector/v8-regex.h',
'../src/inspector/v8-runtime-agent-impl.cc',
'../src/inspector/v8-runtime-agent-impl.h',
'../src/inspector/v8-schema-agent-impl.cc',
'../src/inspector/v8-schema-agent-impl.h',
'../src/inspector/v8-stack-trace-impl.cc',
'../src/inspector/v8-stack-trace-impl.h',
'../src/inspector/v8-value-utils.cc',
'../src/inspector/v8-value-utils.h',
'../src/inspector/value-mirror.cc',
'../src/inspector/value-mirror.h',
'../src/inspector/wasm-translation.cc',
'../src/inspector/wasm-translation.h',
'<(V8_ROOT)/include/v8-inspector.h',
'<(V8_ROOT)/include/v8-inspector-protocol.h',
'<(V8_ROOT)/src/inspector/custom-preview.cc',
'<(V8_ROOT)/src/inspector/custom-preview.h',
'<(V8_ROOT)/src/inspector/injected-script.cc',
'<(V8_ROOT)/src/inspector/injected-script.h',
'<(V8_ROOT)/src/inspector/inspected-context.cc',
'<(V8_ROOT)/src/inspector/inspected-context.h',
'<(V8_ROOT)/src/inspector/remote-object-id.cc',
'<(V8_ROOT)/src/inspector/remote-object-id.h',
'<(V8_ROOT)/src/inspector/search-util.cc',
'<(V8_ROOT)/src/inspector/search-util.h',
'<(V8_ROOT)/src/inspector/string-16.cc',
'<(V8_ROOT)/src/inspector/string-16.h',
'<(V8_ROOT)/src/inspector/string-util.cc',
'<(V8_ROOT)/src/inspector/string-util.h',
'<(V8_ROOT)/src/inspector/test-interface.cc',
'<(V8_ROOT)/src/inspector/test-interface.h',
'<(V8_ROOT)/src/inspector/v8-console.cc',
'<(V8_ROOT)/src/inspector/v8-console.h',
'<(V8_ROOT)/src/inspector/v8-console-agent-impl.cc',
'<(V8_ROOT)/src/inspector/v8-console-agent-impl.h',
'<(V8_ROOT)/src/inspector/v8-console-message.cc',
'<(V8_ROOT)/src/inspector/v8-console-message.h',
'<(V8_ROOT)/src/inspector/v8-debugger.cc',
'<(V8_ROOT)/src/inspector/v8-debugger.h',
'<(V8_ROOT)/src/inspector/v8-debugger-agent-impl.cc',
'<(V8_ROOT)/src/inspector/v8-debugger-agent-impl.h',
'<(V8_ROOT)/src/inspector/v8-debugger-script.cc',
'<(V8_ROOT)/src/inspector/v8-debugger-script.h',
'<(V8_ROOT)/src/inspector/v8-heap-profiler-agent-impl.cc',
'<(V8_ROOT)/src/inspector/v8-heap-profiler-agent-impl.h',
'<(V8_ROOT)/src/inspector/v8-inspector-impl.cc',
'<(V8_ROOT)/src/inspector/v8-inspector-impl.h',
'<(V8_ROOT)/src/inspector/v8-inspector-session-impl.cc',
'<(V8_ROOT)/src/inspector/v8-inspector-session-impl.h',
'<(V8_ROOT)/src/inspector/v8-profiler-agent-impl.cc',
'<(V8_ROOT)/src/inspector/v8-profiler-agent-impl.h',
'<(V8_ROOT)/src/inspector/v8-regex.cc',
'<(V8_ROOT)/src/inspector/v8-regex.h',
'<(V8_ROOT)/src/inspector/v8-runtime-agent-impl.cc',
'<(V8_ROOT)/src/inspector/v8-runtime-agent-impl.h',
'<(V8_ROOT)/src/inspector/v8-schema-agent-impl.cc',
'<(V8_ROOT)/src/inspector/v8-schema-agent-impl.h',
'<(V8_ROOT)/src/inspector/v8-stack-trace-impl.cc',
'<(V8_ROOT)/src/inspector/v8-stack-trace-impl.h',
'<(V8_ROOT)/src/inspector/v8-value-utils.cc',
'<(V8_ROOT)/src/inspector/v8-value-utils.h',
'<(V8_ROOT)/src/inspector/value-mirror.cc',
'<(V8_ROOT)/src/inspector/value-mirror.h',
'<(V8_ROOT)/src/inspector/wasm-translation.cc',
'<(V8_ROOT)/src/inspector/wasm-translation.h',
]
},
'includes': [
'../third_party/inspector_protocol/inspector_protocol.gypi',
'<(V8_ROOT)/third_party/inspector_protocol/inspector_protocol.gypi',
],
'include_dirs': [
'<(inspector_generated_output_root)',
@@ -120,7 +120,7 @@
'action': [
'python',
'<(inspector_protocol_path)/code_generator.py',
'--jinja_dir', '../third_party',
'--jinja_dir', '<(V8_ROOT)/third_party',
'--output_base', '<(inspector_generated_output_root)/src/inspector',
'--config', '<(inspector_path)/inspector_protocol_config.json',
],

View File

@@ -41,7 +41,7 @@
'has_valgrind%': 0,
'coverage%': 0,
'v8_target_arch%': '<(target_arch)',
'v8_host_byteorder%': '<!(python -c "import sys; print sys.byteorder")',
'v8_host_byteorder%': '<!(python -c "import sys; print(sys.byteorder)")',
'force_dynamic_crt%': 0,
# Setting 'v8_can_use_vfp32dregs' to 'true' will cause V8 to use the VFP
@@ -162,8 +162,8 @@
],
'target_defaults': {
'include_dirs': [
'..',
'../include',
'<(V8_ROOT)',
'<(V8_ROOT)/include',
],
'conditions': [
['v8_target_arch=="arm"', {

3614
deps/v8/gypfiles/v8.gyp vendored

File diff suppressed because it is too large Load Diff

View File

@@ -35,15 +35,11 @@
'dependencies': [
'v8_base',
],
'include_dirs': [
'..',
'<(DEPTH)',
],
'sources': [
'../src/setup-isolate-deserialize.cc',
'../src/snapshot/embedded-empty.cc',
'../src/snapshot/natives-external.cc',
'../src/snapshot/snapshot-external.cc',
'<(V8_ROOT)/src/setup-isolate-deserialize.cc',
'<(V8_ROOT)/src/snapshot/embedded-empty.cc',
'<(V8_ROOT)/src/snapshot/natives-external.cc',
'<(V8_ROOT)/src/snapshot/snapshot-external.cc',
'<(embedded_builtins_snapshot_src)',
],
'actions': [
@@ -148,13 +144,13 @@
{
'action_name': 'js2c_extras_bin',
'inputs': [
'../tools/js2c.py',
'<(V8_ROOT)/tools/js2c.py',
'<@(v8_extra_library_files)',
],
'outputs': ['<(SHARED_INTERMEDIATE_DIR)/libraries-extras.bin'],
'action': [
'python',
'../tools/js2c.py',
'<(V8_ROOT)/tools/js2c.py',
'<(SHARED_INTERMEDIATE_DIR)/extras-libraries.cc',
'EXTRAS',
'<@(v8_extra_library_files)',
@@ -165,7 +161,7 @@
{
'action_name': 'concatenate_natives_blob',
'inputs': [
'../tools/concatenate-files.py',
'<(V8_ROOT)/tools/concatenate-files.py',
'<(SHARED_INTERMEDIATE_DIR)/libraries-extras.bin',
],
'conditions': [