|
@ -1,7 +1,7 @@ |
|
|
diff -u -r ../node-v9.3.0/node.gyp ./node.gyp
|
|
|
diff -u -r ../node-v9.5.0/node.gyp ./node.gyp
|
|
|
--- ../node-v9.3.0/node.gyp 2017-12-12 10:22:41.000000000 +0000
|
|
|
--- ../node-v9.5.0/node.gyp 2018-01-31 22:27:10.000000000 +0100
|
|
|
+++ ./node.gyp 2017-12-14 11:57:05.641536169 +0000
|
|
|
+++ ./node.gyp 2018-02-01 10:59:10.485827738 +0100
|
|
|
@@ -753,222 +753,6 @@
|
|
|
@@ -887,191 +887,6 @@
|
|
|
], |
|
|
], |
|
|
} ], |
|
|
} ], |
|
|
] |
|
|
] |
|
@ -12,6 +12,7 @@ diff -u -r ../node-v9.3.0/node.gyp ./node.gyp |
|
|
-
|
|
|
-
|
|
|
- 'dependencies': [
|
|
|
- 'dependencies': [
|
|
|
- '<(node_core_target_name)',
|
|
|
- '<(node_core_target_name)',
|
|
|
|
|
|
- 'rename_node_bin_win',
|
|
|
- 'deps/gtest/gtest.gyp:gtest',
|
|
|
- 'deps/gtest/gtest.gyp:gtest',
|
|
|
- 'node_js2c#host',
|
|
|
- 'node_js2c#host',
|
|
|
- 'node_dtrace_header',
|
|
|
- 'node_dtrace_header',
|
|
@ -20,9 +21,9 @@ diff -u -r ../node-v9.3.0/node.gyp ./node.gyp |
|
|
- ],
|
|
|
- ],
|
|
|
-
|
|
|
-
|
|
|
- 'variables': {
|
|
|
- 'variables': {
|
|
|
- 'OBJ_PATH': '<(OBJ_DIR)/node/src',
|
|
|
- 'OBJ_PATH': '<(OBJ_DIR)/<(node_lib_target_name)/src',
|
|
|
- 'OBJ_GEN_PATH': '<(OBJ_DIR)/node/gen',
|
|
|
- 'OBJ_GEN_PATH': '<(OBJ_DIR)/<(node_lib_target_name)/gen',
|
|
|
- 'OBJ_TRACING_PATH': '<(OBJ_DIR)/node/src/tracing',
|
|
|
- 'OBJ_TRACING_PATH': '<(OBJ_DIR)/<(node_lib_target_name)/src/tracing',
|
|
|
- 'OBJ_SUFFIX': 'o',
|
|
|
- 'OBJ_SUFFIX': 'o',
|
|
|
- 'OBJ_SEPARATOR': '/',
|
|
|
- 'OBJ_SEPARATOR': '/',
|
|
|
- 'conditions': [
|
|
|
- 'conditions': [
|
|
@ -33,18 +34,19 @@ diff -u -r ../node-v9.3.0/node.gyp ./node.gyp |
|
|
- 'OBJ_PATH': '<(OBJ_DIR)/src',
|
|
|
- 'OBJ_PATH': '<(OBJ_DIR)/src',
|
|
|
- 'OBJ_GEN_PATH': '<(OBJ_DIR)/gen',
|
|
|
- 'OBJ_GEN_PATH': '<(OBJ_DIR)/gen',
|
|
|
- 'OBJ_TRACING_PATH': '<(OBJ_DIR)/src/tracing',
|
|
|
- 'OBJ_TRACING_PATH': '<(OBJ_DIR)/src/tracing',
|
|
|
- 'OBJ_SEPARATOR': '/node.',
|
|
|
- 'OBJ_SEPARATOR': '/<(node_lib_target_name).',
|
|
|
- }, {
|
|
|
- }, {
|
|
|
- 'conditions': [
|
|
|
- 'conditions': [
|
|
|
- ['OS=="win"', {
|
|
|
- ['OS=="win"', {
|
|
|
- 'OBJ_PATH': '<(OBJ_DIR)/node',
|
|
|
- 'OBJ_PATH': '<(OBJ_DIR)/<(node_lib_target_name)',
|
|
|
- 'OBJ_GEN_PATH': '<(OBJ_DIR)/node',
|
|
|
- 'OBJ_GEN_PATH': '<(OBJ_DIR)/<(node_lib_target_name)',
|
|
|
- 'OBJ_TRACING_PATH': '<(OBJ_DIR)/node',
|
|
|
- 'OBJ_TRACING_PATH': '<(OBJ_DIR)/<(node_lib_target_name)',
|
|
|
- }],
|
|
|
- }],
|
|
|
- ['OS=="aix"', {
|
|
|
- ['OS=="aix"', {
|
|
|
- 'OBJ_PATH': '<(OBJ_DIR)/node_base/src',
|
|
|
- 'OBJ_PATH': '<(OBJ_DIR)/<(node_lib_target_name)/src',
|
|
|
- 'OBJ_GEN_PATH': '<(OBJ_DIR)/node_base/gen',
|
|
|
- 'OBJ_GEN_PATH': '<(OBJ_DIR)/<(node_lib_target_name)/gen',
|
|
|
- 'OBJ_TRACING_PATH': '<(OBJ_DIR)/node_base/src/tracing',
|
|
|
- 'OBJ_TRACING_PATH':
|
|
|
|
|
|
- '<(OBJ_DIR)/<(node_lib_target_name)/src/tracing',
|
|
|
- }],
|
|
|
- }],
|
|
|
- ]}
|
|
|
- ]}
|
|
|
- ]
|
|
|
- ]
|
|
@ -76,12 +78,6 @@ diff -u -r ../node-v9.3.0/node.gyp ./node.gyp |
|
|
- 'test/cctest/test_url.cc'
|
|
|
- 'test/cctest/test_url.cc'
|
|
|
- ],
|
|
|
- ],
|
|
|
-
|
|
|
-
|
|
|
- 'sources!': [
|
|
|
|
|
|
- 'src/node_main.cc'
|
|
|
|
|
|
- ],
|
|
|
|
|
|
-
|
|
|
|
|
|
- 'conditions': [
|
|
|
|
|
|
- ['node_target_type!="static_library"', {
|
|
|
|
|
|
- 'libraries': [
|
|
|
- 'libraries': [
|
|
|
- '<(OBJ_PATH)<(OBJ_SEPARATOR)async_wrap.<(OBJ_SUFFIX)',
|
|
|
- '<(OBJ_PATH)<(OBJ_SEPARATOR)async_wrap.<(OBJ_SUFFIX)',
|
|
|
- '<(OBJ_PATH)<(OBJ_SEPARATOR)env.<(OBJ_SUFFIX)',
|
|
|
- '<(OBJ_PATH)<(OBJ_SEPARATOR)env.<(OBJ_SUFFIX)',
|
|
@ -103,23 +99,38 @@ diff -u -r ../node-v9.3.0/node.gyp ./node.gyp |
|
|
- '<(OBJ_TRACING_PATH)<(OBJ_SEPARATOR)trace_event.<(OBJ_SUFFIX)',
|
|
|
- '<(OBJ_TRACING_PATH)<(OBJ_SEPARATOR)trace_event.<(OBJ_SUFFIX)',
|
|
|
- '<(OBJ_GEN_PATH)<(OBJ_SEPARATOR)node_javascript.<(OBJ_SUFFIX)',
|
|
|
- '<(OBJ_GEN_PATH)<(OBJ_SEPARATOR)node_javascript.<(OBJ_SUFFIX)',
|
|
|
- ],
|
|
|
- ],
|
|
|
- }],
|
|
|
-
|
|
|
|
|
|
- 'conditions': [
|
|
|
- [ 'node_use_openssl=="true"', {
|
|
|
- [ 'node_use_openssl=="true"', {
|
|
|
|
|
|
- 'conditions': [
|
|
|
|
|
|
- ['node_target_type!="static_library"', {
|
|
|
- 'libraries': [
|
|
|
- 'libraries': [
|
|
|
- '<(OBJ_PATH)<(OBJ_SEPARATOR)node_crypto.<(OBJ_SUFFIX)',
|
|
|
- '<(OBJ_PATH)<(OBJ_SEPARATOR)node_crypto.<(OBJ_SUFFIX)',
|
|
|
- '<(OBJ_PATH)<(OBJ_SEPARATOR)node_crypto_bio.<(OBJ_SUFFIX)',
|
|
|
- '<(OBJ_PATH)<(OBJ_SEPARATOR)node_crypto_bio.<(OBJ_SUFFIX)',
|
|
|
- '<(OBJ_PATH)<(OBJ_SEPARATOR)node_crypto_clienthello.<(OBJ_SUFFIX)',
|
|
|
- '<(OBJ_PATH)<(OBJ_SEPARATOR)node_crypto_clienthello.<(OBJ_SUFFIX)',
|
|
|
- '<(OBJ_PATH)<(OBJ_SEPARATOR)tls_wrap.<(OBJ_SUFFIX)',
|
|
|
- '<(OBJ_PATH)<(OBJ_SEPARATOR)tls_wrap.<(OBJ_SUFFIX)',
|
|
|
- ],
|
|
|
- ],
|
|
|
|
|
|
- }],
|
|
|
|
|
|
- ],
|
|
|
- 'defines': [
|
|
|
- 'defines': [
|
|
|
- 'HAVE_OPENSSL=1',
|
|
|
- 'HAVE_OPENSSL=1',
|
|
|
- ],
|
|
|
- ],
|
|
|
- }],
|
|
|
- }],
|
|
|
|
|
|
- [ 'node_use_perfctr=="true"', {
|
|
|
|
|
|
- 'defines': [ 'HAVE_PERFCTR=1' ],
|
|
|
|
|
|
- 'libraries': [
|
|
|
|
|
|
- '<(OBJ_PATH)<(OBJ_SEPARATOR)node_counters.<(OBJ_SUFFIX)',
|
|
|
|
|
|
- '<(OBJ_PATH)<(OBJ_SEPARATOR)'
|
|
|
|
|
|
- 'node_win32_perfctr_provider.<(OBJ_SUFFIX)',
|
|
|
|
|
|
- ],
|
|
|
|
|
|
- }],
|
|
|
- ['v8_enable_inspector==1', {
|
|
|
- ['v8_enable_inspector==1', {
|
|
|
- 'sources': [
|
|
|
- 'sources': [
|
|
|
- 'test/cctest/test_inspector_socket.cc',
|
|
|
- 'test/cctest/test_inspector_socket.cc',
|
|
|
- 'test/cctest/test_inspector_socket_server.cc'
|
|
|
- 'test/cctest/test_inspector_socket_server.cc'
|
|
|
- ],
|
|
|
- ],
|
|
|
|
|
|
- 'conditions': [
|
|
|
|
|
|
- ['node_target_type!="static_library"', {
|
|
|
- 'libraries': [
|
|
|
- 'libraries': [
|
|
|
- '<(OBJ_PATH)<(OBJ_SEPARATOR)inspector_agent.<(OBJ_SUFFIX)',
|
|
|
- '<(OBJ_PATH)<(OBJ_SEPARATOR)inspector_agent.<(OBJ_SUFFIX)',
|
|
|
- '<(OBJ_PATH)<(OBJ_SEPARATOR)inspector_io.<(OBJ_SUFFIX)',
|
|
|
- '<(OBJ_PATH)<(OBJ_SEPARATOR)inspector_io.<(OBJ_SUFFIX)',
|
|
@ -127,11 +138,13 @@ diff -u -r ../node-v9.3.0/node.gyp ./node.gyp |
|
|
- '<(OBJ_PATH)<(OBJ_SEPARATOR)inspector_socket.<(OBJ_SUFFIX)',
|
|
|
- '<(OBJ_PATH)<(OBJ_SEPARATOR)inspector_socket.<(OBJ_SUFFIX)',
|
|
|
- '<(OBJ_PATH)<(OBJ_SEPARATOR)inspector_socket_server.<(OBJ_SUFFIX)',
|
|
|
- '<(OBJ_PATH)<(OBJ_SEPARATOR)inspector_socket_server.<(OBJ_SUFFIX)',
|
|
|
- ],
|
|
|
- ],
|
|
|
|
|
|
- }],
|
|
|
|
|
|
- ],
|
|
|
- 'defines': [
|
|
|
- 'defines': [
|
|
|
- 'HAVE_INSPECTOR=1',
|
|
|
- 'HAVE_INSPECTOR=1',
|
|
|
- ],
|
|
|
- ],
|
|
|
- }],
|
|
|
- }],
|
|
|
- [ 'node_use_dtrace=="true"', {
|
|
|
- [ 'node_use_dtrace=="true" and node_target_type!="static_library"', {
|
|
|
- 'libraries': [
|
|
|
- 'libraries': [
|
|
|
- '<(OBJ_PATH)<(OBJ_SEPARATOR)node_dtrace.<(OBJ_SUFFIX)',
|
|
|
- '<(OBJ_PATH)<(OBJ_SEPARATOR)node_dtrace.<(OBJ_SUFFIX)',
|
|
|
- ],
|
|
|
- ],
|
|
@ -144,82 +157,38 @@ diff -u -r ../node-v9.3.0/node.gyp ./node.gyp |
|
|
- }],
|
|
|
- }],
|
|
|
- ['OS=="linux"', {
|
|
|
- ['OS=="linux"', {
|
|
|
- 'libraries': [
|
|
|
- 'libraries': [
|
|
|
- '<(SHARED_INTERMEDIATE_DIR)/node_dtrace_provider.o',
|
|
|
- '<(SHARED_INTERMEDIATE_DIR)<(OBJ_SEPARATOR)'
|
|
|
|
|
|
- 'node_dtrace_provider.<(OBJ_SUFFIX)',
|
|
|
- ]
|
|
|
- ]
|
|
|
- }],
|
|
|
- }],
|
|
|
- ],
|
|
|
- ],
|
|
|
|
|
|
- }, {
|
|
|
|
|
|
- 'conditions': [
|
|
|
|
|
|
- [ 'node_use_etw=="true" and OS=="win"', {
|
|
|
|
|
|
- 'libraries': [
|
|
|
|
|
|
- '<(OBJ_PATH)<(OBJ_SEPARATOR)node_dtrace.<(OBJ_SUFFIX)',
|
|
|
|
|
|
- '<(OBJ_PATH)<(OBJ_SEPARATOR)'
|
|
|
|
|
|
- 'node_win32_etw_provider.<(OBJ_SUFFIX)',
|
|
|
|
|
|
- ],
|
|
|
|
|
|
- }]
|
|
|
|
|
|
- ]
|
|
|
- }],
|
|
|
- }],
|
|
|
- [ 'OS=="win"', {
|
|
|
- [ 'OS=="win" and node_target_type!="static_library"', {
|
|
|
- 'libraries': [
|
|
|
- 'libraries': [
|
|
|
- '<(OBJ_PATH)<(OBJ_SEPARATOR)backtrace_win32.<(OBJ_SUFFIX)',
|
|
|
- '<(OBJ_PATH)<(OBJ_SEPARATOR)backtrace_win32.<(OBJ_SUFFIX)',
|
|
|
- ],
|
|
|
- ],
|
|
|
- }, {
|
|
|
- }, {
|
|
|
|
|
|
- 'conditions': [
|
|
|
|
|
|
- ['node_target_type!="static_library"', {
|
|
|
- 'libraries': [
|
|
|
- 'libraries': [
|
|
|
- '<(OBJ_PATH)<(OBJ_SEPARATOR)backtrace_posix.<(OBJ_SUFFIX)',
|
|
|
- '<(OBJ_PATH)<(OBJ_SEPARATOR)backtrace_posix.<(OBJ_SUFFIX)',
|
|
|
- ],
|
|
|
- ],
|
|
|
- }],
|
|
|
- }],
|
|
|
- [ 'node_shared_zlib=="false"', {
|
|
|
|
|
|
- 'dependencies': [
|
|
|
|
|
|
- 'deps/zlib/zlib.gyp:zlib',
|
|
|
|
|
|
- ]
|
|
|
|
|
|
- }],
|
|
|
|
|
|
- [ 'node_shared_openssl=="false" and node_shared=="false"', {
|
|
|
|
|
|
- 'dependencies': [
|
|
|
|
|
|
- 'deps/openssl/openssl.gyp:openssl'
|
|
|
|
|
|
- ]
|
|
|
|
|
|
- }],
|
|
|
|
|
|
- [ 'node_shared_http_parser=="false"', {
|
|
|
|
|
|
- 'dependencies': [
|
|
|
|
|
|
- 'deps/http_parser/http_parser.gyp:http_parser'
|
|
|
|
|
|
- ]
|
|
|
|
|
|
- }],
|
|
|
|
|
|
- [ 'node_shared_libuv=="false"', {
|
|
|
|
|
|
- 'dependencies': [
|
|
|
|
|
|
- 'deps/uv/uv.gyp:libuv'
|
|
|
|
|
|
- ]
|
|
|
|
|
|
- }],
|
|
|
|
|
|
- [ 'node_shared_nghttp2=="false"', {
|
|
|
|
|
|
- 'dependencies': [
|
|
|
|
|
|
- 'deps/nghttp2/nghttp2.gyp:nghttp2'
|
|
|
|
|
|
- ],
|
|
|
|
|
|
- 'include_dirs': [
|
|
|
|
|
|
- 'deps/nghttp2/lib/includes'
|
|
|
|
|
|
- ]
|
|
|
|
|
|
- }],
|
|
|
|
|
|
- [ 'node_use_v8_platform=="true"', {
|
|
|
|
|
|
- 'dependencies': [
|
|
|
|
|
|
- 'deps/v8/src/v8.gyp:v8_libplatform',
|
|
|
|
|
|
- ],
|
|
|
- ],
|
|
|
- }],
|
|
|
- }],
|
|
|
- ['OS=="solaris"', {
|
|
|
- ['OS=="solaris"', {
|
|
|
- 'ldflags': [ '-I<(SHARED_INTERMEDIATE_DIR)' ]
|
|
|
- 'ldflags': [ '-I<(SHARED_INTERMEDIATE_DIR)' ]
|
|
|
- }],
|
|
|
- }],
|
|
|
- [ 'node_use_openssl=="true"', {
|
|
|
|
|
|
- 'conditions': [
|
|
|
|
|
|
- [ 'node_shared_openssl=="false"', {
|
|
|
|
|
|
- 'conditions': [
|
|
|
|
|
|
- # -force_load or --whole-archive are not applicable for
|
|
|
|
|
|
- # the static library
|
|
|
|
|
|
- [ 'node_target_type!="static_library"', {
|
|
|
|
|
|
- 'xcode_settings': {
|
|
|
|
|
|
- 'OTHER_LDFLAGS': [
|
|
|
|
|
|
- '-Wl,-force_load,<(PRODUCT_DIR)/<(OPENSSL_PRODUCT)',
|
|
|
|
|
|
- ],
|
|
|
|
|
|
- },
|
|
|
|
|
|
- 'conditions': [
|
|
|
|
|
|
- ['OS in "linux freebsd" and node_shared=="false"', {
|
|
|
|
|
|
- 'ldflags': [
|
|
|
|
|
|
- '-Wl,--whole-archive,'
|
|
|
|
|
|
- '<(OBJ_DIR)/deps/openssl/'
|
|
|
|
|
|
- '<(OPENSSL_PRODUCT)',
|
|
|
|
|
|
- '-Wl,--no-whole-archive',
|
|
|
|
|
|
- ],
|
|
|
|
|
|
- }],
|
|
|
|
|
|
- ],
|
|
|
|
|
|
- }],
|
|
|
|
|
|
- ],
|
|
|
|
|
|
- }]]
|
|
|
|
|
|
- }],
|
|
|
|
|
|
- ]
|
|
|
- ]
|
|
|
} |
|
|
} |
|
|
], # end targets |
|
|
], # end targets |
|
|