Skip to content

Commit 055fe67

Browse files
cometkimcometkim
committed
per-platform packages
1 parent 80d6156 commit 055fe67

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+361
-54
lines changed

‎.github/workflows/get_artifact_dir_name.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import * as fs from "node:fs";
22
import * as os from "node:os";
33

4-
import { platformName } from "#cli/bins";
4+
import { platformName } from "#dev/paths";
55

66
// Pass artifactDirName to subsequent GitHub actions
77
fs.appendFileSync(

‎.gitignore‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ _build
4646
node_modules
4747
*.dump
4848
coverage
49-
*.exe
5049

5150
.ninja_log
5251
.bsdeps
@@ -82,6 +81,12 @@ tests/tools_tests/lib
8281
tests/analysis_tests*/lib
8382
tests/analysis_tests/**/*.bs.js
8483

84+
/linux/*.exe
85+
/linuxarm64/*.exe
86+
/darwin/*.exe
87+
/darwinarm64/*.exe
88+
/windows/*.exe
89+
8590
.yarn/*
8691
!.yarn/patches
8792
!.yarn/plugins

‎cli/common/bins.js‎

Lines changed: 26 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,34 @@
11
// @ts-check
22

3-
import * as path from "node:path";
4-
53
/**
6-
* For compatibility reasons, if the architecture is x64, omit it from the bin directory name.
7-
* So we'll have "darwin", "linux" and "win32" for x64 arch,
8-
* but "darwinarm64" and "linuxarm64" for arm64 arch.
9-
* Also, we do not have Windows ARM binaries yet. But the x64 binaries do work on Windows 11 ARM.
10-
* So omit the architecture for Windows, too.
4+
* @typedef {{
5+
* platformDir: string,
6+
* bsc_exe: string,
7+
* ninja_exe: string,
8+
* rescript_exe: string,
9+
* rescript_tools_exe: string,
10+
* rescript_editor_analysis_exe: string,
11+
* rewatch_exe: string,
12+
* }} BinaryPaths
1113
*/
12-
export const platformName =
13-
process.arch === "x64" || process.platform === "win32"
14-
? process.platform
15-
: process.platform + process.arch;
16-
17-
export const platformDir = path.resolve(
18-
import.meta.dirname,
19-
"..",
20-
"..",
21-
platformName,
22-
);
23-
24-
export const bsc_exe = path.join(platformDir, "bsc.exe");
2514

26-
export const ninja_exe = path.join(platformDir, "ninja.exe");
15+
const target = `${process.platform}-${process.arch}`;
2716

28-
export const rescript_exe = path.join(platformDir, "rescript.exe");
17+
/** @type {BinaryPaths} */
18+
let binPaths;
19+
try {
20+
binPaths = await import(`@rescript/${target}/paths`);
21+
} catch (err) {
22+
console.error(`Platform ${target} is not supported!`);
23+
throw err;
24+
}
2925

30-
export const rescript_tools_exe = path.join(platformDir, "rescript-tools.exe");
31-
32-
export const rescript_editor_analysis_exe = path.join(
26+
export const {
3327
platformDir,
34-
"rescript-editor-analysis.exe",
35-
);
36-
37-
export const rewatch_exe = path.join(platformDir, "rewatch.exe");
28+
bsc_exe,
29+
ninja_exe,
30+
rescript_editor_analysis_exe,
31+
rescript_tools_exe,
32+
rescript_exe,
33+
rewatch_exe,
34+
} = binPaths;

‎lib_dev/paths.js‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,23 @@ import * as path from "node:path";
77
*/
88
export const projectDir = path.resolve(import.meta.dirname, "..");
99

10+
/**
11+
* For compatibility reasons, if the architecture is x64, omit it from the bin directory name.
12+
* So we'll have "darwin", "linux" and "win32" for x64 arch,
13+
* but "darwinarm64" and "linuxarm64" for arm64 arch.
14+
* Also, we do not have Windows ARM binaries yet. But the x64 binaries do work on Windows 11 ARM.
15+
* So omit the architecture for Windows, too.
16+
*/
17+
export const platformName =
18+
process.arch === "x64" || process.platform === "win32"
19+
? process.platform
20+
: process.platform + process.arch;
21+
22+
/**
23+
* path: `<projectDir>/<platform>` (e.g. linux, darwinarm64)
24+
*/
25+
export const platformDir = path.resolve(projectDir, platformName);
26+
1027
/**
1128
* path: `<projectDir>/compiler/`
1229
*/

‎package.json‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,6 @@
5858
"CHANGELOG.md",
5959
"CREDITS.md",
6060
"ninja.COPYING",
61-
"darwin",
62-
"darwinarm64",
63-
"linux",
64-
"linuxarm64",
65-
"win32",
6661
"docs/docson/build-schema.json",
6762
"lib",
6863
"cli"
@@ -77,6 +72,13 @@
7772
"#dev/*": "./lib_dev/*.js",
7873
"#lib/minisocket": "./lib/minisocket.js"
7974
},
75+
"optionalDependencies": {
76+
"@rescript/darwin-arm64": "12.0.0-alpha.12",
77+
"@rescript/darwin-x64": "12.0.0-alpha.12",
78+
"@rescript/linux-arm64": "12.0.0-alpha.12",
79+
"@rescript/linux-x64": "12.0.0-alpha.12",
80+
"@rescript/win32-x64": "12.0.0-alpha.12"
81+
},
8082
"devDependencies": {
8183
"@biomejs/biome": "1.9.4",
8284
"@types/node": "^20.14.9",

‎packages/@rescript/darwin-arm64/bin/bsc.exe‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../../../darwinarm64/bsc.exe

‎packages/@rescript/darwin-arm64/bin/ninja.exe‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../../../darwinarm64/ninja.exe

‎packages/@rescript/darwin-arm64/bin/paths.js‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
// @ts-check
2+
3+
import * as path from "node:path";
4+
5+
export const platformDir = import.meta.dirname;
6+
7+
export const bsc_exe = path.join(platformDir, "bsc.exe");
8+
9+
export const ninja_exe = path.join(platformDir, "ninja.exe");
10+
11+
export const rescript_exe = path.join(platformDir, "rescript.exe");
12+
13+
export const rescript_tools_exe = path.join(platformDir, "rescript-tools.exe");
14+
15+
export const rescript_editor_analysis_exe = path.join(
16+
platformDir,
17+
"rescript-editor-analysis.exe",
18+
);
19+
20+
export const rewatch_exe = path.join(platformDir, "rewatch.exe");

‎packages/@rescript/darwin-arm64/bin/rescript-editor-analysis.exe‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../../../darwinarm64/rescript-editor-analysis.exe

‎packages/@rescript/darwin-arm64/bin/rescript-tools.exe‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../../../darwinarm64/rescript-tools.exe

0 commit comments

Comments
 (0)