diff options
| author | Jose <jose@zeroc.com> | 2016-09-23 13:04:03 +0000 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2016-09-23 13:04:03 +0000 |
| commit | a6b4825d4606a221c5e9bec4a285786228d9cd65 (patch) | |
| tree | d30c9262c82c5c4b96f9e1fa23c372ead5fd3a2f /java/src | |
| parent | Fix for ICE-7167 - fixed some warnings/errors when generating java docs (diff) | |
| download | ice-a6b4825d4606a221c5e9bec4a285786228d9cd65.tar.bz2 ice-a6b4825d4606a221c5e9bec4a285786228d9cd65.tar.xz ice-a6b4825d4606a221c5e9bec4a285786228d9cd65.zip | |
JAR install fixes
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/IceGridGUI/plain-jar.gradle | 8 | ||||
| -rw-r--r-- | java/src/IceGridGUI/proguard-jar.gradle | 1 |
2 files changed, 7 insertions, 2 deletions
diff --git a/java/src/IceGridGUI/plain-jar.gradle b/java/src/IceGridGUI/plain-jar.gradle index e4ec2f2cf06..cd5e19d1dca 100644 --- a/java/src/IceGridGUI/plain-jar.gradle +++ b/java/src/IceGridGUI/plain-jar.gradle @@ -24,6 +24,8 @@ task updateManifest(dependsOn: copyTmpJars) << { } } +updateManifest.outputs.files("${libDir}/${jarName}") + // // Copy JARs to the install location // @@ -46,11 +48,12 @@ task updateInstallManifest(dependsOn: copyJars) << { } } } +updateInstallManifest.outputs.files("${DESTDIR}${jarDir}/${jarName}") // // We need to sign the install JARs after updating the manifest. // -task signInstalJar(dependsOn: updateInstallManifest) << { +task signInstallJar(dependsOn: updateInstallManifest) << { if(keystore != null && keystore.length() > 0) { ant.signjar(jar: "${DESTDIR}${jarDir}/${jarName}", alias: "zeroc.com", @@ -58,6 +61,7 @@ task signInstalJar(dependsOn: updateInstallManifest) << { storepass:"${keystore_password}") } } +signInstallJar.outputs.files("${DESTDIR}${jarDir}/${jarName}") -task install(dependsOn: signInstalJar) +task install(dependsOn: signInstallJar) diff --git a/java/src/IceGridGUI/proguard-jar.gradle b/java/src/IceGridGUI/proguard-jar.gradle index b9988538e0c..bf6a017a17d 100644 --- a/java/src/IceGridGUI/proguard-jar.gradle +++ b/java/src/IceGridGUI/proguard-jar.gradle @@ -35,6 +35,7 @@ task updateManifest(dependsOn: proguardJar) << { } } } +updateManifest.outputs.files("${DESTDIR}${jarDir}/${jarName}") task copyJars(type: Copy, dependsOn: updateManifest) { from new File("${libDir}/${jarName}") |