GeezerVison is showing github.com — build: add `--shared-gtest` configure flag · nodejs/node@584c189
File treeExpand file treeCollapse file tree Open diff view settings Expand file treeCollapse file tree Open diff view settings Collapse file Copy file name to clipboardExpand all lines: configure.py +23Lines changed: 23 additions & 0 deletions | Original file line number | Diff line number | Diff line change |
|---|
| 257 | 257 | help='Use the specified path to system CA (PEM format) in addition to ' | 258 | 258 | 'the OpenSSL supplied CA store or compiled-in Mozilla CA copy.') | 259 | 259 |
| | 260 | +shared_optgroup.add_argument('--shared-gtest', | | 261 | + action='store_true', | | 262 | + dest='shared_gtest', | | 263 | + default=None, | | 264 | + help='link to a shared googletest DLL instead of static linking') | | 265 | + | | 266 | +shared_optgroup.add_argument('--shared-gtest-includes', | | 267 | + action='store', | | 268 | + dest='shared_gtest_includes', | | 269 | + help='directory containing googletest header files') | | 270 | + | | 271 | +shared_optgroup.add_argument('--shared-gtest-libname', | | 272 | + action='store', | | 273 | + dest='shared_gtest_libname', | | 274 | + default='gtest', | | 275 | + help='alternative lib name to link to [default: %(default)s]') | | 276 | + | | 277 | +shared_optgroup.add_argument('--shared-gtest-libpath', | | 278 | + action='store', | | 279 | + dest='shared_gtest_libpath', | | 280 | + help='a directory to search for the shared googletest DLL') | | 281 | + | 260 | 282 | parser.add_argument('--experimental-http-parser', | 261 | 283 | action='store_true', | 262 | 284 | dest='experimental_http_parser', | @@ -2298,6 +2320,7 @@ def make_bin_override(): | 2298 | 2320 | configure_library('simdutf', output) | 2299 | 2321 | configure_library('brotli', output, pkgname=['libbrotlidec', 'libbrotlienc']) | 2300 | 2322 | configure_library('cares', output, pkgname='libcares') | | 2323 | +configure_library('gtest', output) | 2301 | 2324 | configure_library('nghttp2', output, pkgname='libnghttp2') | 2302 | 2325 | configure_library('nghttp3', output, pkgname='libnghttp3') | 2303 | 2326 | configure_library('ngtcp2', output, pkgname='libngtcp2') | |
Collapse file Copy file name to clipboardExpand all lines: node.gyp +39-23Lines changed: 39 additions & 23 deletions | Original file line number | Diff line number | Diff line change |
|---|
| 4 | 4 | 'v8_trace_maps%': 0, | 5 | 5 | 'v8_enable_pointer_compression%': 0, | 6 | 6 | 'v8_enable_31bit_smis_on_64bit_arch%': 0, | 7 | | - 'node_no_browser_globals%': 'false', | 8 | | - 'node_snapshot_main%': '', | 9 | | - 'node_use_node_snapshot%': 'false', | 10 | | - 'node_use_v8_platform%': 'true', | 11 | | - 'node_use_bundled_v8%': 'true', | 12 | | - 'node_shared%': 'false', | 13 | | - 'node_write_snapshot_as_string_literals': 'true', | 14 | 7 | 'force_dynamic_crt%': 0, | 15 | | - 'ossfuzz' : 'false', | | 8 | + 'node_builtin_modules_path%': '', | | 9 | + 'node_core_target_name%': 'node', | | 10 | + 'node_enable_v8_vtunejit%': 'false', | | 11 | + 'node_intermediate_lib_type%': 'static_library', | | 12 | + 'node_lib_target_name%': 'libnode', | 16 | 13 | 'node_module_version%': '', | 17 | | - 'node_use_amaro%': 'true', | | 14 | + 'node_no_browser_globals%': 'false', | 18 | 15 | 'node_shared_brotli%': 'false', | 19 | | - 'node_shared_zstd%': 'false', | 20 | | - 'node_shared_zlib%': 'false', | 21 | | - 'node_shared_http_parser%': 'false', | 22 | 16 | 'node_shared_cares%': 'false', | | 17 | + 'node_shared_gtest%': 'false', | | 18 | + 'node_shared_http_parser%': 'false', | 23 | 19 | 'node_shared_libuv%': 'false', | | 20 | + 'node_shared_nghttp2%': 'false', | | 21 | + 'node_shared_openssl%': 'false', | 24 | 22 | 'node_shared_sqlite%': 'false', | 25 | 23 | 'node_shared_uvwasi%': 'false', | 26 | | - 'node_shared_nghttp2%': 'false', | | 24 | + 'node_shared_zlib%': 'false', | | 25 | + 'node_shared_zstd%': 'false', | | 26 | + 'node_shared%': 'false', | | 27 | + 'node_snapshot_main%': '', | | 28 | + 'node_use_amaro%': 'true', | | 29 | + 'node_use_bundled_v8%': 'true', | | 30 | + 'node_use_node_snapshot%': 'false', | 27 | 31 | 'node_use_openssl%': 'true', | 28 | 32 | 'node_use_sqlite%': 'true', | 29 | | - 'node_shared_openssl%': 'false', | | 33 | + 'node_use_v8_platform%': 'true', | 30 | 34 | 'node_v8_options%': '', | 31 | | - 'node_enable_v8_vtunejit%': 'false', | 32 | | - 'node_core_target_name%': 'node', | 33 | | - 'node_lib_target_name%': 'libnode', | 34 | | - 'node_intermediate_lib_type%': 'static_library', | 35 | | - 'node_builtin_modules_path%': '', | | 35 | + 'node_write_snapshot_as_string_literals': 'true', | | 36 | + 'ossfuzz' : 'false', | 36 | 37 | 'linked_module_files': [ | 37 | 38 | ], | 38 | 39 | # We list the deps/ files out instead of globbing them in js2c.cc since we | | 860 | 861 | '<(SHARED_INTERMEDIATE_DIR)' # for node_natives.h | 861 | 862 | ], | 862 | 863 | 'dependencies': [ | 863 | | - 'deps/googletest/googletest.gyp:gtest_prod', | 864 | 864 | 'deps/histogram/histogram.gyp:histogram', | 865 | 865 | 'deps/nbytes/nbytes.gyp:nbytes', | 866 | 866 | 'tools/v8_gypfiles/abseil.gyp:abseil', | | 924 | 924 | 'src/node_snapshot_stub.cc', | 925 | 925 | ] | 926 | 926 | }], | | 927 | + [ 'node_shared_gtest=="false"', { | | 928 | + 'dependencies': [ | | 929 | + 'deps/googletest/googletest.gyp:gtest_prod', | | 930 | + ], | | 931 | + }], | 927 | 932 | [ 'node_use_sqlite=="true"', { | 928 | 933 | 'sources': [ | 929 | 934 | '<@(node_sqlite_sources)', | | 1154 | 1159 | 'type': 'executable', | 1155 | 1160 | 'dependencies': [ | 1156 | 1161 | '<(node_lib_target_name)', | 1157 | | - 'deps/googletest/googletest.gyp:gtest_prod', | 1158 | 1162 | 'deps/histogram/histogram.gyp:histogram', | 1159 | 1163 | 'deps/nbytes/nbytes.gyp:nbytes', | 1160 | 1164 | ], | | 1179 | 1183 | 'test/fuzzers/fuzz_strings.cc', | 1180 | 1184 | ], | 1181 | 1185 | 'conditions': [ | | 1186 | + [ 'node_shared_gtest=="false"', { | | 1187 | + 'dependencies': [ | | 1188 | + 'deps/googletest/googletest.gyp:gtest_prod', | | 1189 | + ], | | 1190 | + }], | 1182 | 1191 | [ 'node_shared_uvwasi=="false"', { | 1183 | 1192 | 'dependencies': [ 'deps/uvwasi/uvwasi.gyp:uvwasi' ], | 1184 | 1193 | 'include_dirs': [ 'deps/uvwasi/include' ], | | 1202 | 1211 |
| 1203 | 1212 | 'dependencies': [ | 1204 | 1213 | '<(node_lib_target_name)', | 1205 | | - 'deps/googletest/googletest.gyp:gtest', | 1206 | | - 'deps/googletest/googletest.gyp:gtest_main', | 1207 | 1214 | 'deps/histogram/histogram.gyp:histogram', | 1208 | 1215 | 'deps/nbytes/nbytes.gyp:nbytes', | 1209 | 1216 | 'tools/v8_gypfiles/abseil.gyp:abseil', | | 1231 | 1238 | 'sources': [ '<@(node_cctest_sources)' ], | 1232 | 1239 |
| 1233 | 1240 | 'conditions': [ | | 1241 | + [ 'node_shared_gtest=="false"', { | | 1242 | + 'dependencies': [ | | 1243 | + 'deps/googletest/googletest.gyp:gtest', | | 1244 | + 'deps/googletest/googletest.gyp:gtest_main', | | 1245 | + ], | | 1246 | + }], | | 1247 | + [ 'node_shared_gtest=="true"', { | | 1248 | + 'libraries': [ '-lgtest_main' ], | | 1249 | + }], | 1234 | 1250 | [ 'node_use_openssl=="true"', { | 1235 | 1251 | 'defines': [ | 1236 | 1252 | 'HAVE_OPENSSL=1', | |
|