Use tmp dir outside of destination dir

gradlex-org · Jan 31, 2024 · 7e1565f · 7e1565f
1 parent 9d23e7e
commit 7e1565f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/src/main/java/org/gradlex/javamodule/packaging/JavaModulePackagingExtension.java b/src/main/java/org/gradlex/javamodule/packaging/JavaModulePackagingExtension.java
@@ -225,6 +225,7 @@ private void registerTargetSpecificTasks(Target target, String applicationJarTas
             t.getResources().from(getResources());
 
             t.getDestination().convention(getProject().getLayout().getBuildDirectory().dir("packages/" + target.getName()));
+            t.getTempDirectory().convention(getProject().getLayout().getBuildDirectory().dir("tmp/jpackage/" + target.getName()));
         });
 
         tasks.register("run" + capitalize(target.getName()), JavaExec.class, t -> {

diff --git a/src/main/java/org/gradlex/javamodule/packaging/tasks/Jpackage.java b/src/main/java/org/gradlex/javamodule/packaging/tasks/Jpackage.java
@@ -28,6 +28,7 @@
 import org.gradle.api.tasks.Input;
 import org.gradle.api.tasks.InputDirectory;
 import org.gradle.api.tasks.InputFiles;
+import org.gradle.api.tasks.Internal;
 import org.gradle.api.tasks.Nested;
 import org.gradle.api.tasks.Optional;
 import org.gradle.api.tasks.OutputDirectory;
@@ -106,6 +107,9 @@ abstract public class Jpackage extends DefaultTask {
     @OutputDirectory
     abstract public DirectoryProperty getDestination();
 
+    @Internal
+    abstract public DirectoryProperty getTempDirectory();
+
     @Inject
     abstract protected FileOperations getFiles();
 
@@ -114,6 +118,7 @@ abstract public class Jpackage extends DefaultTask {
 
     @TaskAction
     public void runJpackage() throws Exception {
+        getFiles().delete(getTempDirectory());
         getFiles().delete(getDestination());
 
         String os = getOperatingSystem().get();
@@ -123,9 +128,8 @@ public void runJpackage() throws Exception {
 
         validateHostSystem(arch, hostArch, os, hostOs);
 
-        Directory tmpDir = getDestination().dir("tmp").get();
-        Directory resourcesDir = tmpDir.dir("jpackage-resources");
-        Directory appImageParent = tmpDir.dir("app-image");
+        Directory resourcesDir = getTempDirectory().get().dir("jpackage-resources");
+        Directory appImageParent = getTempDirectory().get().dir("app-image");
         //noinspection ResultOfMethodCallIgnored
         resourcesDir.getAsFile().mkdirs();
 
@@ -205,8 +209,6 @@ public void runJpackage() throws Exception {
                 })
         );
 
-        getFiles().delete(tmpDir);
-
         generateChecksums();
     }