ICE-8295 - Can't build Ice for Java on Windows after setting ICE_HOME

13 files changed, 27 insertions, 25 deletions

diff --git a/java/BuildInstructions.md b/java/BuildInstructions.md
index a35036b7da6..f974d90d616 100644
--- a/java/BuildInstructions.md
+++ b/java/BuildInstructions.md
@@ -99,15 +99,21 @@ The Maven package id for the application bundler package is as follows:
 
 The build system requires the Slice to Java compiler from Ice for C++. If you
 have not built Ice for C++ in this source distribution, you must set the
-`ICE_HOME` environment variable with the path name of your Ice installation. For
-example, on Unix:
+`ICE_BIN_DIST` environment variable to `cpp` and`ICE_HOME` environment variable with
+the path name of your Ice installation. For example, on Unix with an RPM
+installation:
 
-    $ export ICE_HOME=/opt/Ice-3.7.0 (For local build)
-    $ export ICE_HOME=/usr (For RPM installation)
+```
+export ICE_BIN_DIST=cpp
+export ICE_HOME=/usr
+```
 
-On Windows:
+On Windows with an MSI installation:
 
-    > set ICE_HOME=C:\Program Files\ZeroC\Ice-3.7.0 (MSI installation on Windows)
+```
+    set ICE_BIN_DIST=cpp
+    set ICE_HOME=C:\Program Files\ZeroC\Ice-3.7.0
+```
 
 On Windows if you are using Ice for C++ from a source distribution, you must set
 the `CPP_PLATFORM` and `CPP_CONFIGURATION` environment variables to match the
diff --git a/java/gradle/ice.gradle b/java/gradle/ice.gradle
index aeb66cab5ea..9daaf170813 100644
--- a/java/gradle/ice.gradle
+++ b/java/gradle/ice.gradle
@@ -50,7 +50,7 @@ slice {
     cppPlatform = this.cppPlatform
     if(!System.env.ICE_BIN_DIST?.split(" ").find{ it == 'all' || it.contains('java')}) {
         iceHome =  this.hasProperty('iceHome') ? this.iceHome
-            : new File(project.ext.topSrcDir).getCanonicalPath()
+            : System.getenv("ICE_HOME") != null ? System.env.ICE_HOME : new File(project.ext.topSrcDir).getCanonicalPath()
     }
 }
 
@@ -96,10 +96,6 @@ if ((prefix.startsWith("/usr") || prefix.startsWith("/usr/local")) && !prefix.st
     ext.binDir = prefix + "/bin"
 }
 
