From 4b086141b35d8744a1ddd62362e5bf6d7b36c7cf Mon Sep 17 00:00:00 2001 From: Refael Ackermann Date: Mon, 19 Nov 2018 21:36:32 -0500 Subject: [PATCH] build,src: sync src files with node.gyp PR-URL: https://github.com/nodejs/node/pull/24505 Reviewed-By: Richard Lau Reviewed-By: Daniel Bevenius Reviewed-By: Fedor Indutny --- node.gyp | 58 ++++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 37 insertions(+), 21 deletions(-) diff --git a/node.gyp b/node.gyp index d900ee63ed47f0..3cbbe61e575ca3 100644 --- a/node.gyp +++ b/node.gyp @@ -326,8 +326,8 @@ 'src/bootstrapper.cc', 'src/callback_scope.cc', 'src/cares_wrap.cc', - 'src/connection_wrap.cc', 'src/connect_wrap.cc', + 'src/connection_wrap.cc', 'src/debug_utils.cc', 'src/env.cc', 'src/exceptions.cc', @@ -351,36 +351,37 @@ 'src/node_encoding.cc', 'src/node_errors.cc', 'src/node_file.cc', - 'src/node_http2.cc', 'src/node_http_parser.cc', + 'src/node_http2.cc', + 'src/node_i18n.cc', 'src/node_messaging.cc', + 'src/node_native_module.cc', 'src/node_options.cc', 'src/node_os.cc', - 'src/node_platform.cc', 'src/node_perf.cc', + 'src/node_platform.cc', 'src/node_postmortem_metadata.cc', 'src/node_process.cc', 'src/node_serdes.cc', + 'src/node_stat_watcher.cc', 'src/node_trace_events.cc', 'src/node_types.cc', 'src/node_url.cc', 'src/node_util.cc', 'src/node_v8.cc', - 'src/node_stat_watcher.cc', 'src/node_watchdog.cc', 'src/node_worker.cc', 'src/node_zlib.cc', - 'src/node_i18n.cc', 'src/pipe_wrap.cc', 'src/process_wrap.cc', 'src/sharedarraybuffer_metadata.cc', 'src/signal_wrap.cc', 'src/spawn_sync.cc', - 'src/string_bytes.cc', - 'src/string_decoder.cc', 'src/stream_base.cc', 'src/stream_pipe.cc', 'src/stream_wrap.cc', + 'src/string_bytes.cc', + 'src/string_decoder.cc', 'src/tcp_wrap.cc', 'src/timers.cc', 'src/tracing/agent.cc', @@ -398,70 +399,79 @@ 'src/async_wrap-inl.h', 'src/base_object.h', 'src/base_object-inl.h', - 'src/connection_wrap.h', + 'src/base64.h', 'src/connect_wrap.h', + 'src/connection_wrap.h', 'src/debug_utils.h', 'src/env.h', 'src/env-inl.h', 'src/handle_wrap.h', + 'src/http_parser_adaptor.h', 'src/js_stream.h', + 'src/memory_tracker.h', + 'src/memory_tracker-inl.h', 'src/module_wrap.h', 'src/node.h', 'src/node_api.h', 'src/node_api_types.h', 'src/node_buffer.h', 'src/node_constants.h', + 'src/node_context_data.h', 'src/node_contextify.h', 'src/node_errors.h', 'src/node_file.h', 'src/node_http2.h', 'src/node_http2_state.h', + 'src/node_i18n.h', 'src/node_internals.h', 'src/node_messaging.h', 'src/node_mutex.h', 'src/node_native_module.h', - 'src/node_native_module.cc', + 'src/node_object_wrap.h', 'src/node_options.h', 'src/node_options-inl.h', 'src/node_perf.h', 'src/node_perf_common.h', 'src/node_persistent.h', 'src/node_platform.h', + 'src/node_revert.h', 'src/node_root_certs.h', + 'src/node_stat_watcher.h', 'src/node_union_bytes.h', + 'src/node_url.h', 'src/node_version.h', 'src/node_watchdog.h', - 'src/node_revert.h', - 'src/node_i18n.h', 'src/node_worker.h', - 'src/memory_tracker.h', - 'src/memory_tracker-inl.h', 'src/pipe_wrap.h', - 'src/tty_wrap.h', - 'src/tcp_wrap.h', - 'src/udp_wrap.h', 'src/req_wrap.h', 'src/req_wrap-inl.h', 'src/sharedarraybuffer_metadata.h', - 'src/string_bytes.h', - 'src/string_decoder.h', - 'src/string_decoder-inl.h', + 'src/spawn_sync.h', 'src/stream_base.h', 'src/stream_base-inl.h', 'src/stream_pipe.h', 'src/stream_wrap.h', + 'src/string_bytes.h', + 'src/string_decoder.h', + 'src/string_decoder-inl.h', + 'src/string_search.h', + 'src/tcp_wrap.h', 'src/tracing/agent.h', 'src/tracing/node_trace_buffer.h', 'src/tracing/node_trace_writer.h', 'src/tracing/trace_event.h', + 'src/tracing/trace_event_common.h', 'src/tracing/traced_value.h', + 'src/tty_wrap.h', + 'src/udp_wrap.h', 'src/util.h', 'src/util-inl.h', + # Dependency headers 'deps/http_parser/http_parser.h', 'deps/v8/include/v8.h', # javascript files to make for an even more pleasant IDE experience '<@(library_files)', - # node.gyp is added to the project by default. + # node.gyp is added by default, common.gypi is added for change detection 'common.gypi', ], @@ -525,6 +535,7 @@ 'src/node_win32_etw_provider.h', 'src/node_win32_etw_provider-inl.h', 'src/node_win32_etw_provider.cc', + 'src/node_dtrace.h', 'src/node_dtrace.cc', 'tools/msvs/genfiles/node_etw_provider.h', ], @@ -560,7 +571,10 @@ # below, and the GYP-generated Makefiles will properly build them when # needed. # - 'sources': [ 'src/node_dtrace.cc' ], + 'sources': [ + 'src/node_dtrace.h', + 'src/node_dtrace.cc', + ], 'conditions': [ [ 'OS=="linux"', { 'sources': [ @@ -583,6 +597,8 @@ 'src/node_crypto.h', 'src/node_crypto_bio.h', 'src/node_crypto_clienthello.h', + 'src/node_crypto_clienthello-inl.h', + 'src/node_crypto_groups.h', 'src/tls_wrap.cc', 'src/tls_wrap.h' ],