Feat/windows arm64 support #63
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| // Pure helpers that map a target CPU architecture to the parameters the Windows | ||
| // native-helper build needs. Kept side-effect free so it is unit-testable and | ||
| // importable from both the build script and Vitest. | ||
|
|
||
| export const SUPPORTED_ARCHES = ["x64", "arm64"]; | ||
|
|
||
| const ALIASES = new Map([ | ||
| ["x64", "x64"], | ||
| ["amd64", "x64"], | ||
| ["x86_64", "x64"], | ||
| ["arm64", "arm64"], | ||
| ["aarch64", "arm64"], | ||
| ]); | ||
|
|
||
| export function normalizeArch(value) { | ||
| if (value === undefined || value === null || value === "") { | ||
| return undefined; | ||
| } | ||
| return ALIASES.get(String(value).toLowerCase()); | ||
| } | ||
|
|
||
| export function resolveTargetArch({ cliArch, envArch, hostArch } = {}) { | ||
| for (const [label, raw] of [ | ||
| ["--arch", cliArch], | ||
| ["OPENSCREEN_WIN_HELPER_ARCH", envArch], | ||
| ]) { | ||
| if (raw !== undefined && raw !== null && raw !== "") { | ||
| const normalized = normalizeArch(raw); | ||
| if (!normalized) { | ||
| throw new Error( | ||
| `Invalid ${label} value "${raw}". Expected one of: ${SUPPORTED_ARCHES.join(", ")}.`, | ||
| ); | ||
| } | ||
| return normalized; | ||
| } | ||
| } | ||
|
|
||
| const host = normalizeArch(hostArch); | ||
| if (!host) { | ||
| throw new Error( | ||
| `Unsupported host architecture "${hostArch}". Pass --arch with one of: ${SUPPORTED_ARCHES.join(", ")}.`, | ||
| ); | ||
| } | ||
| return host; | ||
| } | ||
|
|
||
| export function resolveVcvarsArch(hostArch, targetArch) { | ||
| const host = normalizeArch(hostArch); | ||
| const target = normalizeArch(targetArch); | ||
| if (!host || !target) { | ||
| throw new Error(`Unsupported architecture pair host="${hostArch}" target="${targetArch}".`); | ||
| } | ||
| return host === target ? target : `${host}_${target}`; | ||
| } | ||
|
|
||
| export function winBinDirName(targetArch) { | ||
| const target = normalizeArch(targetArch); | ||
| if (!target) { | ||
| throw new Error(`Unsupported target architecture "${targetArch}".`); | ||
| } | ||
| return `win32-${target}`; | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,71 @@ | ||
| import { describe, expect, it } from "vitest"; | ||
| import { | ||
| SUPPORTED_ARCHES, | ||
| normalizeArch, | ||
| resolveTargetArch, | ||
| resolveVcvarsArch, | ||
| winBinDirName, | ||
| } from "./windows-helper-arch.mjs"; | ||
|
|
||
| describe("normalizeArch", () => { | ||
| it("maps known aliases to canonical arches", () => { | ||
| expect(normalizeArch("x64")).toBe("x64"); | ||
| expect(normalizeArch("amd64")).toBe("x64"); | ||
| expect(normalizeArch("x86_64")).toBe("x64"); | ||
| expect(normalizeArch("arm64")).toBe("arm64"); | ||
| expect(normalizeArch("aarch64")).toBe("arm64"); | ||
| expect(normalizeArch("ARM64")).toBe("arm64"); | ||
| }); | ||
|
|
||
| it("returns undefined for empty or unknown values", () => { | ||
| expect(normalizeArch(undefined)).toBeUndefined(); | ||
| expect(normalizeArch("")).toBeUndefined(); | ||
| expect(normalizeArch("mips")).toBeUndefined(); | ||
| }); | ||
| }); | ||
|
|
||
| describe("resolveTargetArch", () => { | ||
| it("prefers the CLI arch over env and host", () => { | ||
| expect(resolveTargetArch({ cliArch: "arm64", envArch: "x64", hostArch: "x64" })).toBe("arm64"); | ||
| }); | ||
|
|
||
| it("falls back to env when no CLI arch", () => { | ||
| expect(resolveTargetArch({ envArch: "arm64", hostArch: "x64" })).toBe("arm64"); | ||
| }); | ||
|
|
||
| it("defaults to the host arch when nothing explicit is given", () => { | ||
| expect(resolveTargetArch({ hostArch: "arm64" })).toBe("arm64"); | ||
| expect(resolveTargetArch({ hostArch: "x64" })).toBe("x64"); | ||
| }); | ||
|
|
||
| it("throws on an invalid explicit arch", () => { | ||
| expect(() => resolveTargetArch({ cliArch: "mips", hostArch: "x64" })).toThrow(/Invalid/); | ||
| }); | ||
|
|
||
| it("throws on an unsupported host with no explicit arch", () => { | ||
| expect(() => resolveTargetArch({ hostArch: "ppc64" })).toThrow(/host/i); | ||
| }); | ||
| }); | ||
|
|
||
| describe("resolveVcvarsArch", () => { | ||
| it("returns native tokens when host equals target", () => { | ||
| expect(resolveVcvarsArch("x64", "x64")).toBe("x64"); | ||
| expect(resolveVcvarsArch("arm64", "arm64")).toBe("arm64"); | ||
| }); | ||
|
|
||
| it("returns cross tokens as <host>_<target>", () => { | ||
| expect(resolveVcvarsArch("x64", "arm64")).toBe("x64_arm64"); | ||
| expect(resolveVcvarsArch("arm64", "x64")).toBe("arm64_x64"); | ||
| }); | ||
| }); | ||
|
|
||
| describe("winBinDirName", () => { | ||
| it("builds the packaged bin folder name", () => { | ||
| expect(winBinDirName("x64")).toBe("win32-x64"); | ||
| expect(winBinDirName("arm64")).toBe("win32-arm64"); | ||
| }); | ||
| }); | ||
|
|
||
| it("exposes the supported arch list", () => { | ||
| expect(SUPPORTED_ARCHES).toEqual(["x64", "arm64"]); | ||
| }); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Dispatch input
arch:is now misleading. Thisarch: [x64, arm64]matrix here is the right shape. But the dispatch inputarch:(around line 9, not in this diff) is consumed only by the macOS matrix expression at line 103. The Windows matrix is hardcoded toarch: [x64, arm64]regardless. So:arch=arm64will only build the macOS arm64 leg, leaving Windows builds untouched.Either rename to
macos_arch:and document the scope, or wire this input into the Windows matrix too (matching the macOS shape). Recommend the former — Windows builds are better off always running both arches on tag pushes.