Skip to content

Commit 9596364

Browse files
committed
refactor: hardcoded sim version
1 parent 5a3a23c commit 9596364

File tree

1 file changed

+8
-11
lines changed

1 file changed

+8
-11
lines changed

scripts/cargo-msfs.ts

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -73,27 +73,24 @@ if (existsSync(outDir)) rmdirSync(outDir, { recursive: true });
7373
// The work directory, relative to workspace root
7474
const relativeWorkdDir = process.cwd().replace(workspaceRoot, "").replaceAll("\\", "/");
7575

76-
// Build the 2020 version
77-
const simVersion = "2020";
78-
79-
console.info(`[*] Building for ${simVersion}`);
76+
console.info(`[*] Building for 2020`);
8077

8178
// Create the subfolder
82-
const simDir = join(outDir, simVersion);
79+
const simDir = join(outDir, "2020");
8380
const relativeSimDir = simDir.replace(workspaceRoot, "").replaceAll("\\", "/");
8481
mkdirSync(simDir, { recursive: true });
8582

8683
// Run cargo-msfs
8784
await $`docker run \
8885
--rm -t \
89-
--name msfs-${simVersion}-wasm-builder \
86+
--name msfs-2020-wasm-builder \
9087
-v ${workspaceRoot}:/workspace \
9188
-w /workspace${relativeWorkdDir} \
92-
-e CARGO_TARGET_DIR=/workspace/targets/${simVersion} \
89+
-e CARGO_TARGET_DIR=/workspace/targets/2020 \
9390
${IMAGE_NAME} \
94-
bash -c "cargo-msfs build msfs${simVersion} -i ./src/wasm -o ./${relativeSimDir}/msfs_navigation_data_interface.wasm \
95-
1> >(sed \"s/^/[\x1b[34m${simVersion}\\x1b[0m]/\") \
96-
2> >(sed \"s/^/[\x1b[34m${simVersion}\\x1b[0m]/\" >&2)"`.catch((err: { exitCode?: number; stderr?: Buffer }) => {
97-
console.error(`[-] Error building for ${simVersion}: ${err.exitCode} ${err.stderr?.toString()}`);
91+
bash -c "cargo-msfs build msfs2020 -i ./src/wasm -o ./${relativeSimDir}/msfs_navigation_data_interface.wasm \
92+
1> >(sed \"s/^/[\x1b[34m2020\\x1b[0m]/\") \
93+
2> >(sed \"s/^/[\x1b[34m2020\\x1b[0m]/\" >&2)"`.catch((err: { exitCode?: number; stderr?: Buffer }) => {
94+
console.error(`[-] Error building for 2020: ${err.exitCode} ${err.stderr?.toString()}`);
9895
process.exit(1);
9996
});

0 commit comments

Comments
 (0)