Correct the installDist output as per the original design (#163) (#165)

xtclang · Feb 27, 2024 · 88d6c74 · 88d6c74
1 parent 83aae10
commit 88d6c74
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -40,7 +40,7 @@ val installLocalDist by tasks.registering {
 
 val install by tasks.registering {
     doLast {
-        TODO("The 'install' task has now changes names to 'installDist', as per the common standard.")
+        TODO("The 'install' task has been renamed to 'installDist', as per the common standard.")
     }
 }
 

diff --git a/xdk/build.gradle.kts b/xdk/build.gradle.kts
@@ -140,21 +140,18 @@ distributions {
         distributionBaseName = xdkDist.distributionName
         assert(distributionBaseName.get() == "xdk") // TODO: Should really rename the distribution to "xdk" explicitly per convention.
         contents {
-            // TODO: Why do we need the indirect - likely change these to lazy properties through map format.
-            // TODO WE should really not do get() here.
-            val resources = tasks.processResources.get().outputs.files.asFileTree
-            logger.info("$prefix Distribution contents need to use lazy resources.")
             /*
              * 1) copy build plugin repository publication of the XTC plugin to install/xdk/repo
              * 2) copy xdk resources/main/xdk to install/xdk/
              * 3) copy javatools_launcher/bin/\* to install/xdk/bin/
              * 4) copy XDK modules to install/xdk/lib
              * 5) copy javatools.jar, turtle and bridge to install/xdk/javatools
              */
-            from(resources) {
-                eachFile {
-                    includeEmptyDirs = false
-                }
+            // TODO: Why do we need the indirect - likely change these to lazy properties through map format.
+            // TODO WE should really not do get() here.
+            logger.info("$prefix Distribution contents need to use lazy resources.")
+            val xdkTemplate = tasks.processResources.get().destinationDir.toString() + "/xdk/"
+            from(xdkTemplate) {
             }
             from(xtcLauncherBinaries) {
                 into("bin")