merge packing issue fix from master

groovy · Jun 26, 2012 · ab8f9eb · ab8f9eb
1 parent 26ac841
commit ab8f9eb
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/gradle/assemble.gradle b/gradle/assemble.gradle
@@ -254,8 +254,8 @@ ext.distSpec = copySpec {
         from({
             configurations.runtime.findAll { it.name.endsWith 'jar' } +
                     modules()*.jar.archivePath +
-                    subprojects.configurations.runtime*.findAll {
-                        it.name.endsWith('jar') && !it.name.contains('livetribe-jsr223')
+                    modules().configurations.runtime*.findAll {
+                        it.name.endsWith('jar') && !it.name.contains('livetribe-jsr223') && !it.name.matches(/groovy-\d.*/)
                     }.flatten() as Set
         })
     }
@@ -275,7 +275,7 @@ ext.distSpec = copySpec {
         from("src/bin") {
             filter(ReplaceTokens, tokens: [GROOVYJAR:jar.archiveName])
             fileMode = 0755
-            ext.exclude = "groovy.icns"
+            exclude "groovy.icns"
         }
         from("src/bin/groovy.icns")
         from("src/tools/org/codehaus/groovy/tools/groovy.ico")