Simplified gradle structure.

9 files changed, 20 insertions, 175 deletions

diff --git a/java/src/Freeze/build.gradle b/java/src/Freeze/build.gradle
index 7dd7556f768..be3ca26b9cc 100644
--- a/java/src/Freeze/build.gradle
+++ b/java/src/Freeze/build.gradle
@@ -39,28 +39,8 @@ slice {
 }
 
 dependencies {
-    compile project(':Ice')
+    compile project(':ice')
     compile "com.sleepycat:db:${dbVersion}"
 }
 
-idea.module {
-    excludeDirs -= file(buildDir)
-    buildDir.listFiles({d, f ->f != 'generated-src'} as FilenameFilter).each { excludeDirs += it }
-}
-
-def jarName = "freeze${versionSuffix}.jar"
-
-jar {
-    archiveName = jarName
-    destinationDir = new File("${libDir}")
-}
-
-clean {
-    delete("${libDir}/${jarName}")
-}
-
-task copyJars(type: Copy, dependsOn: jar) {
-    from new File("${libDir}/${jarName}")
-    into "${DESTDIR}${prefix}/lib"
-}
-task install(dependsOn: copyJars)
+apply from: "$rootProject.projectDir/gradle/library.gradle"
diff --git a/java/src/Glacier2/build.gradle b/java/src/Glacier2/build.gradle
index a780086637f..cb24481e071 100644
--- a/java/src/Glacier2/build.gradle
+++ b/java/src/Glacier2/build.gradle
@@ -20,28 +20,8 @@ slice {
     }
 }
 
-idea.module {
-    excludeDirs -= file(buildDir)
-    buildDir.listFiles({d, f ->f != 'generated-src'} as FilenameFilter).each { excludeDirs += it }
-}
-
 dependencies {
-    compile project(':Ice')
-}
-
-def jarName = "glacier2${versionSuffix}.jar"
-
-jar {
-    archiveName = jarName
-    destinationDir = new File("${libDir}")
-}
-
-clean {
-    delete("${libDir}/${jarName}")
+    compile project(':ice')
 }
 
-task copyJars(type: Copy, dependsOn: jar) {
-    from new File("${libDir}/${jarName}")
-    into "${DESTDIR}${prefix}/lib"
-}
-task install(dependsOn: copyJars)
+apply from: "$rootProject.projectDir/gradle/library.gradle"
\ No newline at end of file
diff --git a/java/src/Ice/build.gradle b/java/src/Ice/build.gradle
index 74c4817bbfa..59e7aa5e1d0 100644
--- a/java/src/Ice/build.gradle
+++ b/java/src/Ice/build.gradle
@@ -25,24 +25,4 @@ slice {
     }
 }
 
-idea.module {
-    excludeDirs -= file(buildDir)
-    buildDir.listFiles({d, f ->f != 'generated-src'} as FilenameFilter).each { excludeDirs += it }
-}
-
-def jarName = "ice${versionSuffix}.jar"
-
-jar {
-    archiveName = jarName
-    destinationDir = new File("${libDir}")
-}
-
-clean {
-    delete("${libDir}/${jarName}")
-}
-
-task copyJars(type: Copy, dependsOn: jar) {
-    from new File("${libDir}/${jarName}")
-    into "${DESTDIR}${prefix}/lib"
-}
-task install(dependsOn: copyJars)
+apply from: "$rootProject.projectDir/gradle/library.gradle"
diff --git a/java/src/IceBox/build.gradle b/java/src/IceBox/build.gradle
index 675e6b9c3db..a83f5082fab 100644
--- a/java/src/IceBox/build.gradle
+++ b/java/src/IceBox/build.gradle
@@ -20,28 +20,8 @@ slice {
     }
 }
 
-idea.module {
-    excludeDirs -= file(buildDir)
-    buildDir.listFiles({d, f ->f != 'generated-src'} as FilenameFilter).each { excludeDirs += it }
-}
-
 dependencies {
-    compile project(':Ice')
-}
-
-def jarName = "icebox${versionSuffix}.jar"
-
-jar {
-    archiveName = jarName
-    destinationDir = new File("${libDir}")
-}
-
-clean {
-    delete("${libDir}/${jarName}")
+    compile project(':ice')
 }
 
-task copyJars(type: Copy, dependsOn: jar) {
-    from new File("${libDir}/${jarName}")
-    into "${DESTDIR}${prefix}/lib"
-}
-task install(dependsOn: copyJars)
+apply from: "$rootProject.projectDir/gradle/library.gradle"
diff --git a/java/src/IceDiscovery/build.gradle b/java/src/IceDiscovery/build.gradle
index 8c83e770a8b..dde3bef5021 100644
--- a/java/src/IceDiscovery/build.gradle
+++ b/java/src/IceDiscovery/build.gradle
@@ -26,22 +26,7 @@ idea.module {
 }
 
 dependencies {
-    compile project(':Ice')
+    compile project(':ice')
 }
 
