From 64847c2adb553717723a35df7a9fc439f24795a5 Mon Sep 17 00:00:00 2001
From: Sean Reilly <sreilly@infinitekind.com>
Date: Mon, 9 May 2022 23:03:44 +0100
Subject: [PATCH 1/4] allow building with all java 9 and higher; don't require
 9 specifically

---
 release/build-common.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/release/build-common.xml b/release/build-common.xml
index bde80be..e38b844 100644
--- a/release/build-common.xml
+++ b/release/build-common.xml
@@ -9,7 +9,6 @@
     <!-- A Java 9 or later compiler is required -->
 
     <exec executable="java_home" outputproperty="jdk">
-        <arg value="-F"/>
         <arg value="-v"/>
         <arg value="9+"/>
     </exec>

From 376ceb2651a447008530e9c1f3f301f82c7d5138 Mon Sep 17 00:00:00 2001
From: Sean Reilly <sreilly@infinitekind.com>
Date: Mon, 9 May 2022 23:07:28 +0100
Subject: [PATCH 2/4] fix path to to JavaRuntimeSupport, and reorder frameworks
 in build path

---
 release/build-common.xml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/release/build-common.xml b/release/build-common.xml
index e38b844..234dd8e 100644
--- a/release/build-common.xml
+++ b/release/build-common.xml
@@ -194,13 +194,14 @@
                     <arg value="Cocoa"/>
                     <arg line="${additional.jni.frameworks}"/>
 
-                    <arg value="-F/${SDKroot}/System/Library/Frameworks/JavaVM.framework/Versions/A/Frameworks"/>
-                    <arg value="-framework"/>
-                    <arg value="JavaRuntimeSupport"/>
                     <arg value="-F${JNFdir}"/>
                     <arg value="-framework"/>
                     <arg value="JavaNativeFoundation"/>
 
+                    <arg value="-F${SDKroot}/System/Library/Frameworks"/>
+                    <arg value="-framework"/>
+                    <arg value="JavaRuntimeSupport"/>
+
                     <arg value="-install_name"/>
                     <arg value="${jniname}.dylib"/>
 

From e44da2bd054ace3b9cc6b5877be5bdb0919a2cd4 Mon Sep 17 00:00:00 2001
From: Sean Reilly <sreilly@infinitekind.com>
Date: Mon, 9 May 2022 23:10:01 +0100
Subject: [PATCH 3/4] extend comment for JavaNativeFoundation framework in
 build file

---
 release/build-common.xml | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/release/build-common.xml b/release/build-common.xml
index 234dd8e..cb685eb 100644
--- a/release/build-common.xml
+++ b/release/build-common.xml
@@ -44,10 +44,14 @@
     <property name="cc" value="/usr/bin/cc"/>
     <property name="lipo" location="/usr/bin/lipo"/>
 
-    <!-- Note: open source JavaNativeFoundation is required to build for arm, see https://github.com/apple/openjdk -->
-
-    <property name="JNFdir" location="${SDKroot}/System/Library/Frameworks/JavaVM.framework/Versions/A/Frameworks"/>
-
+    <!-- 
+      JNFdir specifies the location of Apple's JavaNativeFoundation.framework which can be acquired 
+      at https://github.com/apple/openjdk/tree/xcodejdk14-release/apple/JavaNativeFoundation
+      Build it using Xcode and place the resulting JavaNativeFoundation.framework in the lib folder,
+      or override the JNFdir property to point to a folder that contains your own build of the framework.
+    -->
+    <property name="JNFdir" location="${base}/lib/"/>
+    
     <property name="debug" value="false"/>
     <property name="debugoption" value=""/>
 

From 62fce5777ea4fd5c03cdaf8f58d6af3be3b50456 Mon Sep 17 00:00:00 2001
From: Sean Reilly <sreilly@infinitekind.com>
Date: Sat, 21 May 2022 09:13:22 +0100
Subject: [PATCH 4/4] return to using nested framework for JavaRuntimeSupport

---
 release/build-common.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/release/build-common.xml b/release/build-common.xml
index cb685eb..6924a03 100644
--- a/release/build-common.xml
+++ b/release/build-common.xml
@@ -198,14 +198,14 @@
                     <arg value="Cocoa"/>
                     <arg line="${additional.jni.frameworks}"/>
 
+                    <arg value="-F${SDKroot}/System/Library/Frameworks/JavaVM.framework/Versions/Current/Frameworks"/>
+                    <arg value="-framework"/>
+                    <arg value="JavaRuntimeSupport"/>
+                    
                     <arg value="-F${JNFdir}"/>
                     <arg value="-framework"/>
                     <arg value="JavaNativeFoundation"/>
-
-                    <arg value="-F${SDKroot}/System/Library/Frameworks"/>
-                    <arg value="-framework"/>
-                    <arg value="JavaRuntimeSupport"/>
-
+                    
                     <arg value="-install_name"/>
                     <arg value="${jniname}.dylib"/>