This is an automated email from the ASF dual-hosted git repository. toulmean pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-tuweni.git
commit 1277717a7c332180f5acb7bfb427717d40bc292e Author: Antoine Toulme <[email protected]> AuthorDate: Mon Jun 3 10:06:55 2019 -0700 Refactor dist code --- dist/build.gradle | 41 +++++++++++++++-------------------------- 1 file changed, 15 insertions(+), 26 deletions(-) diff --git a/dist/build.gradle b/dist/build.gradle index c0db5f9..62bd44a 100644 --- a/dist/build.gradle +++ b/dist/build.gradle @@ -18,18 +18,22 @@ apply plugin: 'distribution' jar { enabled = false } +static def mandatoryFiles(CopySpec spec) { + spec.into('') { + from ".." + include 'README.md' + include 'DISCLAIMER' + include 'LICENSE' + include 'NOTICE' + } + spec.into('licenses') { from '../build/reports/license' } +} + distributions { main { baseName = 'tuweni-bin' contents { - into('') { - from ".." - include 'README.md' - include 'DISCLAIMER' - include 'LICENSE' - include 'NOTICE' - } - into('licenses') { from '../build/reports/license' } + mandatoryFiles(it) def docs = [] def libs = [] def sources = [] @@ -62,21 +66,13 @@ distributions { sources { baseName = 'tuweni-src' contents { - into('licenses') { - from '../build/reports/license' - include '*' - } + mandatoryFiles(it) into('') { from ".." include '*.md' - include 'DISCLAIMER' - include 'LICENSE' - include 'NOTICE' - include 'build.gradle' + include '*.gradle' include 'dependency-versions.gradle' - include 'settings.gradle' include 'gradle/**' - include 'gradlew' include 'gradle.properties' } rootProject.subprojects.each { @@ -88,14 +84,7 @@ distributions { gossip { baseName = 'tuweni-gossip' contents { - into('') { - from ".." - include 'README.md' - include 'DISCLAIMER' - include 'LICENSE' - include 'NOTICE' - } - into('licenses') { from '../build/reports/license' } + mandatoryFiles(it) into('bin') { from { project(':gossip').startScripts.outputs.files } fileMode = 0755 --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
