Commit | Line | Data |
---|---|---|
d214b604 FF |
1 | diff -u -r ../node-v7.10.0/node.gyp ./node.gyp |
2 | --- ../node-v7.10.0/node.gyp 2017-05-03 04:00:10.000000000 +0200 | |
3 | +++ ./node.gyp 2017-05-08 10:53:47.305406639 +0200 | |
4 | @@ -556,141 +556,6 @@ | |
a61e7e45 FF |
5 | ], |
6 | } ], | |
7 | ] | |
8 | - }, | |
9 | - { | |
10 | - 'target_name': 'cctest', | |
11 | - 'type': 'executable', | |
d214b604 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', | |
25 | - 'OBJ_TRACING_PATH': '<(OBJ_DIR)/node/src/tracing', | |
26 | - 'OBJ_SUFFIX': 'o', | |
27 | - 'conditions': [ | |
28 | - ['OS=="win"', { | |
29 | - 'OBJ_PATH': '<(OBJ_DIR)/node', | |
30 | - 'OBJ_GEN_PATH': '<(OBJ_DIR)/node', | |
31 | - 'OBJ_TRACING_PATH': '<(OBJ_DIR)/node', | |
32 | - 'OBJ_SUFFIX': 'obj', | |
33 | - }], | |
34 | - ['OS=="aix"', { | |
35 | - 'OBJ_PATH': '<(OBJ_DIR)/node_base/src', | |
36 | - 'OBJ_GEN_PATH': '<(OBJ_DIR)/node_base/gen', | |
37 | - 'OBJ_TRACING_PATH': '<(OBJ_DIR)/node_base/src/tracing', | |
38 | - }], | |
39 | - ], | |
40 | - }, | |
41 | - | |
42 | - 'includes': [ | |
43 | - 'node.gypi' | |
44 | - ], | |
45 | - | |
a61e7e45 FF |
46 | - 'include_dirs': [ |
47 | - 'src', | |
d214b604 | 48 | - 'tools/msvs/genfiles', |
a61e7e45 | 49 | - 'deps/v8/include', |
d214b604 FF |
50 | - 'deps/cares/include', |
51 | - 'deps/uv/include', | |
52 | - '<(SHARED_INTERMEDIATE_DIR)', # for node_natives.h | |
53 | - ], | |
54 | - | |
55 | - 'libraries': [ | |
56 | - '<(OBJ_GEN_PATH)/node_javascript.<(OBJ_SUFFIX)', | |
57 | - '<(OBJ_PATH)/node_debug_options.<(OBJ_SUFFIX)', | |
58 | - '<(OBJ_PATH)/async-wrap.<(OBJ_SUFFIX)', | |
59 | - '<(OBJ_PATH)/env.<(OBJ_SUFFIX)', | |
60 | - '<(OBJ_PATH)/node.<(OBJ_SUFFIX)', | |
61 | - '<(OBJ_PATH)/node_buffer.<(OBJ_SUFFIX)', | |
62 | - '<(OBJ_PATH)/node_i18n.<(OBJ_SUFFIX)', | |
63 | - '<(OBJ_PATH)/debug-agent.<(OBJ_SUFFIX)', | |
64 | - '<(OBJ_PATH)/util.<(OBJ_SUFFIX)', | |
65 | - '<(OBJ_PATH)/string_bytes.<(OBJ_SUFFIX)', | |
66 | - '<(OBJ_PATH)/string_search.<(OBJ_SUFFIX)', | |
67 | - '<(OBJ_PATH)/stream_base.<(OBJ_SUFFIX)', | |
68 | - '<(OBJ_PATH)/node_constants.<(OBJ_SUFFIX)', | |
69 | - '<(OBJ_PATH)/node_revert.<(OBJ_SUFFIX)', | |
70 | - '<(OBJ_TRACING_PATH)/agent.<(OBJ_SUFFIX)', | |
71 | - '<(OBJ_TRACING_PATH)/node_trace_buffer.<(OBJ_SUFFIX)', | |
72 | - '<(OBJ_TRACING_PATH)/node_trace_writer.<(OBJ_SUFFIX)', | |
73 | - '<(OBJ_TRACING_PATH)/trace_event.<(OBJ_SUFFIX)', | |
a61e7e45 | 74 | - ], |
d214b604 | 75 | - |
a61e7e45 FF |
76 | - 'defines': [ |
77 | - # gtest's ASSERT macros conflict with our own. | |
78 | - 'GTEST_DONT_DEFINE_ASSERT_EQ=1', | |
79 | - 'GTEST_DONT_DEFINE_ASSERT_GE=1', | |
80 | - 'GTEST_DONT_DEFINE_ASSERT_GT=1', | |
81 | - 'GTEST_DONT_DEFINE_ASSERT_LE=1', | |
82 | - 'GTEST_DONT_DEFINE_ASSERT_LT=1', | |
83 | - 'GTEST_DONT_DEFINE_ASSERT_NE=1', | |
84 | - 'NODE_WANT_INTERNALS=1', | |
85 | - ], | |
d214b604 | 86 | - |
a61e7e45 | 87 | - 'sources': [ |
d214b604 FF |
88 | - 'test/cctest/test_util.cc', |
89 | - ], | |
90 | - | |
91 | - 'sources!': [ | |
92 | - 'src/node_main.cc' | |
a61e7e45 FF |
93 | - ], |
94 | - | |
95 | - 'conditions': [ | |
96 | - ['v8_inspector=="true"', { | |
a61e7e45 | 97 | - 'sources': [ |
a61e7e45 FF |
98 | - 'test/cctest/test_inspector_socket.cc', |
99 | - 'test/cctest/test_inspector_socket_server.cc' | |
100 | - ], | |
101 | - 'conditions': [ | |
2e97faec FF |
102 | - [ 'node_shared_zlib=="false"', { |
103 | - 'dependencies': [ | |
104 | - 'deps/zlib/zlib.gyp:zlib', | |
105 | - ] | |
106 | - }], | |
a61e7e45 FF |
107 | - [ 'node_shared_openssl=="false"', { |
108 | - 'dependencies': [ | |
109 | - 'deps/openssl/openssl.gyp:openssl' | |
110 | - ] | |
111 | - }], | |
112 | - [ 'node_shared_http_parser=="false"', { | |
113 | - 'dependencies': [ | |
114 | - 'deps/http_parser/http_parser.gyp:http_parser' | |
115 | - ] | |
116 | - }], | |
117 | - [ 'node_shared_libuv=="false"', { | |
118 | - 'dependencies': [ | |
119 | - 'deps/uv/uv.gyp:libuv' | |
120 | - ] | |
121 | - }] | |
122 | - ] | |
123 | - }], | |
124 | - [ 'node_use_v8_platform=="true"', { | |
125 | - 'dependencies': [ | |
126 | - 'deps/v8/src/v8.gyp:v8_libplatform', | |
127 | - ], | |
128 | - }], | |
d214b604 FF |
129 | - [ 'node_use_dtrace=="true" and OS!="mac" and OS!="linux"', { |
130 | - 'copies': [{ | |
131 | - 'destination': '<(OBJ_DIR)/cctest/src', | |
132 | - 'files': [ | |
133 | - '<(OBJ_PATH)/node_dtrace_ustack.<(OBJ_SUFFIX)', | |
134 | - '<(OBJ_PATH)/node_dtrace_provider.<(OBJ_SUFFIX)', | |
135 | - '<(OBJ_PATH)/node_dtrace.<(OBJ_SUFFIX)', | |
136 | - ]}, | |
a61e7e45 FF |
137 | - ], |
138 | - }], | |
d214b604 FF |
139 | - ['OS=="solaris"', { |
140 | - 'ldflags': [ '-I<(SHARED_INTERMEDIATE_DIR)' ] | |
141 | - }], | |
a61e7e45 FF |
142 | - ] |
143 | } | |
144 | ], # end targets | |
145 |