From b56fb4571a0620b27eaf179490c209d017e7f708 Mon Sep 17 00:00:00 2001
From: Ben Fry <ben@fathom.info>
Date: Mon, 24 Jan 2022 07:49:12 -0500
Subject: [PATCH] appbundler behaving weirdly on x64, file not updating with
 copy

---
 build/build.xml        | 9 +++------
 build/macos/.gitignore | 1 -
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/build/build.xml b/build/build.xml
index 5f00a916b..a2ccace7a 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -491,14 +491,11 @@
       <arg value="../${jdk.archive.path}"/>
     </exec>
 
-    <!-- https://github.com/processing/processing4/issues/284 -->
-    <copy file="macos/appbundler-${os.arch}.jar"
-          tofile="macos/appbundler.jar" />
-
-    <!-- app bundler for OS X and Java -->
+    <!-- Need a working fat binary of appbundler.jar.
+         https://github.com/processing/processing4/issues/284 -->
     <taskdef name="bundleapp"
              classname="com.oracle.appbundler.AppBundlerTask"
-             classpath="macos/appbundler.jar" />
+             classpath="macos/appbundler-${os.arch}.jar" />
 
     <bundleapp outputDirectory="macos/work"
                name="Processing"
diff --git a/build/macos/.gitignore b/build/macos/.gitignore
index 0f028d47f..7c7188031 100644
--- a/build/macos/.gitignore
+++ b/build/macos/.gitignore
@@ -1,3 +1,2 @@
 jdk-17*
 work
-appbundler.jar