Commit | Line | Data |
---|---|---|
be5f2656 FF |
1 | diff -u -r ../node-v8.9.4/node.gyp ./node.gyp |
2 | --- ../node-v8.9.4/node.gyp 2018-01-03 02:35:08.000000000 +0000 | |
3 | +++ ./node.gyp 2018-01-21 19:57:04.965201176 +0000 | |
4 | @@ -736,221 +736,6 @@ | |
928e1510 FF |
5 | ], |
6 | } ], | |
7 | ] | |
8 | - }, | |
9 | - { | |
10 | - 'target_name': 'cctest', | |
11 | - 'type': 'executable', | |
9179399d FF |
12 | - |
13 | - 'dependencies': [ | |
14 | - '<(node_core_target_name)', | |
15 | - 'deps/gtest/gtest.gyp:gtest', | |
16 | - 'node_js2c#host', | |
17 | - 'node_dtrace_header', | |
18 | - 'node_dtrace_ustack', | |
19 | - 'node_dtrace_provider', | |
20 | - ], | |
21 | - | |
22 | - 'variables': { | |
23 | - 'OBJ_PATH': '<(OBJ_DIR)/node/src', | |
24 | - 'OBJ_GEN_PATH': '<(OBJ_DIR)/node/gen', | |
99365d01 | 25 | - 'OBJ_TRACING_PATH': '<(OBJ_DIR)/node/src/tracing', |
9179399d | 26 | - 'OBJ_SUFFIX': 'o', |
99365d01 | 27 | - 'OBJ_SEPARATOR': '/', |
9179399d FF |
28 | - 'conditions': [ |
29 | - ['OS=="win"', { | |
9179399d FF |
30 | - 'OBJ_SUFFIX': 'obj', |
31 | - }], | |
99365d01 FF |
32 | - ['GENERATOR=="ninja"', { |
33 | - 'OBJ_PATH': '<(OBJ_DIR)/src', | |
34 | - 'OBJ_GEN_PATH': '<(OBJ_DIR)/gen', | |
35 | - 'OBJ_TRACING_PATH': '<(OBJ_DIR)/src/tracing', | |
36 | - 'OBJ_SEPARATOR': '/node.', | |
37 | - }, { | |
38 | - 'conditions': [ | |
39 | - ['OS=="win"', { | |
40 | - 'OBJ_PATH': '<(OBJ_DIR)/node', | |
41 | - 'OBJ_GEN_PATH': '<(OBJ_DIR)/node', | |
42 | - 'OBJ_TRACING_PATH': '<(OBJ_DIR)/node', | |
43 | - }], | |
44 | - ['OS=="aix"', { | |
45 | - 'OBJ_PATH': '<(OBJ_DIR)/node_base/src', | |
46 | - 'OBJ_GEN_PATH': '<(OBJ_DIR)/node_base/gen', | |
47 | - 'OBJ_TRACING_PATH': '<(OBJ_DIR)/node_base/src/tracing', | |
48 | - }], | |
49 | - ]} | |
50 | - ] | |
51 | - ], | |
9179399d FF |
52 | - }, |
53 | - | |
54 | - 'includes': [ | |
55 | - 'node.gypi' | |
56 | - ], | |
57 | - | |
928e1510 FF |
58 | - 'include_dirs': [ |
59 | - 'src', | |
9179399d FF |
60 | - 'tools/msvs/genfiles', |
61 | - 'deps/v8/include', | |
62 | - 'deps/cares/include', | |
63 | - 'deps/uv/include', | |
64 | - '<(SHARED_INTERMEDIATE_DIR)', # for node_natives.h | |
928e1510 | 65 | - ], |
9179399d | 66 | - |
99365d01 | 67 | - 'defines': [ 'NODE_WANT_INTERNALS=1' ], |
9179399d | 68 | - |
928e1510 | 69 | - 'sources': [ |
99365d01 FF |
70 | - 'test/cctest/node_test_fixture.cc', |
71 | - 'test/cctest/test_aliased_buffer.cc', | |
9179399d | 72 | - 'test/cctest/test_base64.cc', |
99365d01 | 73 | - 'test/cctest/test_environment.cc', |
9179399d | 74 | - 'test/cctest/test_util.cc', |
99365d01 | 75 | - 'test/cctest/test_url.cc' |
9179399d FF |
76 | - ], |
77 | - | |
78 | - 'sources!': [ | |
79 | - 'src/node_main.cc' | |
928e1510 | 80 | - ], |
907bf81e FF |
81 | - |
82 | - 'conditions': [ | |
99365d01 FF |
83 | - ['node_target_type!="static_library"', { |
84 | - 'libraries': [ | |
99365d01 FF |
85 | - '<(OBJ_PATH)<(OBJ_SEPARATOR)async-wrap.<(OBJ_SUFFIX)', |
86 | - '<(OBJ_PATH)<(OBJ_SEPARATOR)env.<(OBJ_SUFFIX)', | |
87 | - '<(OBJ_PATH)<(OBJ_SEPARATOR)node.<(OBJ_SUFFIX)', | |
88 | - '<(OBJ_PATH)<(OBJ_SEPARATOR)node_buffer.<(OBJ_SUFFIX)', | |
be5f2656 | 89 | - '<(OBJ_PATH)<(OBJ_SEPARATOR)node_debug_options.<(OBJ_SUFFIX)', |
99365d01 FF |
90 | - '<(OBJ_PATH)<(OBJ_SEPARATOR)node_i18n.<(OBJ_SUFFIX)', |
91 | - '<(OBJ_PATH)<(OBJ_SEPARATOR)node_perf.<(OBJ_SUFFIX)', | |
be5f2656 | 92 | - '<(OBJ_PATH)<(OBJ_SEPARATOR)node_platform.<(OBJ_SUFFIX)', |
99365d01 FF |
93 | - '<(OBJ_PATH)<(OBJ_SEPARATOR)node_url.<(OBJ_SUFFIX)', |
94 | - '<(OBJ_PATH)<(OBJ_SEPARATOR)util.<(OBJ_SUFFIX)', | |
95 | - '<(OBJ_PATH)<(OBJ_SEPARATOR)string_bytes.<(OBJ_SUFFIX)', | |
96 | - '<(OBJ_PATH)<(OBJ_SEPARATOR)string_search.<(OBJ_SUFFIX)', | |
97 | - '<(OBJ_PATH)<(OBJ_SEPARATOR)stream_base.<(OBJ_SUFFIX)', | |
98 | - '<(OBJ_PATH)<(OBJ_SEPARATOR)node_constants.<(OBJ_SUFFIX)', | |
99 | - '<(OBJ_TRACING_PATH)<(OBJ_SEPARATOR)agent.<(OBJ_SUFFIX)', | |
100 | - '<(OBJ_TRACING_PATH)<(OBJ_SEPARATOR)node_trace_buffer.<(OBJ_SUFFIX)', | |
101 | - '<(OBJ_TRACING_PATH)<(OBJ_SEPARATOR)node_trace_writer.<(OBJ_SUFFIX)', | |
102 | - '<(OBJ_TRACING_PATH)<(OBJ_SEPARATOR)trace_event.<(OBJ_SUFFIX)', | |
be5f2656 FF |
103 | - '<(OBJ_GEN_PATH)<(OBJ_SEPARATOR)node_javascript.<(OBJ_SUFFIX)', |
104 | - ], | |
105 | - }], | |
106 | - [ 'node_use_openssl=="true"', { | |
107 | - 'libraries': [ | |
108 | - '<(OBJ_PATH)<(OBJ_SEPARATOR)node_crypto.<(OBJ_SUFFIX)', | |
109 | - '<(OBJ_PATH)<(OBJ_SEPARATOR)node_crypto_bio.<(OBJ_SUFFIX)', | |
110 | - '<(OBJ_PATH)<(OBJ_SEPARATOR)node_crypto_clienthello.<(OBJ_SUFFIX)', | |
111 | - '<(OBJ_PATH)<(OBJ_SEPARATOR)tls_wrap.<(OBJ_SUFFIX)', | |
112 | - ], | |
113 | - 'defines': [ | |
114 | - 'HAVE_OPENSSL=1', | |
99365d01 FF |
115 | - ], |
116 | - }], | |
117 | - ['v8_enable_inspector==1', { | |
907bf81e | 118 | - 'sources': [ |
9179399d | 119 | - 'test/cctest/test_inspector_socket.cc', |
99365d01 | 120 | - 'test/cctest/test_inspector_socket_server.cc' |
da11efa0 | 121 | - ], |
be5f2656 FF |
122 | - 'libraries': [ |
123 | - '<(OBJ_PATH)<(OBJ_SEPARATOR)inspector_agent.<(OBJ_SUFFIX)', | |
124 | - '<(OBJ_PATH)<(OBJ_SEPARATOR)inspector_io.<(OBJ_SUFFIX)', | |
125 | - '<(OBJ_PATH)<(OBJ_SEPARATOR)inspector_js_api.<(OBJ_SUFFIX)', | |
126 | - '<(OBJ_PATH)<(OBJ_SEPARATOR)inspector_socket.<(OBJ_SUFFIX)', | |
127 | - '<(OBJ_PATH)<(OBJ_SEPARATOR)inspector_socket_server.<(OBJ_SUFFIX)', | |
128 | - ], | |
129 | - 'defines': [ | |
130 | - 'HAVE_INSPECTOR=1', | |
131 | - ], | |
132 | - }], | |
133 | - [ 'node_use_dtrace=="true"', { | |
134 | - 'libraries': [ | |
135 | - '<(OBJ_PATH)<(OBJ_SEPARATOR)node_dtrace.<(OBJ_SUFFIX)', | |
136 | - ], | |
da11efa0 | 137 | - 'conditions': [ |
be5f2656 FF |
138 | - ['OS!="mac" and OS!="linux"', { |
139 | - 'libraries': [ | |
140 | - '<(OBJ_PATH)<(OBJ_SEPARATOR)node_dtrace_provider.<(OBJ_SUFFIX)', | |
141 | - '<(OBJ_PATH)<(OBJ_SEPARATOR)node_dtrace_ustack.<(OBJ_SUFFIX)', | |
da11efa0 FF |
142 | - ] |
143 | - }], | |
be5f2656 FF |
144 | - ['OS=="linux"', { |
145 | - 'libraries': [ | |
146 | - '<(SHARED_INTERMEDIATE_DIR)/node_dtrace_provider.o', | |
da11efa0 FF |
147 | - ] |
148 | - }], | |
be5f2656 FF |
149 | - ], |
150 | - }], | |
151 | - [ 'OS=="win"', { | |
152 | - 'libraries': [ | |
153 | - '<(OBJ_PATH)<(OBJ_SEPARATOR)backtrace_win32.<(OBJ_SUFFIX)', | |
154 | - ], | |
155 | - }, { | |
156 | - 'libraries': [ | |
157 | - '<(OBJ_PATH)<(OBJ_SEPARATOR)backtrace_posix.<(OBJ_SUFFIX)', | |
158 | - ], | |
159 | - }], | |
160 | - [ 'node_shared_zlib=="false"', { | |
161 | - 'dependencies': [ | |
162 | - 'deps/zlib/zlib.gyp:zlib', | |
163 | - ] | |
164 | - }], | |
165 | - [ 'node_shared_openssl=="false" and node_shared=="false"', { | |
166 | - 'dependencies': [ | |
167 | - 'deps/openssl/openssl.gyp:openssl' | |
907bf81e FF |
168 | - ] |
169 | - }], | |
be5f2656 | 170 | - [ 'node_shared_http_parser=="false"', { |
99365d01 | 171 | - 'dependencies': [ |
be5f2656 FF |
172 | - 'deps/http_parser/http_parser.gyp:http_parser' |
173 | - ] | |
174 | - }], | |
175 | - [ 'node_shared_libuv=="false"', { | |
176 | - 'dependencies': [ | |
177 | - 'deps/uv/uv.gyp:libuv' | |
178 | - ] | |
179 | - }], | |
180 | - [ 'node_shared_nghttp2=="false"', { | |
181 | - 'dependencies': [ | |
182 | - 'deps/nghttp2/nghttp2.gyp:nghttp2' | |
99365d01 | 183 | - ], |
be5f2656 FF |
184 | - 'include_dirs': [ |
185 | - 'deps/nghttp2/lib/includes' | |
186 | - ] | |
99365d01 | 187 | - }], |
be5f2656 FF |
188 | - [ 'node_use_v8_platform=="true"', { |
189 | - 'dependencies': [ | |
190 | - 'deps/v8/src/v8.gyp:v8_libplatform', | |
907bf81e FF |
191 | - ], |
192 | - }], | |
9179399d FF |
193 | - ['OS=="solaris"', { |
194 | - 'ldflags': [ '-I<(SHARED_INTERMEDIATE_DIR)' ] | |
907bf81e | 195 | - }], |
be5f2656 FF |
196 | - [ 'node_use_openssl=="true"', { |
197 | - 'conditions': [ | |
198 | - [ 'node_shared_openssl=="false"', { | |
199 | - 'conditions': [ | |
200 | - # -force_load or --whole-archive are not applicable for | |
201 | - # the static library | |
202 | - [ 'node_target_type!="static_library"', { | |
203 | - 'xcode_settings': { | |
204 | - 'OTHER_LDFLAGS': [ | |
205 | - '-Wl,-force_load,<(PRODUCT_DIR)/<(OPENSSL_PRODUCT)', | |
206 | - ], | |
207 | - }, | |
208 | - 'conditions': [ | |
209 | - ['OS in "linux freebsd" and node_shared=="false"', { | |
210 | - 'ldflags': [ | |
211 | - '-Wl,--whole-archive,' | |
212 | - '<(OBJ_DIR)/deps/openssl/' | |
213 | - '<(OPENSSL_PRODUCT)', | |
214 | - '-Wl,--no-whole-archive', | |
215 | - ], | |
216 | - }], | |
217 | - ], | |
218 | - }], | |
219 | - ], | |
220 | - }]] | |
221 | - }], | |
907bf81e | 222 | - ] |
928e1510 FF |
223 | } |
224 | ], # end targets | |
225 |