Skip to content

Commit 0f1b3be

Browse files
authored
Merge pull request #435 from DropSnorz/feat/arm64ec
Add arm64ec support
2 parents 5f66d81 + d95e37d commit 0f1b3be

2 files changed

Lines changed: 12 additions & 3 deletions

File tree

owlplug-client/src/main/java/com/owlplug/core/components/RuntimePlatformResolver.java

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,14 @@ public class RuntimePlatformResolver {
3737

3838
public RuntimePlatformResolver() {
3939

40-
RuntimePlatform winX86 = new RuntimePlatform("win-x32", OperatingSystem.WIN, "x32", new String[]{"win32"});
41-
platforms.add(winX86);
40+
RuntimePlatform winX32 = new RuntimePlatform("win-x32", OperatingSystem.WIN, "x32", new String[]{"win32"});
41+
platforms.add(winX32);
4242
RuntimePlatform winX64 = new RuntimePlatform("win-x64", OperatingSystem.WIN, "x64", new String[]{"win64"});
4343
platforms.add(winX64);
44+
RuntimePlatform winArm64 = new RuntimePlatform("win-arm64", OperatingSystem.WIN, "arm64");
45+
platforms.add(winArm64);
46+
RuntimePlatform winArm64ec = new RuntimePlatform("win-arm64ec", OperatingSystem.WIN, "arm64ec");
47+
platforms.add(winArm64ec);
4448
RuntimePlatform macX64 = new RuntimePlatform("mac-x64", OperatingSystem.MAC, "x64");
4549
platforms.add(macX64);
4650
RuntimePlatform macArm64 = new RuntimePlatform("mac-arm64", OperatingSystem.MAC, "arm64");
@@ -54,7 +58,8 @@ public RuntimePlatformResolver() {
5458
RuntimePlatform linuxArm64 = new RuntimePlatform("linux-arm64", OperatingSystem.LINUX, "arm64");
5559
platforms.add(linuxArm64);
5660

57-
winX64.getCompatiblePlatforms().add(winX86);
61+
winX64.getCompatiblePlatforms().add(winX32);
62+
winArm64ec.getCompatiblePlatforms().add(winX64);
5863
linuxX64.getCompatiblePlatforms().add(linuxX86);
5964
linuxArm64.getCompatiblePlatforms().add(linuxArm86);
6065

@@ -95,6 +100,8 @@ private String resolveArchitecture() {
95100
return "arm64";
96101
} else if (arch.matches("^(arm|arm32)$")) {
97102
return "arm32";
103+
} else if (arch.matches("^(arm64ec)$")) {
104+
return "arm64ec";
98105
} else {
99106
return "unknown";
100107
}

owlplug-client/src/main/java/com/owlplug/explore/controllers/ExploreController.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,8 @@ public void initialize() {
166166

167167
targetFilterCheckBoxes.put("win-x32", new CheckBox("Windows x32"));
168168
targetFilterCheckBoxes.put("win-x64", new CheckBox("Windows x64"));
169+
targetFilterCheckBoxes.put("win-arm64", new CheckBox("Windows arm64"));
170+
targetFilterCheckBoxes.put("win-arm64ec", new CheckBox("Windows arm64 E.C."));
169171
targetFilterCheckBoxes.put("mac-x64", new CheckBox("MacOS x64"));
170172
targetFilterCheckBoxes.put("mac-arm64", new CheckBox("MacOS arm64"));
171173
targetFilterCheckBoxes.put("linux-x32", new CheckBox("Linux x32 / amd32"));

0 commit comments

Comments
 (0)