reenable -PskipIndy for installGroovy task plus add support for -PskipGrooid
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/9d5c058f Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/9d5c058f Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/9d5c058f Branch: refs/heads/GROOVY_2_5_X Commit: 9d5c058faa4442dda6ba86e178dd6640057b5ea6 Parents: 5ccff7c Author: paulk <pa...@asert.com.au> Authored: Fri Feb 23 20:05:58 2018 +1000 Committer: paulk <pa...@asert.com.au> Committed: Fri Feb 23 20:16:40 2018 +1000 ---------------------------------------------------------------------- gradle/assemble.gradle | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/groovy/blob/9d5c058f/gradle/assemble.gradle ---------------------------------------------------------------------- diff --git a/gradle/assemble.gradle b/gradle/assemble.gradle index 520239f..4aac29c 100644 --- a/gradle/assemble.gradle +++ b/gradle/assemble.gradle @@ -370,15 +370,19 @@ ext.distSpec = copySpec { } } } - into('indy') { - from jarjarWithIndy - from modules()*.jarjarWithIndy - } - into('grooid') { - from { new File(jar.archivePath.parent, "${jar.baseName}-${jar.version}-grooid.jar") } - from { - modules()*.jar.collect { j -> - new File(j.archivePath.parent, "${j.baseName}-${j.version}-grooid.jar") + if (!rootProject.hasProperty('skipIndy')) { + into('indy') { + from jarjarWithIndy + from modules()*.jarjarWithIndy + } + } + if (!rootProject.hasProperty('skipGrooid')) { + into('grooid') { + from { new File(jar.archivePath.parent, "${jar.baseName}-${jar.version}-grooid.jar") } + from { + modules()*.jar.collect { j -> + new File(j.archivePath.parent, "${j.baseName}-${j.version}-grooid.jar") + } } } }
