From cb9f28375907733474f163269185191282fba1ee Mon Sep 17 00:00:00 2001 From: Daniele Conti Date: Tue, 1 Aug 2023 10:07:24 +0100 Subject: [PATCH 1/2] Use task java home instead of the one in `JPackageData` --- src/main/groovy/org/beryx/runtime/JPackageImageTask.groovy | 1 + src/main/groovy/org/beryx/runtime/JPackageTask.groovy | 1 + src/main/groovy/org/beryx/runtime/data/JPackageData.groovy | 5 ----- .../groovy/org/beryx/runtime/data/JPackageTaskData.groovy | 1 + .../org/beryx/runtime/impl/JPackageImageTaskImpl.groovy | 2 +- .../groovy/org/beryx/runtime/impl/JPackageTaskImpl.groovy | 2 +- 6 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/main/groovy/org/beryx/runtime/JPackageImageTask.groovy b/src/main/groovy/org/beryx/runtime/JPackageImageTask.groovy index c9f5e1c0..8e77e425 100644 --- 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 index 6630bcfc..7b3078c3 100644 --- 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 index 39d4a437..e03834dc 100644 --- a/src/main/groovy/org/beryx/runtime/data/JPackageData.groovy +++ b/src/main/groovy/org/beryx/runtime/data/JPackageData.groovy @@ -126,11 +126,6 @@ class JPackageData { this.@installerOutputDir ?: project.file("$project.buildDir/$outputDir") } - @Internal - String getJPackageHomeOrDefault() { - return jpackageHome ?: defaultJPackageHome - } - @Internal String getDefaultJPackageHome() { def value = System.properties['badass.runtime.jpackage.home'] diff --git a/src/main/groovy/org/beryx/runtime/data/JPackageTaskData.groovy b/src/main/groovy/org/beryx/runtime/data/JPackageTaskData.groovy index 8ef939df..08c960ca 100644 --- 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 index ea49e8a6..0aa01462 100644 --- 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 { 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 index 03d13be0..26c6e171 100644 --- 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 { 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() From 9abbb5b358dc59dbf82eddd3061013b367e8619e Mon Sep 17 00:00:00 2001 From: Daniele Conti Date: Tue, 1 Aug 2023 10:09:34 +0100 Subject: [PATCH 2/2] Remove unused method --- .../org/beryx/runtime/data/JPackageData.groovy | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/src/main/groovy/org/beryx/runtime/data/JPackageData.groovy b/src/main/groovy/org/beryx/runtime/data/JPackageData.groovy index e03834dc..73190b2e 100644 --- a/src/main/groovy/org/beryx/runtime/data/JPackageData.groovy +++ b/src/main/groovy/org/beryx/runtime/data/JPackageData.groovy @@ -125,17 +125,4 @@ class JPackageData { File getInstallerOutputDirOrDefault() { this.@installerOutputDir ?: project.file("$project.buildDir/$outputDir") } - - @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') - } }