You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by cc...@apache.org on 2017/12/12 22:07:50 UTC
[07/20] groovy git commit: Fix Groovy distribution zip
Fix Groovy distribution zip
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/b3e3f04f
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/b3e3f04f
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/b3e3f04f
Branch: refs/heads/GROOVY_2_5_X
Commit: b3e3f04f03944fb59a6ccb4a8dcde1bef3fe8c40
Parents: 2909267
Author: Cedric Champeau <cc...@apache.org>
Authored: Mon Dec 11 11:09:36 2017 +0100
Committer: Cedric Champeau <cc...@apache.org>
Committed: Tue Dec 12 22:09:07 2017 +0100
----------------------------------------------------------------------
gradle/assemble.gradle | 22 +++++++---------------
1 file changed, 7 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/b3e3f04f/gradle/assemble.gradle
----------------------------------------------------------------------
diff --git a/gradle/assemble.gradle b/gradle/assemble.gradle
index f786607..d2c40b5 100644
--- a/gradle/assemble.gradle
+++ b/gradle/assemble.gradle
@@ -352,8 +352,10 @@ ext.distSpec = copySpec {
from("$projectDir/licenses/LICENSE-BINZIP")
from("$projectDir/notices/NOTICE-BINZIP")
rename { String filename -> filename == 'LICENSE-BINZIP' ? 'LICENSE' : filename == 'NOTICE-BINZIP' ? 'NOTICE' : filename }
+ exclude { it.file.name =~ /-raw/ }
into('lib') {
- from jar.archivePath
+ from jarjar
+ from modules()*.jarjar
from {
configurations.runtime.findAll {
it.name.endsWith('jar') && !it.name.startsWith('openbeans-') && !it.name.startsWith('asm-') && !it.name.startsWith('antlr-') } +
@@ -366,12 +368,8 @@ ext.distSpec = copySpec {
from('src/bin/groovy.icns')
}
into('indy') {
- from { new File(jar.archivePath.parent, "${jar.baseName}-${jar.version}-indy.jar") }
- from {
- modules()*.jar.collect { j ->
- new File(j.archivePath.parent, "${j.baseName}-${j.version}-indy.jar")
- }
- }
+ from jarjarWithIndy
+ from modules()*.jarjarWithIndy
}
into('grooid') {
from { new File(jar.archivePath.parent, "${jar.baseName}-${jar.version}-grooid.jar") }
@@ -386,7 +384,7 @@ ext.distSpec = copySpec {
}
into('bin') {
from('src/bin') {
- filter(ReplaceTokens, tokens: [GROOVYJAR:jar.archiveName])
+ filter(ReplaceTokens, tokens: [GROOVYJAR:jarjar.archiveName])
fileMode = 0755
exclude 'groovy.icns'
}
@@ -403,15 +401,9 @@ ext.distSpec = copySpec {
include 'junit-license.txt'
include 'xstream-license.txt'
}
- into('embeddable') {
- subprojects.each {
- from jar.archivePath
- from { new File(jar.destinationDir, "${jar.baseName}-${jar.version}-indy.jar") }
- }
- }
}
-task distBin(type: Zip, dependsOn: [jarjar]) {
+task distBin(type: Zip) {
baseName = 'apache-groovy'
appendix = 'binary'
into("groovy-$version") {