diff --git a/build.gradle.kts b/build.gradle.kts index 4c5128d623..f4ae7613a7 100644 --- 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 index 49ce68ffa5..3a34650118 100644 --- a/xdk/build.gradle.kts +++ b/xdk/build.gradle.kts @@ -140,10 +140,6 @@ 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/ @@ -151,10 +147,11 @@ distributions { * 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")