Skip to content

Commit 88d6c74

Browse files
authored
Correct the installDist output as per the original design (#163) (#165)
1 parent 83aae10 commit 88d6c74

File tree

2 files changed

+6
-9
lines changed

2 files changed

+6
-9
lines changed

build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ val installLocalDist by tasks.registering {
4040

4141
val install by tasks.registering {
4242
doLast {
43-
TODO("The 'install' task has now changes names to 'installDist', as per the common standard.")
43+
TODO("The 'install' task has been renamed to 'installDist', as per the common standard.")
4444
}
4545
}
4646

xdk/build.gradle.kts

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -140,21 +140,18 @@ distributions {
140140
distributionBaseName = xdkDist.distributionName
141141
assert(distributionBaseName.get() == "xdk") // TODO: Should really rename the distribution to "xdk" explicitly per convention.
142142
contents {
143-
// TODO: Why do we need the indirect - likely change these to lazy properties through map format.
144-
// TODO WE should really not do get() here.
145-
val resources = tasks.processResources.get().outputs.files.asFileTree
146-
logger.info("$prefix Distribution contents need to use lazy resources.")
147143
/*
148144
* 1) copy build plugin repository publication of the XTC plugin to install/xdk/repo
149145
* 2) copy xdk resources/main/xdk to install/xdk/
150146
* 3) copy javatools_launcher/bin/\* to install/xdk/bin/
151147
* 4) copy XDK modules to install/xdk/lib
152148
* 5) copy javatools.jar, turtle and bridge to install/xdk/javatools
153149
*/
154-
from(resources) {
155-
eachFile {
156-
includeEmptyDirs = false
157-
}
150+
// TODO: Why do we need the indirect - likely change these to lazy properties through map format.
151+
// TODO WE should really not do get() here.
152+
logger.info("$prefix Distribution contents need to use lazy resources.")
153+
val xdkTemplate = tasks.processResources.get().destinationDir.toString() + "/xdk/"
154+
from(xdkTemplate) {
158155
}
159156
from(xtcLauncherBinaries) {
160157
into("bin")

0 commit comments

Comments
 (0)