Skip to content

Commit 9188528

Browse files
authored
Add keygen startScripts dependency for distZip and distTar; update scripts path (#855)
Adds missing task dependency to make sure that keygen artifacts (of the `startScripts` task) are available when core zip is being built. As a drive-by update the path to the artifacts to use the `outputs` property of a task, rather than hardcoded folder name.
2 parents dc661bf + 29c66b9 commit 9188528

File tree

1 file changed

+9
-1
lines changed

1 file changed

+9
-1
lines changed

core/build.gradle

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -379,6 +379,14 @@ task deb4docker(dependsOn: buildDeb) {
379379
}
380380
}
381381

382-
applicationDistribution.from(new File(project(':keygen').buildDir, "scripts")) {
382+
// This adds the `startScripts` task artifacts from the keygen subproject (i.e. app
383+
// run scripts: `keygen` and `keygen.bat`) to the "bin" folder in core's distribution.
384+
// Note that we don't need to manually add keygen jars (to "libs") - this is taken care of
385+
// by regular dependency management.
386+
applicationDistribution.from(project(":keygen").getTasksByName("startScripts", false).outputs) {
383387
into "bin"
384388
}
389+
390+
// This ensures that keygen scripts are built (and can be copied over to "bin", see above)
391+
// before we assemble core's packages.
392+
[distZip, distTar]*.mustRunAfter ":keygen:startScripts"

0 commit comments

Comments
 (0)