Add configuration option for target-specific resources

Author: jjohannes

src/main/java/org/gradlex/javamodule/packaging/JavaModulePackagingExtension.java

@@ -18,6 +18,7 @@
 
 import org.gradle.api.Action;
 import org.gradle.api.NamedDomainObjectContainer;
+import org.gradle.api.NamedDomainObjectSet;
 import org.gradle.api.NonNullApi;
 import org.gradle.api.Project;
 import org.gradle.api.Task;
@@ -115,6 +116,16 @@ public Target target(String label, Action<? super Target> action) {
         return target;
     }
 
+    /**
+     * Configure all targets for the given OS.
+     */
+    @SuppressWarnings("unused")
+    public void targetsWithOs(String operatingSystem, Action<? super Target> action) {
+        NamedDomainObjectSet<Target> matches = targets.matching(t ->
+                t.getOperatingSystem().isPresent() && t.getOperatingSystem().get().equals(operatingSystem));
+        matches.all(action);
+    }
+
     /**
      * Set a 'primary target'. Standard Gradle tasks that are not bound to a specific target – like 'assemble' – use
      * this 'primary target'.
@@ -138,6 +149,7 @@ public Target primaryTarget(Target target) {
     /**
      * Set a test suite to be 'multi-target'. This registers an additional 'test' task for each target.
      */
+    @SuppressWarnings({"unused", "UnstableApiUsage"})
     public TestSuite multiTargetTestSuite(TestSuite testSuite) {
         if (!(testSuite instanceof JvmTestSuite)) {
             return testSuite;
@@ -246,6 +258,7 @@ private void registerTargetSpecificTasks(Target target, String applicationJarTas
             t.getOptions().convention(target.getOptions());
             t.getPackageTypes().convention(target.getPackageTypes());
             t.getResources().from(getResources());
+            t.getTargetResources().from(target.getTargetResources());
             t.getVerbose().convention(getVerbose());
 
             t.getDestination().convention(getProject().getLayout().getBuildDirectory().dir("packages/" + target.getName()));
@@ -264,7 +277,7 @@ private void registerTargetSpecificTasks(Target target, String applicationJarTas
 
         String targetAssembleLifecycle = "assemble" + capitalize(target.getName());
         if (!tasks.getNames().contains(targetAssembleLifecycle)) {
-            TaskProvider<Task> lifecycleTask = tasks.register(targetAssembleLifecycle, t -> {
+            tasks.register(targetAssembleLifecycle, t -> {
                 t.setGroup(BUILD_GROUP);
                 t.setDescription("Builds this project for " + target.getName());
             });

src/main/java/org/gradlex/javamodule/packaging/JavaModulePackagingPlugin.java

@@ -50,5 +50,14 @@ public void apply(Project project) {
         javaModulePackaging.getJpackageResources().convention(project.provider(() ->
                 project.getLayout().getProjectDirectory().dir(mainResources.getSrcDirs().iterator().next().getParent() + "/resourcesPackage")));
         javaModulePackaging.getVerbose().convention(false);
+
+        configureConventionsForCurrentHost();
+    }
+
+    private void configureConventionsForCurrentHost() {
+        // A few conveniences for local development
+        
+
+
     }
 }

src/main/java/org/gradlex/javamodule/packaging/model/Target.java

@@ -16,6 +16,7 @@
 
 package org.gradlex.javamodule.packaging.model;
 
+import org.gradle.api.file.ConfigurableFileCollection;
 import org.gradle.api.provider.ListProperty;
 import org.gradle.api.provider.Property;
 
@@ -31,6 +32,8 @@ abstract public class Target {
     abstract public ListProperty<String> getPackageTypes();
     abstract public ListProperty<String> getOptions();
 
+    abstract public ConfigurableFileCollection getTargetResources();
+
     @Inject
     public Target(String name) {
         this.name = name;

src/main/java/org/gradlex/javamodule/packaging/tasks/Jpackage.java

@@ -88,6 +88,10 @@ abstract public class Jpackage extends DefaultTask {
     @PathSensitive(PathSensitivity.RELATIVE)
     abstract public ConfigurableFileCollection getResources();
 
+    @InputFiles
+    @PathSensitive(PathSensitivity.RELATIVE)
+    abstract public ConfigurableFileCollection getTargetResources();
+
     @Input
     @Optional
     abstract public Property<String> getVendor();
@@ -193,19 +197,20 @@ public void runJpackage() throws Exception {
         });
 
         File appImageFolder = requireNonNull(appImageParent.getAsFile().listFiles())[0];
-        File appResourcesFolder;
+        File appRootFolder;
         if (os.contains("macos")) {
-            appResourcesFolder  = new File(appImageFolder, "Contents/app");
+            appRootFolder  = new File(appImageFolder, "Contents");
         } else if (os.contains("windows")) {
-            appResourcesFolder  = new File(appImageFolder, "app");
+            appRootFolder  = appImageFolder;
         } else {
-            appResourcesFolder  = new File(appImageFolder, "lib/app");
+            appRootFolder  = new File(appImageFolder, "lib");
         }
 
         // copy additional resource into app-image folder
         getFiles().copy(c -> {
-            c.from(getResources());
-            c.into(appResourcesFolder);
+            c.into(appRootFolder);
+            c.from(getTargetResources());
+            c.from(getResources(), to -> to.into("app")); // 'app' is the folder Java loads resources from at runtime
         });
 
         // package with additional resources