FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

tools: refactor build-addons.js to ESM · nodejs/node@27b646e · GitHub

/ node Public

Commit 27b646e

Browse files
F3n67u
authored and
juanarbol
committed
tools: refactor build-addons.js to ESM
PR-URL: #43099 Reviewed-By: Darshan Sen <raisinten@gmail.com> Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
1 parent 1702a80 commit 27b646e

6 files changed

Lines changed: 70 additions & 65 deletions

File tree

‎.github/label-pr-config.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ subSystemLabels:
6767
/^tools\/make-v8/: tools, v8 engine, needs-ci
6868
/^tools\/v8_gypfiles/: tools, v8 engine, needs-ci
6969
/^tools\/(code_cache|snapshot)/: needs-ci
70-
/^tools\/build-addons.js/: needs-ci
70+
/^tools\/build-addons.mjs/: needs-ci
7171
# all other tool changes should be marked as such
7272
/^tools\//: tools
7373
/^\.eslint|\.remark|\.editorconfig/: tools

‎Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -366,13 +366,13 @@ ADDONS_BINDING_SOURCES := \
366366
$(filter-out test/addons/??_*/*.h, $(wildcard test/addons/*/*.h))
367367

368368
ADDONS_PREREQS := config.gypi \
369-
deps/npm/node_modules/node-gyp/package.json tools/build-addons.js \
369+
deps/npm/node_modules/node-gyp/package.json tools/build-addons.mjs \
370370
deps/uv/include/*.h deps/v8/include/*.h \
371371
src/node.h src/node_buffer.h src/node_object_wrap.h src/node_version.h
372372

373373
define run_build_addons
374374
env npm_config_loglevel=$(LOGLEVEL) npm_config_nodedir="$$PWD" \
375-
npm_config_python="$(PYTHON)" $(NODE) "$$PWD/tools/build-addons" \
375+
npm_config_python="$(PYTHON)" $(NODE) "$$PWD/tools/build-addons.mjs" \
376376
"$$PWD/deps/npm/node_modules/node-gyp/bin/node-gyp.js" \
377377
$1
378378
touch $2

‎doc/contributing/collaborator-guide.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ There are some other files that touch the build chain. Changes in the following
232232
files also qualify as affecting the `node` binary:
233233

234234
* `tools/*.py`
235-
* `tools/build-addons.js`
235+
* `tools/build-addons.mjs`
236236
* `*.gyp`
237237
* `*.gypi`
238238
* `configure`

‎tools/build-addons.js‎

Lines changed: 0 additions & 58 deletions
This file was deleted.

‎tools/build-addons.mjs‎

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
#!/usr/bin/env node
2+
3+
// Usage: e.g. node build-addons.mjs <path to node-gyp> <directory>
4+
5+
import child_process from 'node:child_process';
6+
import path from 'node:path';
7+
import fs from 'node:fs/promises';
8+
import util from 'node:util';
9+
import process from 'node:process';
10+
import os from 'node:os';
11+
12+
const execFile = util.promisify(child_process.execFile);
13+
14+
const parallelization = +process.env.JOBS || os.cpus().length;
15+
const nodeGyp = process.argv[2];
16+
const directory = process.argv[3];
17+
18+
async function buildAddon(dir) {
19+
try {
20+
// Only run for directories that have a `binding.gyp`.
21+
// (https://github.com/nodejs/node/issues/14843)
22+
await fs.stat(path.join(dir, 'binding.gyp'));
23+
} catch (err) {
24+
if (err.code === 'ENOENT' || err.code === 'ENOTDIR')
25+
return;
26+
throw err;
27+
}
28+
29+
console.log(`Building addon in ${dir}`);
30+
const { stdout, stderr } =
31+
await execFile(process.execPath, [nodeGyp, 'rebuild', `--directory=${dir}`],
32+
{
33+
stdio: 'inherit',
34+
env: { ...process.env, MAKEFLAGS: '-j1' }
35+
});
36+
37+
// We buffer the output and print it out once the process is done in order
38+
// to avoid interleaved output from multiple builds running at once.
39+
process.stdout.write(stdout);
40+
process.stderr.write(stderr);
41+
}
42+
43+
async function parallel(jobQueue, limit) {
44+
const next = async () => {
45+
if (jobQueue.length === 0) {
46+
return;
47+
}
48+
const job = jobQueue.shift();
49+
await job();
50+
await next();
51+
};
52+
53+
const workerCnt = Math.min(limit, jobQueue.length);
54+
await Promise.all(Array.from({ length: workerCnt }, next));
55+
}
56+
57+
const jobs = [];
58+
for await (const dirent of await fs.opendir(directory)) {
59+
if (dirent.isDirectory()) {
60+
jobs.push(() => buildAddon(path.join(directory, dirent.name)));
61+
}
62+
}
63+
await parallel(jobs, parallelization);

‎vcbuild.bat‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -608,7 +608,7 @@ if %errorlevel% neq 0 exit /b %errorlevel%
608608
:: building addons
609609
setlocal
610610
set npm_config_nodedir=%~dp0
611-
"%node_exe%" "%~dp0tools\build-addons.js" "%~dp0deps\npm\node_modules\node-gyp\bin\node-gyp.js" "%~dp0test\addons"
611+
"%node_exe%" "%~dp0tools\build-addons.mjs" "%~dp0deps\npm\node_modules\node-gyp\bin\node-gyp.js" "%~dp0test\addons"
612612
if errorlevel 1 exit /b 1
613613
endlocal
614614

@@ -626,7 +626,7 @@ for /d %%F in (test\js-native-api\??_*) do (
626626
:: building js-native-api
627627
setlocal
628628
set npm_config_nodedir=%~dp0
629-
"%node_exe%" "%~dp0tools\build-addons.js" "%~dp0deps\npm\node_modules\node-gyp\bin\node-gyp.js" "%~dp0test\js-native-api"
629+
"%node_exe%" "%~dp0tools\build-addons.mjs" "%~dp0deps\npm\node_modules\node-gyp\bin\node-gyp.js" "%~dp0test\js-native-api"
630630
if errorlevel 1 exit /b 1
631631
endlocal
632632
goto build-node-api-tests
@@ -645,7 +645,7 @@ for /d %%F in (test\node-api\??_*) do (
645645
:: building node-api
646646
setlocal
647647
set npm_config_nodedir=%~dp0
648-
"%node_exe%" "%~dp0tools\build-addons.js" "%~dp0deps\npm\node_modules\node-gyp\bin\node-gyp.js" "%~dp0test\node-api"
648+
"%node_exe%" "%~dp0tools\build-addons.mjs" "%~dp0deps\npm\node_modules\node-gyp\bin\node-gyp.js" "%~dp0test\node-api"
649649
if errorlevel 1 exit /b 1
650650
endlocal
651651
goto run-tests

0 commit comments

Comments
 (0)
Back | FazBrowse Home | New Git URL