Fix Java build dependencies - Close #509

2 files changed, 33 insertions, 29 deletions

diff --git a/java-compat/build.gradle b/java-compat/build.gradle
index d8781df3a1b..dd00173142b 100644
--- a/java-compat/build.gradle
+++ b/java-compat/build.gradle
@@ -56,13 +56,15 @@ subprojects {
     }
 }
 
-task dist()
-dist.dependsOn(project(":ice-compat").assemble)
-dist.dependsOn(project(":glacier2-compat").assemble)
-dist.dependsOn(project(":icebt-compat").assemble)
-dist.dependsOn(project(":icegrid-compat").assemble)
-dist.dependsOn(project(":icebox-compat").assemble)
-dist.dependsOn(project(":icediscovery-compat").assemble)
-dist.dependsOn(project(":icelocatordiscovery-compat").assemble)
-dist.dependsOn(project(":icepatch2-compat").assemble)
-dist.dependsOn(project(":icestorm-compat").assemble)
+if(!System.env.ICE_BIN_DIST?.split(" ").find{ it == 'all' || it.contains('java')}) {
+    task dist()
+    dist.dependsOn(project(":ice-compat").assemble)
+    dist.dependsOn(project(":glacier2-compat").assemble)
+    dist.dependsOn(project(":icebt-compat").assemble)
+    dist.dependsOn(project(":icegrid-compat").assemble)
+    dist.dependsOn(project(":icebox-compat").assemble)
+    dist.dependsOn(project(":icediscovery-compat").assemble)
+    dist.dependsOn(project(":icelocatordiscovery-compat").assemble)
+    dist.dependsOn(project(":icepatch2-compat").assemble)
+    dist.dependsOn(project(":icestorm-compat").assemble)
+}
diff --git a/java-compat/settings.gradle b/java-compat/settings.gradle
index 7ab2121327c..990ab42ce42 100644
--- a/java-compat/settings.gradle
+++ b/java-compat/settings.gradle
@@ -2,25 +2,27 @@
 // Copyright (c) ZeroC, Inc. All rights reserved.
 //
 
-// Main source
-include ':ice-compat'
-project(':ice-compat').projectDir = new File('src/Ice')
-include ':icediscovery-compat'
-project(':icediscovery-compat').projectDir = new File('src/IceDiscovery')
-include ':icelocatordiscovery-compat'
-project(':icelocatordiscovery-compat').projectDir = new File('src/IceLocatorDiscovery')
-include ':icebt-compat'
-project(':icebt-compat').projectDir = new File('src/IceBT')
-include ':icebox-compat'
-project(':icebox-compat').projectDir = new File('src/IceBox')
-include ':glacier2-compat'
-project(':glacier2-compat').projectDir = new File('src/Glacier2')
-include ':icepatch2-compat'
-project(':icepatch2-compat').projectDir = new File('src/IcePatch2')
-include ':icestorm-compat'
-project(':icestorm-compat').projectDir = new File('src/IceStorm')
-include ':icegrid-compat'
-project(':icegrid-compat').projectDir = new File('src/IceGrid')
+if(!System.env.ICE_BIN_DIST?.split(" ").find{ it == 'all' || it.contains('java')}) {
+    // Main source
+    include ':ice-compat'
+    project(':ice-compat').projectDir = new File('src/Ice')
+    include ':icediscovery-compat'
+    project(':icediscovery-compat').projectDir = new File('src/IceDiscovery')
+    include ':icelocatordiscovery-compat'
+    project(':icelocatordiscovery-compat').projectDir = new File('src/IceLocatorDiscovery')
+    include ':icebt-compat'
+    project(':icebt-compat').projectDir = new File('src/IceBT')
+    include ':icebox-compat'
+    project(':icebox-compat').projectDir = new File('src/IceBox')
+    include ':glacier2-compat'
+    project(':glacier2-compat').projectDir = new File('src/Glacier2')
+    include ':icepatch2-compat'
+    project(':icepatch2-compat').projectDir = new File('src/IcePatch2')
+    include ':icestorm-compat'
+    project(':icestorm-compat').projectDir = new File('src/IceStorm')
+    include ':icegrid-compat'
+    project(':icegrid-compat').projectDir = new File('src/IceGrid')
+}
 
 // Tests
 include ':test'