diff options
Diffstat (limited to 'java')
| -rw-r--r-- | java/gradle/ice.gradle | 6 | ||||
| -rw-r--r-- | java/test/build.gradle | 30 |
2 files changed, 26 insertions, 10 deletions
diff --git a/java/gradle/ice.gradle b/java/gradle/ice.gradle index 055bef2fe6d..183ec1fb1e7 100644 --- a/java/gradle/ice.gradle +++ b/java/gradle/ice.gradle @@ -175,12 +175,14 @@ if (!iceDir) slice.slice2freezej = "$iceDir/bin/$slice2freezej" } -// Set the slice directory +// Set the slice and java jar directory if (iceDir == "/usr") { - ext.sliceDir = /usr/share/Ice-$iceVersion/slice + ext.sliceDir = "/usr/share/Ice-$iceVersion/slice" + ext.distJarDir = "/usr/share/java" } else { ext.sliceDir = "$iceDir/slice" + ext.distJarDir = iceSrcDist ? null : "$iceDir/lib" } diff --git a/java/test/build.gradle b/java/test/build.gradle index 58373515c7c..6dc261187bb 100644 --- a/java/test/build.gradle +++ b/java/test/build.gradle @@ -158,14 +158,28 @@ idea.module { buildDir.listFiles({d, f ->f != 'generated-src'} as FilenameFilter).each { excludeDirs += it } } -dependencies { - compile project(':src/Ice') - compile project(':src/Freeze') - compile project(':src/IceDiscovery') - compile project(':src/IceBox') - compile project(':src/Glacier2') - compile project(':src/IceStorm') - compile project(':src/IceGrid') +if (distJarDir == null) { + dependencies { + compile project(':src/Ice') + compile project(':src/Freeze') + compile project(':src/IceDiscovery') + compile project(':src/IceBox') + compile project(':src/Glacier2') + compile project(':src/IceStorm') + compile project(':src/IceGrid') + } +} else { + println "Using Ice jars installed in ${distJarDir}" + dependencies { + compile files("${distJarDir}/Ice.jar") + compile files("${distJarDir}/Freeze.jar") + compile files("${distJarDir}/IceDiscovery.jar") + compile files("${distJarDir}/IceBox.jar") + compile files("${distJarDir}/Glacier2.jar") + compile files("${distJarDir}/IceStorm.jar") + compile files("${distJarDir}/IceGrid.jar") + compile 'com.sleepycat:db:5.3.28' + } } jar { |