-// Check if we are building against source distribution
-def iceCppDir = slice.srcDist ? [slice.iceHome, "cpp"].join(File.separator) : slice.iceHome
-def iceSrcDist = false
-
 // Check is DESTDIR is set (non-Windows)
 if (isWindows) {
     ext.DESTDIR = ""
@@ -133,7 +129,7 @@ ext.searchFile = { List<Closure> places, List<String> searchPaths ->
 }
 
 ext.localDependency = { artifactId ->
-    if (project.slice.srcDist) {
+    if (project.slice.srcDist || System.env.ICE_BIN_DIST == "cpp") {
         return project(":${artifactId}")
     } else {
         return "com.zeroc:${artifactId}:${project.version}"
diff --git a/java/src/Glacier2/build.gradle b/java/src/Glacier2/build.gradle
index 7a3b09f47cf..1d5338df951 100644
--- a/java/src/Glacier2/build.gradle
+++ b/java/src/Glacier2/build.gradle
@@ -26,7 +26,7 @@ slice {
     java {
         set1 {
             args = "--checksum com.zeroc.Glacier2.SliceChecksums"
-            files = fileTree(dir: "${sliceDir}/Glacier2", includes:['*.ice'], excludes:["*F.ice"])
+            files = fileTree(dir: "$project.ext.topSrcDir/slice/Glacier2", includes:['*.ice'], excludes:["*F.ice"])
         }
     }
 }
diff --git a/java/src/Ice/build.gradle b/java/src/Ice/build.gradle
index dbb2170ea2d..01f159d935c 100644
--- a/java/src/Ice/build.gradle
+++ b/java/src/Ice/build.gradle
@@ -17,10 +17,10 @@ project.ext.description = "Ice is a comprehensive RPC framework that helps you b
 slice {
     java {
         stream {
-            files = [file("$sliceDir/Ice/BuiltinSequences.ice")]
+            files = [file("$project.ext.topSrcDir/slice/Ice/BuiltinSequences.ice")]
         }
         nostream {
-            files = fileTree(dir: "$sliceDir", includes:['Ice/*.ice'],
+            files = fileTree(dir: "$project.ext.topSrcDir/slice", includes:['Ice/*.ice'],
                 excludes:['Ice/*F.ice', 'Ice/BuiltinSequences.ice'])
         }
     }
diff --git a/java/src/IceBT/build.gradle b/java/src/IceBT/build.gradle
index 0190df41e06..b58cf589936 100644
--- a/java/src/IceBT/build.gradle
+++ b/java/src/IceBT/build.gradle
@@ -16,7 +16,7 @@ project.ext.description = "Bluetooth support for Ice"
 slice {
     java {
         set1 {
-            files = fileTree(dir: "$sliceDir/IceBT", includes:['*.ice'], excludes:["*F.ice"])
+            files = fileTree(dir: "$project.ext.topSrcDir/slice/IceBT", includes:['*.ice'], excludes:["*F.ice"])
         }
     }
 }
diff --git a/java/src/IceBox/build.gradle b/java/src/IceBox/build.gradle
index f8e1b0821bb..bf1780f0dfa 100644
--- a/java/src/IceBox/build.gradle
+++ b/java/src/IceBox/build.gradle
@@ -17,7 +17,7 @@ slice {
     java {
         set1 {
             args = "--checksum com.zeroc.IceBox.SliceChecksums"
-            files = fileTree(dir: "$sliceDir/IceBox", includes:['*.ice'], excludes:["*F.ice"])
+            files = fileTree(dir: "$project.ext.topSrcDir/slice/IceBox", includes:['*.ice'], excludes:["*F.ice"])
         }
     }
 }
diff --git a/java/src/IceDiscovery/build.gradle b/java/src/IceDiscovery/build.gradle
index 57f7b9448e6..d08e73b5e51 100644
--- a/java/src/IceDiscovery/build.gradle
+++ b/java/src/IceDiscovery/build.gradle
@@ -15,7 +15,7 @@ project.ext.description = "Allow Ice applications to discover objects and object
 
 slice {
     java {
-        files = fileTree(dir: "$sliceDir/IceDiscovery", includes:['*.ice'], excludes:["*F.ice"])
+        files = fileTree(dir: "$project.ext.topSrcDir/slice/IceDiscovery", includes:['*.ice'], excludes:["*F.ice"])
     }
 }
 
diff --git a/java/src/IceGrid/build.gradle b/java/src/IceGrid/build.gradle
index f34059dc386..1dbb4554c6f 100644
--- a/java/src/IceGrid/build.gradle
+++ b/java/src/IceGrid/build.gradle
@@ -17,7 +17,7 @@ slice {
     java {
         set1 {
             args = "--checksum com.zeroc.IceGrid.SliceChecksums"
-            files = fileTree(dir: "$sliceDir/IceGrid", includes:['*.ice'], excludes:["*F.ice"])
+            files = fileTree(dir: "$project.ext.topSrcDir/slice/IceGrid", includes:['*.ice'], excludes:["*F.ice"])
         }
     }
 }
diff --git a/java/src/IceLocatorDiscovery/build.gradle b/java/src/IceLocatorDiscovery/build.gradle
index 0c840d52a73..b98cc9edad4 100644
--- a/java/src/IceLocatorDiscovery/build.gradle
+++ b/java/src/IceLocatorDiscovery/build.gradle
@@ -15,7 +15,7 @@ project.ext.description = "Ice plug-in that enables the discovery of IceGrid and
 
 slice {
     java {
-        files = fileTree(dir: "$sliceDir/IceLocatorDiscovery", includes:['*.ice'], excludes:["*F.ice"])
+        files = fileTree(dir: "$project.ext.topSrcDir/slice/IceLocatorDiscovery", includes:['*.ice'], excludes:["*F.ice"])
     }
 }
 
diff --git a/java/src/IcePatch2/build.gradle b/java/src/IcePatch2/build.gradle
index fbb58342a85..58e5b191a95 100644
--- a/java/src/IcePatch2/build.gradle
+++ b/java/src/IcePatch2/build.gradle
@@ -17,7 +17,7 @@ slice {
     java {
         set1 {
             args = "--checksum com.zeroc.IcePatch2.SliceChecksums"
-            files = fileTree(dir: "$sliceDir/IcePatch2", includes:['*.ice'], excludes:["*F.ice"])
+            files = fileTree(dir: "$project.ext.topSrcDir/slice/IcePatch2", includes:['*.ice'], excludes:["*F.ice"])
         }
     }
 }
diff --git a/java/src/IceSSL/build.gradle b/java/src/IceSSL/build.gradle
index 1334022b2a2..3f951c3781f 100644
--- a/java/src/IceSSL/build.gradle
+++ b/java/src/IceSSL/build.gradle
@@ -17,7 +17,7 @@ slice {
     java {
 
         nostream {
-            files = fileTree(dir: "$sliceDir", includes:['IceSSL/*.ice'])
+            files = fileTree(dir: "$project.ext.topSrcDir/slice", includes:['IceSSL/*.ice'])
         }
     }
 }
diff --git a/java/src/IceStorm/build.gradle b/java/src/IceStorm/build.gradle
index 26e71902680..75bf42b8aee 100644
--- a/java/src/IceStorm/build.gradle
+++ b/java/src/IceStorm/build.gradle
@@ -26,7 +26,7 @@ slice {
     java {
         set1 {
             args = "--checksum com.zeroc.IceStorm.SliceChecksums"
-            files = fileTree(dir: "$sliceDir/IceStorm", includes:['*.ice'], excludes:["*F.ice"])
+            files = fileTree(dir: "$project.ext.topSrcDir/slice/IceStorm", includes:['*.ice'], excludes:["*F.ice"])
         }
     }
 }
diff --git a/python/BuildInstructionsWindows.md b/python/BuildInstructionsWindows.md
index 5375fce577e..e26dcc7cf9e 100644
--- a/python/BuildInstructionsWindows.md
+++ b/python/BuildInstructionsWindows.md
@@ -8,7 +8,7 @@ the supported platforms.
 
 ### Operating Systems and Compilers
 
-Ice for Python was extensively tested on the operating systems and compiler versions 
+Ice for Python was extensively tested on the operating systems and compiler versions
 listed on [supported platforms][2].
 
 ## Building the Python Extension
@@ -17,7 +17,7 @@ listed on [supported platforms][2].
 
 You can build the Ice for Python extension from source using `pip`:
 ```
-pip install <URL of Ice source distribution for Python> 
+pip install <URL of Ice source distribution for Python>
 ```
 ### With Visual Studio 2015 and MSBuild (Python 3.6 only)