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/c9eacbf9
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/c9eacbf9
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/c9eacbf9

Branch: refs/heads/GROOVY_2_6_X
Commit: c9eacbf9a37616e6ad5e6f25d6c0cdc10330f2a5
Parents: 21f452d
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:13 2018 +1000

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


http://git-wip-us.apache.org/repos/asf/groovy/blob/c9eacbf9/gradle/assemble.gradle
----------------------------------------------------------------------
diff --git a/gradle/assemble.gradle b/gradle/assemble.gradle
index 9a152fd..f76fe99 100644
--- a/gradle/assemble.gradle
+++ b/gradle/assemble.gradle
@@ -376,15 +376,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")
+                }
             }
         }
     }

Reply via email to