-def jarName = "icediscovery${versionSuffix}.jar"
-
-jar {
-    archiveName = jarName
-    destinationDir = new File("${libDir}")
-}
-
-clean {
-    delete("${libDir}/${jarName}")
-}
-
-task copyJars(type: Copy, dependsOn: jar) {
-    from new File("${libDir}/${jarName}")
-    into "${DESTDIR}${prefix}/lib"
-}
-task install(dependsOn: copyJars)
+apply from: "$rootProject.projectDir/gradle/library.gradle"
\ No newline at end of file
diff --git a/java/src/IceGrid/build.gradle b/java/src/IceGrid/build.gradle
index 9b1f05f1068..2e863d834d1 100644
--- a/java/src/IceGrid/build.gradle
+++ b/java/src/IceGrid/build.gradle
@@ -20,29 +20,9 @@ slice {
     }
 }
 
-idea.module {
-    excludeDirs -= file(buildDir)
-    buildDir.listFiles({d, f ->f != 'generated-src'} as FilenameFilter).each { excludeDirs += it }
-}
-
 dependencies {
-    compile project(':Ice')
-    compile project(':Glacier2')
-}
-
-def jarName = "icegrid${versionSuffix}.jar"
-
-jar {
-    archiveName = jarName
-    destinationDir = new File("${libDir}")
-}
-
-clean {
-    delete("${libDir}/${jarName}")
+    compile project(':ice')
+    compile project(':glacier2')
 }
 
-task copyJars(type: Copy, dependsOn: jar) {
-    from new File("${libDir}/${jarName}")
-    into "${DESTDIR}${prefix}/lib"
-}
-task install(dependsOn: copyJars)
+apply from: "$rootProject.projectDir/gradle/library.gradle"
diff --git a/java/src/IceGridGUI/build.gradle b/java/src/IceGridGUI/build.gradle
index 089c486825d..1da1ac2f899 100644
--- a/java/src/IceGridGUI/build.gradle
+++ b/java/src/IceGridGUI/build.gradle
@@ -38,9 +38,9 @@ configurations {
 }
 
 dependencies {
-      compile project(':Ice')
-      compile project(':IceBox')
-      compile project(':IceGrid')
+      compile project(':ice')
+      compile project(':icebox')
+      compile project(':icegrid')
       compile 'com.jgoodies:jgoodies-common:1.8.0'
       compile 'com.jgoodies:jgoodies-looks:2.6.0'
       compile 'com.jgoodies:jgoodies-forms:1.8.0'
@@ -48,7 +48,7 @@ dependencies {
 }
 
 def tmpJarName = "IceGridGUITEMP.jar"
-def jarName = "icegridgui.jar"
+def jarName = "IceGridGUI.jar"
 
 jar {
     archiveName = tmpJarName
diff --git a/java/src/IcePatch2/build.gradle b/java/src/IcePatch2/build.gradle
index 39df029c50d..01731d5e61c 100644
--- a/java/src/IcePatch2/build.gradle
+++ b/java/src/IcePatch2/build.gradle
@@ -20,28 +20,8 @@ slice {
     }
 }
 
-idea.module {
-    excludeDirs -= file(buildDir)
-    buildDir.listFiles({d, f ->f != 'generated-src'} as FilenameFilter).each { excludeDirs += it }
-}
-
 dependencies {
-    compile project(':Ice')
-}
-
-def jarName = "icepatch2${versionSuffix}.jar"
-
-jar {
-    archiveName = jarName
-    destinationDir = new File("${libDir}")
-}
-
-clean {
-    delete("${libDir}/${jarName}")
+    compile project(':ice')
 }
 
-task copyJars(type: Copy, dependsOn: jar) {
-    from new File("${libDir}/${jarName}")
-    into "${DESTDIR}${prefix}/lib"
-}
-task install(dependsOn: copyJars)
+apply from: "$rootProject.projectDir/gradle/library.gradle"
diff --git a/java/src/IceStorm/build.gradle b/java/src/IceStorm/build.gradle
index a59569e8c47..a1d5113b5d8 100644
--- a/java/src/IceStorm/build.gradle
+++ b/java/src/IceStorm/build.gradle
@@ -20,28 +20,8 @@ slice {
     }
 }
 
-idea.module {
-    excludeDirs -= file(buildDir)
-    buildDir.listFiles({d, f ->f != 'generated-src'} as FilenameFilter).each { excludeDirs += it }
-}
-
 dependencies {
-    compile project(':Ice')
-}
-
-def jarName = "icestorm${versionSuffix}.jar"
-
-jar {
-    archiveName = jarName
-    destinationDir = new File("${libDir}")
-}
-
-clean {
-    delete("${libDir}/${jarName}")
+    compile project(':ice')
 }
 
-task copyJars(type: Copy, dependsOn: jar) {
-    from new File("${libDir}/${jarName}")
-    into "${DESTDIR}${prefix}/lib"
-}
-task install(dependsOn: copyJars)
+apply from: "$rootProject.projectDir/gradle/library.gradle"