build: do not put commands in sources variables
Some checks are pending
Test and upload documentation to artifacts / build-docs (push) Waiting to run
Linters / lint-addon-docs (push) Waiting to run
Linters / lint-cpp (push) Waiting to run
Linters / format-cpp (push) Waiting to run
Linters / lint-js-and-md (push) Waiting to run
Linters / lint-py (push) Waiting to run
Linters / lint-yaml (push) Waiting to run
Linters / lint-sh (push) Waiting to run
Linters / lint-codeowners (push) Waiting to run
Linters / lint-pr-url (push) Waiting to run
Linters / lint-readme (push) Waiting to run
Notify on Push / Notify on Force Push on `main` (push) Waiting to run
Notify on Push / Notify on Push on `main` that lacks metadata (push) Waiting to run
Scorecard supply-chain security / Scorecard analysis (push) Waiting to run

PR-URL: https://github.com/nodejs/node/pull/56885
Reviewed-By: Chengzhong Wu <legendecas@gmail.com>
Reviewed-By: Richard Lau <rlau@redhat.com>
This commit is contained in:
Cheng 2025-02-05 11:26:24 +09:00 committed by GitHub
parent 3207fda22c
commit 6aa42f9cf0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 22 additions and 8 deletions

View File

@ -1394,6 +1394,11 @@ def gcc_version_ge(version_checked):
def configure_node_lib_files(o): def configure_node_lib_files(o):
o['variables']['node_library_files'] = SearchFiles('lib', 'js') o['variables']['node_library_files'] = SearchFiles('lib', 'js')
def configure_node_cctest_sources(o):
o['variables']['node_cctest_sources'] = [ 'src/node_snapshot_stub.cc' ] + \
SearchFiles('test/cctest', 'cc') + \
SearchFiles('test/cctest', 'h')
def configure_node(o): def configure_node(o):
if options.dest_os == 'android': if options.dest_os == 'android':
o['variables']['OS'] = 'android' o['variables']['OS'] = 'android'
@ -2207,6 +2212,7 @@ flavor = GetFlavor(flavor_params)
configure_node(output) configure_node(output)
configure_node_lib_files(output) configure_node_lib_files(output)
configure_node_cctest_sources(output)
configure_napi(output) configure_napi(output)
configure_library('zlib', output) configure_library('zlib', output)
configure_library('http_parser', output) configure_library('http_parser', output)

View File

@ -402,11 +402,6 @@
'src/quic/transportparams.h', 'src/quic/transportparams.h',
'src/quic/quic.cc', 'src/quic/quic.cc',
], ],
'node_cctest_sources': [
'src/node_snapshot_stub.cc',
'<!@("<(python)" tools/search_files.py . test/cctest cc)',
'<!@("<(python)" tools/search_files.py . test/cctest h)',
],
'node_cctest_openssl_sources': [ 'node_cctest_openssl_sources': [
'test/cctest/test_crypto_clienthello.cc', 'test/cctest/test_crypto_clienthello.cc',
'test/cctest/test_node_crypto.cc', 'test/cctest/test_node_crypto.cc',

View File

@ -362,13 +362,26 @@ template("node_gn_build") {
"$node_simdutf_path", "$node_simdutf_path",
] ]
sources = gypi_values.node_cctest_sources sources = [ "src/node_snapshot_stub.cc" ]
sources += exec_script("./tools/search_files.py",
[ rebase_path(".", root_build_dir),
rebase_path("test/cctest", root_build_dir),
"cc" ],
"list lines")
if (node_use_openssl) { if (node_use_openssl) {
deps += [ "deps/ncrypto" ] deps += [ "deps/ncrypto" ]
sources += gypi_values.node_cctest_openssl_sources } else {
sources -= gypi_values.node_cctest_openssl_sources
} }
if (node_enable_inspector) { if (node_enable_inspector) {
sources += gypi_values.node_cctest_inspector_sources deps += [ "src/inspector:crdtp" ]
include_dirs = [
"$target_gen_dir/src",
"$target_gen_dir/src/inspector",
]
} else {
sources -= gypi_values.node_cctest_inspector_sources
} }
} }