Merge pull request #143 from fourlastor-forks/java-home-package-task

Use `BaseTask` java home in jpackage tasks
beryx · Oct 10, 2023 · bec21b3 · bec21b3
2 parents 862f6ea + 9abbb5b
commit bec21b3
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 20 deletions.
diff --git a/src/main/groovy/org/beryx/runtime/JPackageImageTask.groovy b/src/main/groovy/org/beryx/runtime/JPackageImageTask.groovy
@@ -67,6 +67,7 @@ class JPackageImageTask extends BaseTask {
         def taskData = new JPackageTaskData()
         taskData.distDir = distDir.asFile
         taskData.jpackageData = jpackageData
+        taskData.javaHome = javaHomeOrDefault
 
         def jreTask = (JreTask) project.tasks.getByName(RuntimePlugin.TASK_NAME_JRE)
         taskData.configureRuntimeImageDir(jreTask)

diff --git a/src/main/groovy/org/beryx/runtime/JPackageTask.groovy b/src/main/groovy/org/beryx/runtime/JPackageTask.groovy
@@ -43,6 +43,7 @@ class JPackageTask extends BaseTask {
     void jpackageTaskAction() {
         def taskData = new JPackageTaskData()
         taskData.jpackageData = jpackageData
+        taskData.javaHome = javaHomeOrDefault
         taskData.configureAppImageDir()
 
         def taskImpl = new JPackageTaskImpl(project, taskData)

diff --git a/src/main/groovy/org/beryx/runtime/data/JPackageData.groovy b/src/main/groovy/org/beryx/runtime/data/JPackageData.groovy
@@ -125,22 +125,4 @@ class JPackageData {
     File getInstallerOutputDirOrDefault() {
         this.@installerOutputDir ?: project.file("$project.buildDir/$outputDir")
     }
-
-    @Internal
-    String getJPackageHomeOrDefault() {
-        return jpackageHome ?: defaultJPackageHome
-    }
-
-    @Internal
-    String getDefaultJPackageHome() {
-        def value = System.properties['badass.runtime.jpackage.home']
-        if(value) return value
-        value = System.getenv('BADASS_RUNTIME_JPACKAGE_HOME')
-        if(value) return value
-        value = Util.getDefaultToolchainJavaHome(project)
-        if(value) return value
-        value = System.properties['java.home']
-        if(new File("$value/bin/jpackage$EXEC_EXTENSION").file) return value
-        return System.getenv('JAVA_HOME')
-    }
 }
diff --git a/src/main/groovy/org/beryx/runtime/data/JPackageTaskData.groovy b/src/main/groovy/org/beryx/runtime/data/JPackageTaskData.groovy
@@ -35,6 +35,7 @@ class JPackageTaskData {
     File appImageDir
 
     JPackageData jpackageData
+    String javaHome
 
     void configureAppImageDir() {
         final def imgOutDir = jpackageData.imageOutputDirOrDefault

diff --git a/src/main/groovy/org/beryx/runtime/impl/JPackageImageTaskImpl.groovy b/src/main/groovy/org/beryx/runtime/impl/JPackageImageTaskImpl.groovy
@@ -50,7 +50,7 @@ class JPackageImageTaskImpl extends BaseTaskImpl<JPackageTaskData> {
             def outputDir = jpd.imageOutputDirOrDefault
             project.delete(outputDir)
 
-            def jpackageExec = "${jpd.getJPackageHomeOrDefault()}/bin/jpackage$EXEC_EXTENSION"
+            def jpackageExec = "${td.javaHome}/bin/jpackage$EXEC_EXTENSION"
             Util.checkExecutable(jpackageExec)
 
             def inputSuffix = project.tasks.findByName('installShadowDist') ? '-shadow' : ''

diff --git a/src/main/groovy/org/beryx/runtime/impl/JPackageTaskImpl.groovy b/src/main/groovy/org/beryx/runtime/impl/JPackageTaskImpl.groovy
@@ -62,7 +62,7 @@ class JPackageTaskImpl extends BaseTaskImpl<JPackageTaskData> {
                 project.ext.jpackageInstallerOutput = {
                     return standardOutput.toString()
                 }
-                def jpackageExec = "${jpd.getJPackageHomeOrDefault()}/bin/jpackage$EXEC_EXTENSION"
+                def jpackageExec = "${td.javaHome}/bin/jpackage$EXEC_EXTENSION"
                 Util.checkExecutable(jpackageExec)
 
                 def appVersion = (jpd.appVersion ?: project.version).toString()