De-hardcode natives build process Part 6

Legacy-Fabric · May 28, 2024 · 2a07362 · 2a07362
1 parent 482c08c
commit 2a07362
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/.github/workflows/build_or_publish.yml b/.github/workflows/build_or_publish.yml
@@ -11,7 +11,7 @@ jobs:
             arch: x86
             java_arch: x86
             msvc_arch: amd64_x86
-            args: -Dtarget.arch=x86
+            args: -DtargetArch=x86
           - os: windows-2022
             arch: x64
             msvc_arch: amd64
@@ -21,7 +21,7 @@ jobs:
             msvc_arch: amd64_arm64
             extra_java: 17
             vendor: zulu
-            args: -Dtarget.java.home="$JAVA_HOME_17_ARM64" -Dtarget.arch=arm64
+            args: -DtargetJavaHome="$JAVA_HOME_17_ARM64" -DtargetArch=arm64
           - os: macos-13
             arch: x64
             args: -Dtarget.java.home="$JAVA_HOME_8_X64"

diff --git a/gradle/windows.gradle b/gradle/windows.gradle
@@ -1,13 +1,9 @@
 def ENV = System.getenv()
 
 def os_arch = getArch(System.getProperty("os.arch"))
-def target_arch = getArch(System.getProperty("target.arch", os_arch))
+def target_arch = getArch(System.getProperty("targetArch", os_arch))
 
-def java_home = System.getProperty("target.java.home", System.getProperty("java.home"))
-
-if (ENV.ARCHITECTURE && target_arch == "aarch64") {
-    java_home = ENV.JAVA_HOME_17_ARM64 + "/jre"
-}
+def java_home = System.getProperty("targetJavaHome", System.getProperty("java.home"))
 
 def sdkhome = ENV.VCToolsInstallDir ? ENV.VCToolsInstallDir : ENV.MSVC
 def sdkhomelib = sdkhome + "/lib/x64"