Fix for slice2java location with Ice 3.7 Windows binary distribution

zeroc-ice · May 9, 2016 · 60ccdb6 · 60ccdb6
1 parent 5f30555
commit 60ccdb6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/build.gradle b/build.gradle
@@ -39,7 +39,7 @@ sourceSets {
     }
 }
 
-version  = "1.3.2"
+version  = "1.3.3"
 group = "com.zeroc.gradle.ice-builder"
 
 pluginBundle {

diff --git a/src/main/groovy/com/zeroc/gradle/icebuilder/slice/SliceExtension.groovy b/src/main/groovy/com/zeroc/gradle/icebuilder/slice/SliceExtension.groovy
@@ -50,7 +50,7 @@ class SliceExtension {
 
             def os = System.properties['os.name']
 
-            if(this.iceHome != null) {
+            if(_iceHome != null) {
                 _srcDist = new File([_iceHome, "java", "build.gradle"].join(File.separator)).exists()
                 _slice2java = getSlice2java(_iceHome)
 
@@ -226,7 +226,7 @@ class SliceExtension {
                     // it will fallback to the common bin directory used with Ice < 3.7.
                     //
                     if (_cppPlatform != null && _cppConfiguration != null) {
-                        slice2java = [iceHome, "bin", _cppPlatform, _cppConfiguration, "slice2java.exe"].join(File.separator)
+                        slice2java = [iceHome, "cpp", "bin", _cppPlatform, _cppConfiguration, "slice2java.exe"].join(File.separator)
                     }
                 } else {
                     //