handle mac14

Author: dpomier

.github/workflows/ci.yml

@@ -550,12 +550,19 @@ jobs:
           opam config exec -- make -s -j`sysctl -n hw.ncpu` STATICLINK=1 "LIB_PARAMS=/usr/local/lib/libz.a /usr/local/lib/libpcre2-8.a /usr/local/lib/libmbedtls.a /usr/local/lib/libmbedcrypto.a /usr/local/lib/libmbedx509.a -cclib '-framework Security -framework CoreFoundation'" PLUGIN=ecso plugin
           make -s package_unix package_installer_mac
           mkdir ./plugins/ecso/cmxs/hx-4.3.7
-          mv ./plugins/ecso/cmxs/Mac ./plugins/ecso/cmxs/hx-4.3.7
-          otool -L ./plugins/ecso/cmxs/hx-4.3.7/Mac/plugin.cmxs
+          mv ./plugins/ecso/cmxs/Mac${{ matrix.os == 'macos-14' && '-arm64' || '' }} ./plugins/ecso/cmxs/hx-4.3.7
+          otool -L ./plugins/ecso/cmxs/hx-4.3.7/Mac${{ matrix.os == 'macos-14' && '-arm64' || '' }}/plugin.cmxs
           ls -l out
           otool -L ./haxe
           otool -L ./haxelib
 
+      - name: Upload Ecso
+        uses: actions/upload-artifact@v4
+        with:
+          name: ecso
+          path: plugins/ecso/**/*.cmxs
+          if-no-files-found: error
+
       - name: Upload artifact (x64)
         if: runner.arch == 'X64'
         uses: actions/upload-artifact@v4
@@ -889,6 +896,7 @@ jobs:
 
   mac-test-4-3-7:
     name: Haxe 4.3.7 / mac-test
+    needs: mac-build-4-3-7
     runs-on: macos-latest
     continue-on-error: ${{matrix.target == 'jvm'}}
     env:

.github/workflows/release.yml

@@ -509,10 +509,17 @@ jobs:
           opam config exec -- make -s -j`sysctl -n hw.ncpu` STATICLINK=1 "LIB_PARAMS=/usr/local/lib/libz.a /usr/local/lib/libpcre2-8.a /usr/local/lib/libmbedtls.a /usr/local/lib/libmbedcrypto.a /usr/local/lib/libmbedx509.a -cclib '-framework Security -framework CoreFoundation'" PLUGIN=ecso plugin
           mkdir ./out
           mkdir ./plugins/ecso/cmxs/hx-4.3.7
-          mv ./plugins/ecso/cmxs/Mac ./plugins/ecso/cmxs/hx-4.3.7
-          otool -L ./plugins/ecso/cmxs/hx-4.3.7/Mac/plugin.cmxs
+          mv ./plugins/ecso/cmxs/Mac${{ matrix.os == 'macos-14' && '-arm64' || '' }} ./plugins/ecso/cmxs/hx-4.3.7
+          otool -L ./plugins/ecso/cmxs/hx-4.3.7/Mac${{ matrix.os == 'macos-14' && '-arm64' || '' }}/plugin.cmxs
           ls -l out
 
+      - name: Upload Ecso
+        uses: actions/upload-artifact@v4
+        with:
+          name: ecso
+          path: plugins/ecso/**/*.cmxs
+          if-no-files-found: error
+
       - name: Upload artifact (x64)
         if: runner.arch == 'X64'
         uses: actions/upload-artifact@v4
@@ -870,7 +877,7 @@ jobs:
 
   mac-test-4-3-7:
     name: Haxe 4.3.7 / mac-test
-    needs: mac-build-universal
+    needs: mac-build-4-3-7
     runs-on: macos-14.7.5
     env:
       PLATFORM: mac

hx/ecso/_core/Plugin.macro.hx

@@ -39,6 +39,10 @@ class Plugin {
 						'Haxe 32-bit is not yet supported, make sure to use an official 64-bit version of Haxe from https://haxe.org/download/.';
 					case "Linux":
 						'On Linux distributions, the installed Haxe package may not be supported by Ecso, make sure to use the official Linux Haxe Binaries from https://haxe.org/download/.';
+					case "Mac":
+						tryArm = true;
+						if (sys.FileSystem.exists(getPluginPath()))
+							return get_plugin();
 					case _:
 						null;
 				}
@@ -51,6 +55,7 @@ class Plugin {
 		}
 	}
 	static var try32 = false;
+	static var tryArm = false;
 	static function getPluginPath():String {
 		final here = ((?p:PosInfos) -> p.fileName)();
 		final src = here.directory().directory().directory().directory();
@@ -61,6 +66,8 @@ class Plugin {
 		return switch Sys.systemName() {
 			case "Windows":
 				'Windows${try32 ? "32" : "64"}';
+			case "Mac":
+				'Mac${tryArm ? "-arm64" : ""}';
 			case s:
 				s;
 		}