groovy-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cchamp...@apache.org
Subject [11/19] groovy git commit: Fix Groovy distribution zip
Date Tue, 12 Dec 2017 20:56:32 GMT
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/55288179
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/55288179
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/55288179

Branch: refs/heads/GROOVY_2_6_X
Commit: 552881791f8f509f53aeb67da80e4c292633a94a
Parents: c75fd41
Author: Cedric Champeau <cchampeau@apache.org>
Authored: Mon Dec 11 11:09:36 2017 +0100
Committer: Cedric Champeau <cchampeau@apache.org>
Committed: Tue Dec 12 21:55:47 2017 +0100

----------------------------------------------------------------------
 gradle/assemble.gradle | 22 +++++++---------------
 1 file changed, 7 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/groovy/blob/55288179/gradle/assemble.gradle
----------------------------------------------------------------------
diff --git a/gradle/assemble.gradle b/gradle/assemble.gradle
index 5f8e5af..a7dd207 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-') && !it.name.startsWith('antlr4-')
} +
@@ -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'
         }
@@ -404,15 +402,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") {


Mime
View raw message