From 4507246adc44eb7f3a71977cbd02a31037e914c7 Mon Sep 17 00:00:00 2001 From: Refael Ackermann Date: Fri, 22 Mar 2019 09:41:31 -0400 Subject: [PATCH] deps,build: refactor v8 gypfiles MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * make `generate_snapshot` into a target with no debug symbols on XCode * cleanup PR-URL: https://github.com/nodejs/node/pull/26685 Reviewed-By: Anna Henningsen Reviewed-By: Michaël Zasso Reviewed-By: Refael Ackermann --- deps/v8/gypfiles/extras-libraries.cc | 44 +++ deps/v8/gypfiles/inspector.gypi | 125 ++++---- deps/v8/gypfiles/toolchain.gypi | 6 + deps/v8/gypfiles/v8.gyp | 421 +++++++++++---------------- 4 files changed, 277 insertions(+), 319 deletions(-) create mode 100644 deps/v8/gypfiles/extras-libraries.cc diff --git a/deps/v8/gypfiles/extras-libraries.cc b/deps/v8/gypfiles/extras-libraries.cc new file mode 100644 index 00000000000000..b23aa403b90a97 --- /dev/null +++ b/deps/v8/gypfiles/extras-libraries.cc @@ -0,0 +1,44 @@ +// Copyright 2011 Google Inc. All Rights Reserved. + +// This file was generated from .js source files by GYP. If you +// want to make changes to this file you should either change the +// javascript source files or the GYP script. + +#include "src/v8.h" +#include "src/snapshot/natives.h" +#include "src/utils.h" + +namespace v8 { +namespace internal { + + static const char sources[] = { 40, 102, 117, 110, 99, 116, 105, 111, 110, 40, 41, 32, 123, 125, 41 }; + + template <> + int NativesCollection::GetBuiltinsCount() { + return 1; + } + + template <> + int NativesCollection::GetIndex(const char* name) { + if (strcmp(name, "dummy") == 0) return 0; + return -1; + } + + template <> + Vector NativesCollection::GetScriptSource(int index) { + if (index == 0) return Vector(sources + 0, 15); + return Vector("", 0); + } + + template <> + Vector NativesCollection::GetScriptName(int index) { + if (index == 0) return Vector("native dummy.js", 15); + return Vector("", 0); + } + + template <> + Vector NativesCollection::GetScriptsSource() { + return Vector(sources, 15); + } +} // internal +} // v8 diff --git a/deps/v8/gypfiles/inspector.gypi b/deps/v8/gypfiles/inspector.gypi index cd90b14c2ede33..3a1a9e3cacaa6d 100644 --- a/deps/v8/gypfiles/inspector.gypi +++ b/deps/v8/gypfiles/inspector.gypi @@ -4,28 +4,28 @@ { 'variables': { - 'protocol_path': '../third_party/inspector_protocol', + 'inspector_protocol_path': '../third_party/inspector_protocol', 'inspector_path': '../src/inspector', - + 'inspector_generated_output_root': '<(SHARED_INTERMEDIATE_DIR)/inspector-generated-output-root', 'inspector_generated_sources': [ - '<(SHARED_INTERMEDIATE_DIR)/src/inspector/protocol/Forward.h', - '<(SHARED_INTERMEDIATE_DIR)/src/inspector/protocol/Protocol.cpp', - '<(SHARED_INTERMEDIATE_DIR)/src/inspector/protocol/Protocol.h', - '<(SHARED_INTERMEDIATE_DIR)/src/inspector/protocol/Console.cpp', - '<(SHARED_INTERMEDIATE_DIR)/src/inspector/protocol/Console.h', - '<(SHARED_INTERMEDIATE_DIR)/src/inspector/protocol/Debugger.cpp', - '<(SHARED_INTERMEDIATE_DIR)/src/inspector/protocol/Debugger.h', - '<(SHARED_INTERMEDIATE_DIR)/src/inspector/protocol/HeapProfiler.cpp', - '<(SHARED_INTERMEDIATE_DIR)/src/inspector/protocol/HeapProfiler.h', - '<(SHARED_INTERMEDIATE_DIR)/src/inspector/protocol/Profiler.cpp', - '<(SHARED_INTERMEDIATE_DIR)/src/inspector/protocol/Profiler.h', - '<(SHARED_INTERMEDIATE_DIR)/src/inspector/protocol/Runtime.cpp', - '<(SHARED_INTERMEDIATE_DIR)/src/inspector/protocol/Runtime.h', - '<(SHARED_INTERMEDIATE_DIR)/src/inspector/protocol/Schema.cpp', - '<(SHARED_INTERMEDIATE_DIR)/src/inspector/protocol/Schema.h', - '<(SHARED_INTERMEDIATE_DIR)/include/inspector/Debugger.h', - '<(SHARED_INTERMEDIATE_DIR)/include/inspector/Runtime.h', - '<(SHARED_INTERMEDIATE_DIR)/include/inspector/Schema.h', + '<(inspector_generated_output_root)/src/inspector/protocol/Forward.h', + '<(inspector_generated_output_root)/src/inspector/protocol/Protocol.cpp', + '<(inspector_generated_output_root)/src/inspector/protocol/Protocol.h', + '<(inspector_generated_output_root)/src/inspector/protocol/Console.cpp', + '<(inspector_generated_output_root)/src/inspector/protocol/Console.h', + '<(inspector_generated_output_root)/src/inspector/protocol/Debugger.cpp', + '<(inspector_generated_output_root)/src/inspector/protocol/Debugger.h', + '<(inspector_generated_output_root)/src/inspector/protocol/HeapProfiler.cpp', + '<(inspector_generated_output_root)/src/inspector/protocol/HeapProfiler.h', + '<(inspector_generated_output_root)/src/inspector/protocol/Profiler.cpp', + '<(inspector_generated_output_root)/src/inspector/protocol/Profiler.h', + '<(inspector_generated_output_root)/src/inspector/protocol/Runtime.cpp', + '<(inspector_generated_output_root)/src/inspector/protocol/Runtime.h', + '<(inspector_generated_output_root)/src/inspector/protocol/Schema.cpp', + '<(inspector_generated_output_root)/src/inspector/protocol/Schema.h', + '<(inspector_generated_output_root)/include/inspector/Debugger.h', + '<(inspector_generated_output_root)/include/inspector/Runtime.h', + '<(inspector_generated_output_root)/include/inspector/Schema.h', ], 'inspector_all_sources': [ @@ -83,45 +83,48 @@ '../src/inspector/wasm-translation.h', ] }, - 'includes': [ - '../third_party/inspector_protocol/inspector_protocol.gypi', - ], - 'actions': [ - { - 'action_name': 'protocol_compatibility', - 'inputs': [ - '<(inspector_path)/js_protocol.pdl', - ], - 'outputs': [ - '<@(SHARED_INTERMEDIATE_DIR)/src/js_protocol.stamp', - ], - 'action': [ - 'python', - '<(protocol_path)/check_protocol_compatibility.py', - '--stamp', '<@(_outputs)', - '<@(_inputs)', - ], - 'message': 'Checking inspector protocol compatibility', - }, - { - 'action_name': 'protocol_generated_sources', - 'inputs': [ - '<(inspector_path)/js_protocol.pdl', - '<(inspector_path)/inspector_protocol_config.json', - '<@(inspector_protocol_files)', - ], - 'outputs': [ - '<@(inspector_generated_sources)', - ], - 'process_outputs_as_sources': 1, - 'action': [ - 'python', - '<(protocol_path)/code_generator.py', - '--jinja_dir', '../third_party', - '--output_base', '<(SHARED_INTERMEDIATE_DIR)/src/inspector', - '--config', '<(inspector_path)/inspector_protocol_config.json', - ], - 'message': 'Generating inspector protocol sources from protocol json', - }, - ], + 'includes': [ + '../third_party/inspector_protocol/inspector_protocol.gypi', + ], + 'include_dirs': [ + '<(inspector_generated_output_root)', + ], + 'actions': [ + { + 'action_name': 'protocol_compatibility', + 'inputs': [ + '<(inspector_path)/js_protocol.pdl', + ], + 'outputs': [ + '<@(inspector_generated_output_root)/src/js_protocol.stamp', + ], + 'action': [ + 'python', + '<(inspector_protocol_path)/check_protocol_compatibility.py', + '--stamp', '<@(_outputs)', + '<@(_inputs)', + ], + 'message': 'Checking inspector protocol compatibility', + }, + { + 'action_name': 'protocol_generated_sources', + 'inputs': [ + '<(inspector_path)/js_protocol.pdl', + '<(inspector_path)/inspector_protocol_config.json', + '<@(inspector_protocol_files)', + ], + 'outputs': [ + '<@(inspector_generated_sources)', + ], + 'process_outputs_as_sources': 1, + 'action': [ + 'python', + '<(inspector_protocol_path)/code_generator.py', + '--jinja_dir', '../third_party', + '--output_base', '<(inspector_generated_output_root)/src/inspector', + '--config', '<(inspector_path)/inspector_protocol_config.json', + ], + 'message': 'Generating inspector protocol sources from protocol json', + }, + ], } diff --git a/deps/v8/gypfiles/toolchain.gypi b/deps/v8/gypfiles/toolchain.gypi index eaac19592a87de..1814f5441579da 100644 --- a/deps/v8/gypfiles/toolchain.gypi +++ b/deps/v8/gypfiles/toolchain.gypi @@ -161,6 +161,10 @@ }], ], 'target_defaults': { + 'include_dirs': [ + '..', + '../include', + ], 'conditions': [ ['v8_target_arch=="arm"', { 'defines': [ @@ -1399,6 +1403,8 @@ 4245, # Conversion with signed/unsigned mismatch. 4267, # Conversion with possible loss of data. 4324, # Padding structure due to alignment. + 4351, + 4355, 4701, # Potentially uninitialized local variable. 4702, # Unreachable code. 4703, # Potentially uninitialized local pointer variable. diff --git a/deps/v8/gypfiles/v8.gyp b/deps/v8/gypfiles/v8.gyp index 6ab063c51a1afb..ba3ba8ddaed44f 100644 --- a/deps/v8/gypfiles/v8.gyp +++ b/deps/v8/gypfiles/v8.gyp @@ -1,18 +1,16 @@ # Copyright 2012 the V8 project authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. - { 'variables': { 'v8_code': 1, 'v8_random_seed%': 314159265, 'v8_vector_stores%': 0, 'v8_embed_script%': "", - # Placeholder. For upstream V8, this includes test files that Node.js does not need. - 'v8_extra_library_files%': [], 'mksnapshot_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mksnapshot<(EXECUTABLE_SUFFIX)', 'v8_os_page_size%': 0, - 'generate_bytecode_builtins_list_output' : '<(SHARED_INTERMEDIATE_DIR)/builtins-generated/bytecodes-builtins-list.h', + 'generate_bytecode_output_root': '<(SHARED_INTERMEDIATE_DIR)/generate-bytecode-output-root', + 'generate_bytecode_builtins_list_output' : '<(generate_bytecode_output_root)/builtins-generated/bytecodes-builtins-list.h', 'torque_files': [ "../src/builtins/base.tq", "../src/builtins/growable-fixed-array.tq", @@ -57,7 +55,6 @@ "arguments", "array", "array-copywithin", - "array-every", "array-filter", "array-find", "array-findindex", @@ -87,80 +84,82 @@ "typed-array-slice", "typed-array-subarray", ], - # Since there is no foreach in GYP we manualy unroll the following: + 'torque_output_root': '<(SHARED_INTERMEDIATE_DIR)/torque-output-root', + # Since there is no foreach in GYP we use `ForEachFormat` to unroll the following: # foreach(namespace, torque_namespaces) { # outputs += [ # "$target_gen_dir/torque-generated/builtins-$namespace-from-dsl-gen.cc", # "$target_gen_dir/torque-generated/builtins-$namespace-from-dsl-gen.h", # ] # } + 'torque_output_root': '<(SHARED_INTERMEDIATE_DIR)/torque-output-root', 'torque_outputs': [ - '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-arguments-from-dsl-gen.cc', - '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-arguments-from-dsl-gen.h', - '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-array-from-dsl-gen.cc', - '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-array-from-dsl-gen.h', - '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-array-copywithin-from-dsl-gen.cc', - '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-array-copywithin-from-dsl-gen.h', - '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-array-filter-from-dsl-gen.cc', - '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-array-filter-from-dsl-gen.h', - '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-array-find-from-dsl-gen.cc', - '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-array-find-from-dsl-gen.h', - '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-array-findindex-from-dsl-gen.cc', - '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-array-findindex-from-dsl-gen.h', - '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-array-foreach-from-dsl-gen.cc', - '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-array-foreach-from-dsl-gen.h', - '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-array-join-from-dsl-gen.cc', - '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-array-join-from-dsl-gen.h', - '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-array-map-from-dsl-gen.cc', - '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-array-map-from-dsl-gen.h', - '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-array-of-from-dsl-gen.cc', - '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-array-of-from-dsl-gen.h', - '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-array-reverse-from-dsl-gen.cc', - '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-array-reverse-from-dsl-gen.h', - '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-array-slice-from-dsl-gen.cc', - '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-array-slice-from-dsl-gen.h', - '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-array-splice-from-dsl-gen.cc', - '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-array-splice-from-dsl-gen.h', - '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-array-unshift-from-dsl-gen.cc', - '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-array-unshift-from-dsl-gen.h', - '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-array-lastindexof-from-dsl-gen.cc', - '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-array-lastindexof-from-dsl-gen.h', - '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-base-from-dsl-gen.cc', - '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-base-from-dsl-gen.h', - '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-collections-from-dsl-gen.cc', - '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-collections-from-dsl-gen.h', - '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-data-view-from-dsl-gen.cc', - '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-data-view-from-dsl-gen.h', - '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-extras-utils-from-dsl-gen.cc', - '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-extras-utils-from-dsl-gen.h', - '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-growable-fixed-array-from-dsl-gen.cc', - '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-growable-fixed-array-from-dsl-gen.h', - '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-iterator-from-dsl-gen.cc', - '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-iterator-from-dsl-gen.h', - '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-object-from-dsl-gen.cc', - '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-object-from-dsl-gen.h', - '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-string-from-dsl-gen.cc', - '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-string-from-dsl-gen.h', - '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-typed-array-from-dsl-gen.cc', - '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-typed-array-from-dsl-gen.h', - '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-typed-array-createtypedarray-from-dsl-gen.cc', - '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-typed-array-createtypedarray-from-dsl-gen.h', - '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-typed-array-filter-from-dsl-gen.cc', - '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-typed-array-filter-from-dsl-gen.h', - '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-typed-array-foreach-from-dsl-gen.cc', - '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-typed-array-foreach-from-dsl-gen.h', - '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-typed-array-reduce-from-dsl-gen.cc', - '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-typed-array-reduce-from-dsl-gen.h', - '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-typed-array-reduceright-from-dsl-gen.cc', - '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-typed-array-reduceright-from-dsl-gen.h', - '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-typed-array-slice-from-dsl-gen.cc', - '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-typed-array-slice-from-dsl-gen.h', - '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-typed-array-subarray-from-dsl-gen.cc', - '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtins-typed-array-subarray-from-dsl-gen.h', + '<(torque_output_root)/torque-generated/builtins-arguments-from-dsl-gen.cc', + '<(torque_output_root)/torque-generated/builtins-arguments-from-dsl-gen.h', + '<(torque_output_root)/torque-generated/builtins-array-from-dsl-gen.cc', + '<(torque_output_root)/torque-generated/builtins-array-from-dsl-gen.h', + '<(torque_output_root)/torque-generated/builtins-array-copywithin-from-dsl-gen.cc', + '<(torque_output_root)/torque-generated/builtins-array-copywithin-from-dsl-gen.h', + '<(torque_output_root)/torque-generated/builtins-array-filter-from-dsl-gen.cc', + '<(torque_output_root)/torque-generated/builtins-array-filter-from-dsl-gen.h', + '<(torque_output_root)/torque-generated/builtins-array-find-from-dsl-gen.cc', + '<(torque_output_root)/torque-generated/builtins-array-find-from-dsl-gen.h', + '<(torque_output_root)/torque-generated/builtins-array-findindex-from-dsl-gen.cc', + '<(torque_output_root)/torque-generated/builtins-array-findindex-from-dsl-gen.h', + '<(torque_output_root)/torque-generated/builtins-array-foreach-from-dsl-gen.cc', + '<(torque_output_root)/torque-generated/builtins-array-foreach-from-dsl-gen.h', + '<(torque_output_root)/torque-generated/builtins-array-join-from-dsl-gen.cc', + '<(torque_output_root)/torque-generated/builtins-array-join-from-dsl-gen.h', + '<(torque_output_root)/torque-generated/builtins-array-map-from-dsl-gen.cc', + '<(torque_output_root)/torque-generated/builtins-array-map-from-dsl-gen.h', + '<(torque_output_root)/torque-generated/builtins-array-of-from-dsl-gen.cc', + '<(torque_output_root)/torque-generated/builtins-array-of-from-dsl-gen.h', + '<(torque_output_root)/torque-generated/builtins-array-reverse-from-dsl-gen.cc', + '<(torque_output_root)/torque-generated/builtins-array-reverse-from-dsl-gen.h', + '<(torque_output_root)/torque-generated/builtins-array-slice-from-dsl-gen.cc', + '<(torque_output_root)/torque-generated/builtins-array-slice-from-dsl-gen.h', + '<(torque_output_root)/torque-generated/builtins-array-splice-from-dsl-gen.cc', + '<(torque_output_root)/torque-generated/builtins-array-splice-from-dsl-gen.h', + '<(torque_output_root)/torque-generated/builtins-array-unshift-from-dsl-gen.cc', + '<(torque_output_root)/torque-generated/builtins-array-unshift-from-dsl-gen.h', + '<(torque_output_root)/torque-generated/builtins-array-lastindexof-from-dsl-gen.cc', + '<(torque_output_root)/torque-generated/builtins-array-lastindexof-from-dsl-gen.h', + '<(torque_output_root)/torque-generated/builtins-base-from-dsl-gen.cc', + '<(torque_output_root)/torque-generated/builtins-base-from-dsl-gen.h', + '<(torque_output_root)/torque-generated/builtins-collections-from-dsl-gen.cc', + '<(torque_output_root)/torque-generated/builtins-collections-from-dsl-gen.h', + '<(torque_output_root)/torque-generated/builtins-data-view-from-dsl-gen.cc', + '<(torque_output_root)/torque-generated/builtins-data-view-from-dsl-gen.h', + '<(torque_output_root)/torque-generated/builtins-extras-utils-from-dsl-gen.cc', + '<(torque_output_root)/torque-generated/builtins-extras-utils-from-dsl-gen.h', + '<(torque_output_root)/torque-generated/builtins-growable-fixed-array-from-dsl-gen.cc', + '<(torque_output_root)/torque-generated/builtins-growable-fixed-array-from-dsl-gen.h', + '<(torque_output_root)/torque-generated/builtins-iterator-from-dsl-gen.cc', + '<(torque_output_root)/torque-generated/builtins-iterator-from-dsl-gen.h', + '<(torque_output_root)/torque-generated/builtins-object-from-dsl-gen.cc', + '<(torque_output_root)/torque-generated/builtins-object-from-dsl-gen.h', + '<(torque_output_root)/torque-generated/builtins-string-from-dsl-gen.cc', + '<(torque_output_root)/torque-generated/builtins-string-from-dsl-gen.h', + '<(torque_output_root)/torque-generated/builtins-typed-array-from-dsl-gen.cc', + '<(torque_output_root)/torque-generated/builtins-typed-array-from-dsl-gen.h', + '<(torque_output_root)/torque-generated/builtins-typed-array-createtypedarray-from-dsl-gen.cc', + '<(torque_output_root)/torque-generated/builtins-typed-array-createtypedarray-from-dsl-gen.h', + '<(torque_output_root)/torque-generated/builtins-typed-array-filter-from-dsl-gen.cc', + '<(torque_output_root)/torque-generated/builtins-typed-array-filter-from-dsl-gen.h', + '<(torque_output_root)/torque-generated/builtins-typed-array-foreach-from-dsl-gen.cc', + '<(torque_output_root)/torque-generated/builtins-typed-array-foreach-from-dsl-gen.h', + '<(torque_output_root)/torque-generated/builtins-typed-array-reduce-from-dsl-gen.cc', + '<(torque_output_root)/torque-generated/builtins-typed-array-reduce-from-dsl-gen.h', + '<(torque_output_root)/torque-generated/builtins-typed-array-reduceright-from-dsl-gen.cc', + '<(torque_output_root)/torque-generated/builtins-typed-array-reduceright-from-dsl-gen.h', + '<(torque_output_root)/torque-generated/builtins-typed-array-slice-from-dsl-gen.cc', + '<(torque_output_root)/torque-generated/builtins-typed-array-slice-from-dsl-gen.h', + '<(torque_output_root)/torque-generated/builtins-typed-array-subarray-from-dsl-gen.cc', + '<(torque_output_root)/torque-generated/builtins-typed-array-subarray-from-dsl-gen.h', ], 'torque_generated_pure_headers': [ - '<(SHARED_INTERMEDIATE_DIR)/torque-generated/builtin-definitions-from-dsl.h', - '<(SHARED_INTERMEDIATE_DIR)/torque-generated/class-definitions-from-dsl.h', + '<(torque_output_root)/torque-generated/builtin-definitions-from-dsl.h', + '<(torque_output_root)/torque-generated/class-definitions-from-dsl.h', ], }, 'includes': ['toolchain.gypi', 'features.gypi', 'v8_external_snapshot.gypi'], @@ -168,12 +167,8 @@ { 'target_name': 'v8', 'dependencies': [ 'v8_maybe_snapshot' ], + 'toolsets': ['target'], 'conditions': [ - ['want_separate_host_toolset==1', { - 'toolsets': ['host', 'target'], - }, { - 'toolsets': ['target'], - }], ['component=="shared_library"', { 'type': '<(component)', 'sources': [ @@ -181,9 +176,6 @@ # has some sources to link into the component. '../src/v8dll-main.cc', ], - 'include_dirs': [ - '..', - ], 'defines': [ 'BUILDING_V8_SHARED', ], @@ -208,7 +200,9 @@ }], ], 'direct_dependent_settings': { - 'include_dirs': [ '../include/', ], + 'include_dirs': [ + '../include', + ], }, 'actions': [ { @@ -270,6 +264,7 @@ # The intention is to make the 'calling' rules a bit simpler. 'target_name': 'v8_maybe_snapshot', 'type': 'none', + 'toolsets': ['target'], 'conditions': [ ['v8_use_snapshot!=1', { # The dependency on v8_base should come from a transitive @@ -289,11 +284,6 @@ ['v8_use_snapshot==1 and v8_use_external_startup_data==1 and want_separate_host_toolset==1', { 'dependencies': ['v8_base', 'v8_external_snapshot'], }], - ['want_separate_host_toolset==1', { - 'toolsets': ['host', 'target'], - }, { - 'toolsets': ['target'], - }], ] }, # v8_maybe_snapshot { @@ -304,15 +294,6 @@ # We need this transitive dependency, since it also does codegen. 'v8_base', ], - 'variables': { - 'optimize': 'max', - }, - 'include_dirs': [ - '..', - '../include/', - # This is for `gen/builtins-generated` - '<(SHARED_INTERMEDIATE_DIR)', - ], 'sources': [ '../src/setup-isolate-full.cc', '<(generate_bytecode_builtins_list_output)', @@ -338,13 +319,6 @@ 'dependencies': [ 'v8_base', ], - 'variables': { - 'optimize': 'max', - }, - 'include_dirs': [ - '..', - '../include/', - ], 'sources': [ '../src/builtins/builtins-arguments-gen.cc', '../src/builtins/builtins-arguments-gen.h', @@ -498,33 +472,24 @@ { 'target_name': 'v8_snapshot', 'type': 'static_library', + 'toolsets': ['target'], + 'dependencies': [ + 'v8_base', + ], + 'sources': [ + '../src/setup-isolate-deserialize.cc', + './extras-libraries.cc', + ], 'conditions': [ ['want_separate_host_toolset==1', { - 'toolsets': ['host', 'target'], 'dependencies': [ - 'mksnapshot#host', - 'js2c_extras#host', # TODO(refack) get rid of this. - # This has effectively become a noop for Node.js, - # but the V8 code still tried to acess the code this generates. - # Refs: https://github.com/nodejs/node/blob/169b7f1f3b3751289f24678930e6a5731464ebc9/deps/v8/src/bootstrapper.cc#L5172-L5174 + 'generate_snapshot#target', ], }, { - 'toolsets': ['target'], 'dependencies': [ - 'mksnapshot', - 'js2c_extras', + 'generate_snapshot', ], }], - ['component=="shared_library"', { - 'defines': [ - 'BUILDING_V8_SHARED', - ], - 'direct_dependent_settings': { - 'defines': [ - 'USING_V8_SHARED', - ], - }, - }], ['v8_enable_i18n_support==1', { 'dependencies': [ '<(icu_gyp_path):icui18n', @@ -533,104 +498,119 @@ }], ], - 'dependencies': [ - 'v8_base', - ], + }, # v8_snapshot + { + 'target_name': 'generate_snapshot', + 'type': 'static_library', + 'toolsets': ['target'], 'include_dirs': [ - '..', - '<(DEPTH)', + '<(generate_bytecode_output_root)', + '<(torque_output_root)', ], - 'sources': [ - '<(SHARED_INTERMEDIATE_DIR)/extras-libraries.cc', - '../src/setup-isolate-deserialize.cc', + 'xcode_settings': { + # V8 7.4 over macOS10.11 compatibility + # Refs: https://github.com/nodejs/node/pull/26685 + 'GCC_GENERATE_DEBUGGING_SYMBOLS': 'NO', + }, + 'conditions': [ + ['want_separate_host_toolset==1', { + 'dependencies': [ + 'mksnapshot#host', + ], + }, { + 'dependencies': [ + 'mksnapshot', + ], + }], + ['v8_enable_i18n_support==1', { + 'dependencies': [ + '<(icu_gyp_path):icui18n', + '<(icu_gyp_path):icuuc', + ], + }], ], 'actions': [ { 'action_name': 'run_mksnapshot', 'message': 'generating: >@(_outputs)', 'variables': { - 'mksnapshot_flags': [ '--turbo_instruction_scheduling', ], + 'mksnapshot_flags': ['--turbo_instruction_scheduling', ], }, + 'inputs': [ + '<(mksnapshot_exec)', + ], + 'process_outputs_as_sources': '1', 'conditions': [ ['v8_enable_embedded_builtins == 1', { # In this case we use `embedded_variant "Default"` # and `suffix = ''` for the template `embedded${suffix}.S`. 'outputs': [ '<(INTERMEDIATE_DIR)/embedded.S' ], 'variables': { - 'mksnapshot_flags': [ - '--embedded_src', '<(INTERMEDIATE_DIR)/embedded.S', + 'mksnapshot_flags': [ '--embedded_variant', 'Default', + '--embedded_src', '<(INTERMEDIATE_DIR)/embedded.S', ], }, }, { - 'outputs': [ '../src/snapshot/embedded-empty.cc' ] - }], + 'outputs': ['../src/snapshot/embedded-empty.cc'] + }], ['v8_random_seed != 0', { 'variables': { - 'mksnapshot_flags': [ '--random-seed', '<(v8_random_seed)' ], + 'mksnapshot_flags': ['--random-seed', '<(v8_random_seed)'], }, }], ['v8_os_page_size != 0', { 'variables': { - 'mksnapshot_flags': [ '--v8_os_page_size', '<(v8_os_page_size)' ], + 'mksnapshot_flags': ['--v8_os_page_size', '<(v8_os_page_size)'], }, }], - ['v8_use_external_startup_data !=0 ', { - 'outputs': [ '<(INTERMEDIATE_DIR)/snapshot_blob.bin', ], + ['v8_use_external_startup_data != 0', { + 'outputs': ['<(INTERMEDIATE_DIR)/snapshot_blob.bin', ], 'variables': { - 'mksnapshot_flags': [ '--startup_blob', '<(INTERMEDIATE_DIR)/snapshot_blob.bin', ], + 'mksnapshot_flags': ['--startup_blob', '<(INTERMEDIATE_DIR)/snapshot_blob.bin', ], }, }, { - 'outputs': [ "<(INTERMEDIATE_DIR)/snapshot.cc" ], + 'outputs': ["<(INTERMEDIATE_DIR)/snapshot.cc"], 'variables': { - 'mksnapshot_flags': [ '--startup_src', '<(INTERMEDIATE_DIR)/snapshot.cc', ], + 'mksnapshot_flags': ['--startup_src', '<(INTERMEDIATE_DIR)/snapshot.cc', ], }, - }], + }], ['v8_embed_script != ""', { - 'inputs': [ '<(v8_embed_script)' ], + 'inputs': ['<(v8_embed_script)'], 'variables': { - 'mksnapshot_flags': [ '<(v8_embed_script)' ], + 'mksnapshot_flags': ['<(v8_embed_script)'], }, }], ['v8_enable_snapshot_code_comments == 1', { 'variables': { - 'mksnapshot_flags': [ '--code-comments' ], + 'mksnapshot_flags': ['--code-comments'], }, }], ], - 'inputs': [ - '<(mksnapshot_exec)', - ], - 'process_outputs_as_sources': 1, 'action': [ '>@(_inputs)', '>@(mksnapshot_flags)', ], }, ], - }, # v8_snapshot + }, # generate_snapshot { 'target_name': 'v8_nosnapshot', 'type': 'static_library', 'dependencies': [ 'v8_base', ], - 'include_dirs': [ - '..', - '<(DEPTH)', - ], 'sources': [ - '<(SHARED_INTERMEDIATE_DIR)/extras-libraries.cc', + './extras-libraries.cc', '../src/snapshot/embedded-empty.cc', '../src/snapshot/snapshot-empty.cc', ], 'conditions': [ ['want_separate_host_toolset==1', { + # This is the top target that needs both targets for 'toolsets': ['host', 'target'], - 'dependencies': [ 'js2c_extras#host', ], }, { 'toolsets': ['target'], - 'dependencies': [ 'js2c_extras', ], }], ['component=="shared_library"', { 'defines': [ @@ -655,38 +635,35 @@ 'dependencies': [ 'v8_libbase', 'v8_libsampler', - # Code generators + # Code generators that only need to be build for the host. 'torque#host', 'generate_bytecode_builtins_list#host', ], - 'direct_dependent_settings': { - 'include_dirs': ['<(SHARED_INTERMEDIATE_DIR)'], - }, - 'objs': ['foo.o'], - 'variables': { - 'optimize': 'max', - }, 'include_dirs': [ - '..', - '<(DEPTH)', - '<(SHARED_INTERMEDIATE_DIR)' + '<(generate_bytecode_output_root)', + '<(torque_output_root)', ], + 'direct_dependent_settings': { + 'include_dirs': [ + '<(generate_bytecode_output_root)', + '<(torque_output_root)', + ], + }, 'sources': [ - '<@(inspector_all_sources)', - '../include//v8-inspector-protocol.h', - '../include//v8-inspector.h', - '../include//v8-internal.h', - '../include//v8-platform.h', - '../include//v8-profiler.h', - '../include//v8-testing.h', - '../include//v8-util.h', - '../include//v8-value-serializer-version.h', - '../include//v8-version-string.h', - '../include//v8-version.h', - '../include//v8-wasm-trap-handler-posix.h', - '../include//v8-wasm-trap-handler-win.h', - '../include//v8.h', - '../include//v8config.h', + '../include/v8-inspector-protocol.h', + '../include/v8-inspector.h', + '../include/v8-internal.h', + '../include/v8-platform.h', + '../include/v8-profiler.h', + '../include/v8-testing.h', + '../include/v8-util.h', + '../include/v8-value-serializer-version.h', + '../include/v8-version-string.h', + '../include/v8-version.h', + '../include/v8-wasm-trap-handler-posix.h', + '../include/v8-wasm-trap-handler-win.h', + '../include/v8.h', + '../include/v8config.h', '../src/accessors.cc', '../src/accessors.h', '../src/address-map.cc', @@ -1845,6 +1822,7 @@ '../src/zone/zone.h', '<(generate_bytecode_builtins_list_output)', '<@(torque_generated_pure_headers)', + '<@(inspector_all_sources)', ], 'conditions': [ ['want_separate_host_toolset==1', { @@ -2110,9 +2088,8 @@ ], }], ['OS=="win"', { - 'msvs_disabled_warnings': [4351, 4355, 4800], - 'msvs_precompiled_header': '../../../tools/msvs/pch/v8_pch.h', - 'msvs_precompiled_source': '../../../tools/msvs/pch/v8_pch.cc', + 'msvs_precompiled_header': '../../../tools/msvs/pch/v8_pch.h', + 'msvs_precompiled_source': '../../../tools/msvs/pch/v8_pch.cc', 'sources': [ '<(_msvs_precompiled_header)', '<(_msvs_precompiled_source)', @@ -2212,7 +2189,7 @@ ], 'action': [ '<@(_inputs)', - '-o', '<(SHARED_INTERMEDIATE_DIR)/torque-generated' + '-o', '<(torque_output_root)/torque-generated' ], }, ], @@ -2221,15 +2198,6 @@ 'target_name': 'v8_libbase', 'type': '<(component)', 'toolsets': ['host', 'target'], - 'variables': { - 'optimize': 'max', - }, - 'include_dirs': [ - '..', - ], - 'direct_dependent_settings': { - 'include_dirs': ['..'], - }, 'sources': [ '../src/base/adapters.h', '../src/base/address-region.h', @@ -2315,16 +2283,6 @@ }], ], 'conditions': [ - ['component=="shared_library"', { - 'defines': [ - 'BUILDING_V8_BASE_SHARED', - ], - 'direct_dependent_settings': { - 'defines': [ - 'USING_V8_BASE_SHARED', - ], - }, - }], ['OS=="linux"', { 'link_settings': { 'libraries': [ @@ -2419,7 +2377,6 @@ '../src/base/platform/platform-win32.cc', '../src/base/win32-headers.h', ], - 'msvs_disabled_warnings': [4351, 4355, 4800], 'link_settings': { 'libraries': [ '-ldbghelp.lib', @@ -2534,17 +2491,9 @@ { 'target_name': 'v8_libplatform', 'type': '<(component)', - 'variables': { - 'optimize': 'max', - }, 'dependencies': [ 'v8_libbase', ], - 'include_dirs': [ - '..', - '<(DEPTH)', - '../include/', - ], 'sources': [ '../include/libplatform/libplatform-export.h', '../include/libplatform/libplatform.h', @@ -2582,23 +2531,16 @@ ], 'direct_dependent_settings': { 'include_dirs': [ - '../include/', + '../include', ], }, }, # v8_libplatform { 'target_name': 'v8_libsampler', 'type': 'static_library', - 'variables': { - 'optimize': 'max', - }, 'dependencies': [ 'v8_libbase', ], - 'include_dirs': [ - '..', - '../include/', - ], 'sources': [ '../src/libsampler/sampler.cc', '../src/libsampler/sampler.h' @@ -2610,38 +2552,7 @@ 'toolsets': ['target'], }], ], - 'direct_dependent_settings': { - 'include_dirs': [ - '../include/', - ], - }, }, # v8_libsampler - { - 'target_name': 'js2c_extras', - 'type': 'none', - 'conditions': [ - ['want_separate_host_toolset==1', { - 'toolsets': ['host'], - }, { - 'toolsets': ['target'], - }], - ], - 'actions': [ - { - 'action_name': 'js2c_extras', - 'inputs': [ - '../tools/js2c.py', - '<@(v8_extra_library_files)', - ], - 'outputs': ['<(SHARED_INTERMEDIATE_DIR)/extras-libraries.cc'], - 'action': [ - 'python', - '../tools/js2c.py', '<@(_outputs)', - 'EXTRAS', '<@(v8_extra_library_files)', - ], - }, - ], - }, # js2c_extras { 'target_name': 'torque_base', 'type': '<(component)', @@ -2711,7 +2622,6 @@ 'ExceptionHandling': 1, }, }, - 'include_dirs': ['..'], 'sources': [ "../src/torque/torque.cc", ], @@ -2803,10 +2713,6 @@ 'v8_libplatform', 'v8_nosnapshot', ], - 'include_dirs': [ - '..', - '<(DEPTH)', - ], 'sources': [ '../src/snapshot/embedded-file-writer.cc', '../src/snapshot/embedded-file-writer.h', @@ -2833,7 +2739,6 @@ 'dependencies': [ "v8_libbase#host" ], - 'include_dirs': [".."], 'sources': [ "../src/builtins/generate-bytecodes-builtins-list.cc", "../src/interpreter/bytecode-operands.cc",