Make cmakeBuildTask accept opts instead of array #1204

Closed
NickGerleman wants to merge 1 commits from export-D42285129 into main
3 changed files with 27 additions and 5 deletions

View File

@@ -8,6 +8,7 @@
*/ */
module.exports = { module.exports = {
root: true,
ignorePatterns: ["dist/**", "**/*.d.ts"], ignorePatterns: ["dist/**", "**/*.d.ts"],
parser: "@babel/eslint-parser", parser: "@babel/eslint-parser",
extends: [ extends: [

15
javascript/.prettierrc.js Normal file
View File

@@ -0,0 +1,15 @@
/**
* Copyright (c) Meta Platforms, Inc. and affiliates.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*
* @format
*/
module.exports = {
trailingComma: "es5",
tabWidth: 2,
semi: true,
singleQuote: false,
};

View File

@@ -37,7 +37,7 @@ task(
); );
function defineFlavor(flavor, env) { function defineFlavor(flavor, env) {
task(`cmake-build:${flavor}`, cmakeBuildTask([flavor])); task(`cmake-build:${flavor}`, cmakeBuildTask({ targets: [flavor] }));
task(`jest:${flavor}`, jestTask({ env })); task(`jest:${flavor}`, jestTask({ env }));
task( task(
`test:${flavor}`, `test:${flavor}`,
@@ -51,8 +51,14 @@ defineFlavor("wasm-async", { WASM: 1, SYNC: 0 });
defineFlavor("wasm-sync", { WASM: 1, SYNC: 1 }); defineFlavor("wasm-sync", { WASM: 1, SYNC: 1 });
task("cmake-build:all", cmakeBuildTask()); task("cmake-build:all", cmakeBuildTask());
task("cmake-build:async", cmakeBuildTask(["asmjs-async", "wasm-async"])); task(
task("cmake-build:sync", cmakeBuildTask(["asmjs-sync", "wasm-sync"])); "cmake-build:async",
cmakeBuildTask({ targets: ["asmjs-async", "wasm-async"] })
);
task(
"cmake-build:sync",
cmakeBuildTask({ targets: ["asmjs-sync", "wasm-sync"] })
);
task("build", series("prepare-for-build", "cmake-build:all")); task("build", series("prepare-for-build", "cmake-build:all"));
@@ -114,13 +120,13 @@ function emcmakeGenerateTask() {
}; };
} }
function cmakeBuildTask(targets) { function cmakeBuildTask(opts) {
return () => { return () => {
const cmake = which.sync("cmake"); const cmake = which.sync("cmake");
const args = [ const args = [
"--build", "--build",
"build", "build",
...(targets ? ["--target", ...targets] : []), ...(opts?.targets ? ["--target", ...opts.targets] : []),
]; ];
logger.info(["cmake", ...args].join(" ")); logger.info(["cmake", ...args].join(" "));