macos support (#1185)

Author: Frotty

.github/workflows/build.yml

@@ -21,7 +21,7 @@ jobs:
         shell: bash
         run: |
           if [[ "${{ github.event_name }}" == "push" ]]; then
-            echo 'matrix={"include":[{"os":"ubuntu-latest"},{"os":"windows-latest"},{"os":"macos-13"},{"os":"macos-14"}]}' >> "$GITHUB_OUTPUT"
+            echo 'matrix={"include":[{"os":"ubuntu-latest"},{"os":"windows-latest"},{"os":"macos-latest"},{"os":"macos-15-intel"}]}' >> "$GITHUB_OUTPUT"
           else
             echo 'matrix={"include":[{"os":"ubuntu-latest"},{"os":"windows-latest"}]}' >> "$GITHUB_OUTPUT"
           fi
@@ -107,6 +107,13 @@ jobs:
             chmod +x src/test/resources/lua53
           fi
 
+      - name: Install Lua compiler (macOS)
+        if: runner.os == 'macOS'
+        env:
+          HOMEBREW_NO_AUTO_UPDATE: '1'
+        shell: bash
+        run: brew install lua
+
       - name: Run tests
         shell: bash
         run: ./gradlew test --no-daemon --stacktrace
@@ -169,7 +176,7 @@ jobs:
           zips=(upload/*.zip)
           echo "Found ${#zips[@]} zip(s):"; ls -alh upload
           if (( ${#zips[@]} < 4 )); then
-            echo "ERROR: expected Win + Linux + macOS x64 + macOS arm64 zips (got ${#zips[@]})."
+            echo "ERROR: expected Win + Linux + macOS arm64 + macOS x64 zips (got ${#zips[@]})."
             exit 1
           fi
 

de.peeeq.wurstscript/deploy.gradle

@@ -185,12 +185,24 @@ tasks.register("jlinkRuntime25", Exec) {
 
 // 3) Assemble folder layout: jre + compiler.jar (no manifest)
 tasks.register("assembleSlimCompilerDist", Copy) {
-    description = "Assembles dist folder with slim JRE and compiler.jar (no manifest)."
+    description = "Assembles dist folder with JRE and compiler.jar (no manifest)."
     group = "distribution"
-    dependsOn("jlinkRuntime25", "shadowJar")
 
-    from(jreImageDir) { into("wurst-runtime") }
-    from(fatJar)      { into("wurst-compiler") }
+    if (os.isMacOsX()) {
+        // On macOS, skip jlink entirely. Copying the original Temurin JDK preserves
+        // Apple's codesignatures on dylibs/executables, which jlink would invalidate.
+        // jmods/ (jlink inputs, ~150 MB) and include/ (C headers) are dev-only.
+        dependsOn("shadowJar")
+        from(javaHomeProvider) {
+            into("wurst-runtime")
+            exclude("jmods/**", "include/**")
+        }
+    } else {
+        dependsOn("jlinkRuntime25", "shadowJar")
+        from(jreImageDir) { into("wurst-runtime") }
+    }
+
+    from(fatJar) { into("wurst-compiler") }
     into(distRoot)
 
     doLast {

de.peeeq.wurstscript/src/main/java/de/peeeq/wurstio/languageserver/requests/RunMap.java

@@ -225,6 +225,11 @@ private Path getCustomMapDataPath() {
             return Paths.get(customMapDataPath);
         }
 
+        if (Orient.isMacSystem()) {
+            return Paths.get(System.getProperty("user.home"),
+                "Library", "Application Support", "Blizzard", "Warcraft III", "CustomMapData");
+        }
+
         Path documents;
         try {
             documents = FileSystemView.getFileSystemView().getDefaultDirectory().toPath();
@@ -308,11 +313,17 @@ private Optional<String> findMapDocumentPath(String testMapName, File myDocument
 
         if (!new File(documentPath.get()).exists()) {
             WLogger.info("Warcraft folder " + documentPath + " does not exist.");
-            // Try wine default:
-            documentPath = Optional.of(System.getProperty("user.home")
-                + "/.wine/drive_c/users/" + System.getProperty("user.name") + "/My Documents/Warcraft III");
+            if (Orient.isMacSystem()) {
+                // macOS 1.29+: ~/Library/Application Support/Blizzard/Warcraft III
+                documentPath = Optional.of(System.getProperty("user.home")
+                    + "/Library/Application Support/Blizzard/Warcraft III");
+            } else {
+                // Linux: try Wine default path
+                documentPath = Optional.of(System.getProperty("user.home")
+                    + "/.wine/drive_c/users/" + System.getProperty("user.name") + "/My Documents/Warcraft III");
+            }
             if (!new File(documentPath.get()).exists()) {
-                WLogger.severe("Severe: Wine Warcraft folder " + documentPath + " does not exist.");
+                WLogger.severe("Severe: Warcraft folder " + documentPath + " does not exist.");
             }
         }
 

de.peeeq.wurstscript/src/main/java/de/peeeq/wurstio/utils/W3InstallationData.java

@@ -59,16 +59,12 @@ public W3InstallationData(WurstLanguageServer languageServer, boolean shouldAskF
     public W3InstallationData(WurstLanguageServer languageServer, File wc3Path, boolean shouldAskForPath) {
         this.languageServer = languageServer;
         this.shouldAskForPath = shouldAskForPath;
-        if (!Orient.isWindowsSystem()) {
-            WLogger.warning("Game path configuration only works on windows");
-            discoverExePath();
-            discoverVersion();
-            return;
-        }
 
-        loadFromPath(wc3Path);
+        if (Orient.isWindowsSystem() || Orient.isMacSystem()) {
+            loadFromPath(wc3Path);
+        }
 
-        if (!gameExe.isPresent()) {
+        if (!gameExe.isPresent() || !version.isPresent()) {
             WLogger.warning("The provided wc3 path wasn't suitable. Falling back to discovery.");
             discoverExePath();
             discoverVersion();
@@ -77,7 +73,19 @@ public W3InstallationData(WurstLanguageServer languageServer, File wc3Path, bool
 
     private void loadFromPath(File wc3Path) {
         try {
-            gameExe = Optional.ofNullable(WinGameExeFinder.fromDirIgnoreVersion(wc3Path));
+            if (Orient.isWindowsSystem()) {
+                gameExe = Optional.ofNullable(WinGameExeFinder.fromDirIgnoreVersion(wc3Path));
+            } else if (Orient.isMacSystem()) {
+                // WC3 Reforged on macOS: <installDir>/x86_64/Warcraft III.app/Contents/MacOS/Warcraft III
+                // Older layout:           <installDir>/Warcraft III.app/Contents/MacOS/Warcraft III
+                File x64 = new File(wc3Path, "x86_64/Warcraft III.app/Contents/MacOS/Warcraft III");
+                File x32 = new File(wc3Path, "Warcraft III.app/Contents/MacOS/Warcraft III");
+                if (x64.exists()) {
+                    gameExe = Optional.of(x64);
+                } else if (x32.exists()) {
+                    gameExe = Optional.of(x32);
+                }
+            }
         } catch (NotFoundException e) {
             WLogger.severe(e);
         }