Commit 96ad768
build: remove node_report option in node.gyp
PR-URL: #32242
Fixes: #26293
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: David Carlier <devnexen@gmail.com>
Reviewed-By: Gireesh Punathil <gpunathi@in.ibm.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>1 parent 1950c08 commit 96ad768
1 file changed
Lines changed: 13 additions & 40 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -336,6 +336,8 @@ | |||
| 336 | 336 | 'type': 'executable', | |
| 337 | 337 | ||
| 338 | 338 | 'defines': [ | |
| 339 | + 'NODE_ARCH="<(target_arch)"', | ||
| 340 | + 'NODE_PLATFORM="<(OS)"', | ||
| 339 | 341 | 'NODE_WANT_INTERNALS=1', | |
| 340 | 342 | ], | |
| 341 | 343 | ||
@@ -423,13 +425,6 @@ | |||
| 423 | 425 | 'OTHER_LDFLAGS': [ '-Wl,-rpath,@loader_path', ], | |
| 424 | 426 | }, | |
| 425 | 427 | }], | |
| 426 | - [ 'node_report=="true"', { | ||
| 427 | - 'defines': [ | ||
| 428 | - 'NODE_REPORT', | ||
| 429 | - 'NODE_ARCH="<(target_arch)"', | ||
| 430 | - 'NODE_PLATFORM="<(OS)"', | ||
| 431 | - ], | ||
| 432 | - }], | ||
| 433 | 428 | ['OS=="win"', { | |
| 434 | 429 | 'libraries': [ | |
| 435 | 430 | 'Dbghelp.lib', | |
@@ -595,6 +590,9 @@ | |||
| 595 | 590 | 'src/node_process_events.cc', | |
| 596 | 591 | 'src/node_process_methods.cc', | |
| 597 | 592 | 'src/node_process_object.cc', | |
| 593 | + 'src/node_report.cc', | ||
| 594 | + 'src/node_report_module.cc', | ||
| 595 | + 'src/node_report_utils.cc', | ||
| 598 | 596 | 'src/node_serdes.cc', | |
| 599 | 597 | 'src/node_sockaddr.cc', | |
| 600 | 598 | 'src/node_stat_watcher.cc', | |
@@ -684,6 +682,7 @@ | |||
| 684 | 682 | 'src/node_perf_common.h', | |
| 685 | 683 | 'src/node_platform.h', | |
| 686 | 684 | 'src/node_process.h', | |
| 685 | + 'src/node_report.h', | ||
| 687 | 686 | 'src/node_revert.h', | |
| 688 | 687 | 'src/node_root_certs.h', | |
| 689 | 688 | 'src/node_sockaddr.h', | |
@@ -780,6 +779,7 @@ | |||
| 780 | 779 | 'libraries': [ | |
| 781 | 780 | 'Dbghelp', | |
| 782 | 781 | 'Psapi', | |
| 782 | + 'Ws2_32', | ||
| 783 | 783 | ], | |
| 784 | 784 | }], | |
| 785 | 785 | [ 'node_use_etw=="true"', { | |
@@ -864,23 +864,6 @@ | |||
| 864 | 864 | 'src/tls_wrap.h' | |
| 865 | 865 | ], | |
| 866 | 866 | }], | |
| 867 | - [ 'node_report=="true"', { | ||
| 868 | - 'sources': [ | ||
| 869 | - 'src/node_report.cc', | ||
| 870 | - 'src/node_report_module.cc', | ||
| 871 | - 'src/node_report_utils.cc', | ||
| 872 | - ], | ||
| 873 | - 'defines': [ | ||
| 874 | - 'NODE_REPORT', | ||
| 875 | - 'NODE_ARCH="<(target_arch)"', | ||
| 876 | - 'NODE_PLATFORM="<(OS)"', | ||
| 877 | - ], | ||
| 878 | - 'conditions': [ | ||
| 879 | - ['OS=="win"', { | ||
| 880 | - 'libraries': [ 'Ws2_32' ], | ||
| 881 | - }], | ||
| 882 | - ], | ||
| 883 | - }], | ||
| 884 | 867 | [ 'OS in "linux freebsd mac" and ' | |
| 885 | 868 | 'target_arch=="x64" and ' | |
| 886 | 869 | 'node_target_type=="executable"', { | |
@@ -1137,7 +1120,11 @@ | |||
| 1137 | 1120 | 'test/cctest', | |
| 1138 | 1121 | ], | |
| 1139 | 1122 | ||
| 1140 | - 'defines': [ 'NODE_WANT_INTERNALS=1' ], | ||
| 1123 | + 'defines': [ | ||
| 1124 | + 'NODE_ARCH="<(target_arch)"', | ||
| 1125 | + 'NODE_PLATFORM="<(OS)"', | ||
| 1126 | + 'NODE_WANT_INTERNALS=1', | ||
| 1127 | + ], | ||
| 1141 | 1128 | ||
| 1142 | 1129 | 'sources': [ | |
| 1143 | 1130 | 'src/node_snapshot_stub.cc', | |
@@ -1154,6 +1141,7 @@ | |||
| 1154 | 1141 | 'test/cctest/test_linked_binding.cc', | |
| 1155 | 1142 | 'test/cctest/test_per_process.cc', | |
| 1156 | 1143 | 'test/cctest/test_platform.cc', | |
| 1144 | + 'test/cctest/test_report_util.cc', | ||
| 1157 | 1145 | 'test/cctest/test_sockaddr.cc', | |
| 1158 | 1146 | 'test/cctest/test_traced_value.cc', | |
| 1159 | 1147 | 'test/cctest/test_util.cc', | |
@@ -1191,21 +1179,6 @@ | |||
| 1191 | 1179 | 'OTHER_LDFLAGS': [ '-Wl,-rpath,@loader_path', ], | |
| 1192 | 1180 | }, | |
| 1193 | 1181 | }], | |
| 1194 | - [ 'node_report=="true"', { | ||
| 1195 | - 'sources': [ | ||
| 1196 | - 'test/cctest/test_report_util.cc', | ||
| 1197 | - ], | ||
| 1198 | - 'defines': [ | ||
| 1199 | - 'NODE_REPORT', | ||
| 1200 | - 'NODE_ARCH="<(target_arch)"', | ||
| 1201 | - 'NODE_PLATFORM="<(OS)"', | ||
| 1202 | - ], | ||
| 1203 | - 'conditions': [ | ||
| 1204 | - ['OS=="win"', { | ||
| 1205 | - 'libraries': [ 'Ws2_32' ], | ||
| 1206 | - }], | ||
| 1207 | - ], | ||
| 1208 | - }], | ||
| 1209 | 1182 | ['OS=="win"', { | |
| 1210 | 1183 | 'libraries': [ | |
| 1211 | 1184 | 'Dbghelp.lib', | |
0 commit comments