diff options
| author | jose <jose@zeroc.com> | 2016-06-08 22:20:54 +0200 |
|---|---|---|
| committer | jose <jose@zeroc.com> | 2016-06-08 22:20:54 +0200 |
| commit | f819903e5b2ae6ae3150ccb24c47274d384d8ce7 (patch) | |
| tree | f02deefaaa22339682ba1da9a493c554a455c321 /java | |
| parent | Allow to build JAR files with Class-Path entries (diff) | |
| download | ice-f819903e5b2ae6ae3150ccb24c47274d384d8ce7.tar.bz2 ice-f819903e5b2ae6ae3150ccb24c47274d384d8ce7.tar.xz ice-f819903e5b2ae6ae3150ccb24c47274d384d8ce7.zip | |
Use absolute paths in Class-Path
Diffstat (limited to 'java')
| -rw-r--r-- | java/gradle/library.gradle | 4 | ||||
| -rw-r--r-- | java/src/IceGridGUI/build.gradle | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/java/gradle/library.gradle b/java/gradle/library.gradle index ee97f60a628..7353e00cbb3 100644 --- a/java/gradle/library.gradle +++ b/java/gradle/library.gradle @@ -129,7 +129,7 @@ clean { // Check if we need to update the JARs class-path // if(jarsClassPath.toBoolean()){ - task copyJars(type: Copy, dependsOn: jarSources, overwrite: true) { + task copyJars(type: Copy, dependsOn: [jarSources, javadocJar], overwrite: true) { from "${pomName}" from "${libDir}/${jar.archiveName}" from "${libDir}/${project.name}-${project.version}-sources.jar" @@ -140,7 +140,7 @@ if(jarsClassPath.toBoolean()){ ant.jar(update: true, destfile: "${DESTDIR}${jarDir}/${jar.archiveName}") { delegate.manifest { attribute(name: "Built-By", value: "ZeroC, Inc.") - attribute(name: "Class-Path", value: configurations.runtime.resolve().collect { it.toURI() }.join(' ').replaceAll("${libDir}", "${jarDir}")) + attribute(name: "Class-Path", value: configurations.runtime.resolve().collect { "file://${it.absolutePath}" }.join(' ').replaceAll("${libDir}", "${jarDir}")) } } } diff --git a/java/src/IceGridGUI/build.gradle b/java/src/IceGridGUI/build.gradle index 83e0d4fd845..fa6a55a150f 100644 --- a/java/src/IceGridGUI/build.gradle +++ b/java/src/IceGridGUI/build.gradle @@ -133,7 +133,7 @@ if(icegridguiProguard.toBoolean()) { delegate.manifest { attribute(name: "Main-Class", value: "IceGridGUI.Main") attribute(name: "Built-By", value: "ZeroC, Inc.") - attribute(name: "Class-Path", value: configurations.runtime.resolve().collect { it.toURI() }.join(' ')) + attribute(name: "Class-Path", value: configurations.runtime.resolve().collect { "file://${it.absolutePath}" }.join(' ')) } } } @@ -156,7 +156,7 @@ if(icegridguiProguard.toBoolean()) { delegate.manifest { attribute(name: "Main-Class", value: "IceGridGUI.Main") attribute(name: "Built-By", value: "ZeroC, Inc.") - attribute(name: "Class-Path", value: configurations.runtime.resolve().collect { it.toURI() }.join(' ').replaceAll("${libDir}", "${jarDir}")) + attribute(name: "Class-Path", value: configurations.runtime.resolve().collect { "file://${it.absolutePath}" }.join(' ').replaceAll("${libDir}", "${jarDir}")) } } } |