summaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
authorjose <jose@zeroc.com>2016-06-08 20:01:28 +0200
committerjose <jose@zeroc.com>2016-06-08 20:01:28 +0200
commitae157f339fb6563c2db958769c9fde531812f4d4 (patch)
treebff43f23edf02efd28992bcead0b302661ec6a18 /java
parentRework endian/wordsize checks (diff)
downloadice-ae157f339fb6563c2db958769c9fde531812f4d4.tar.bz2
ice-ae157f339fb6563c2db958769c9fde531812f4d4.tar.xz
ice-ae157f339fb6563c2db958769c9fde531812f4d4.zip
Remove ../resources from Class-Path
That entry is not required in Class-Path and it causes a warning with debian packaging
Diffstat (limited to 'java')
-rw-r--r--java/src/IceGridGUI/build.gradle7
1 files changed, 2 insertions, 5 deletions
diff --git a/java/src/IceGridGUI/build.gradle b/java/src/IceGridGUI/build.gradle
index 34b8527585f..83e0d4fd845 100644
--- a/java/src/IceGridGUI/build.gradle
+++ b/java/src/IceGridGUI/build.gradle
@@ -109,7 +109,6 @@ if(icegridguiProguard.toBoolean()) {
delegate.manifest {
attribute(name: 'Main-Class', value: 'IceGridGUI.MainProxy')
attribute(name: 'Built-By', value: 'Zeroc, Inc.')
- attribute(name: 'Class-Path', value: '../resources/')
}
}
}
@@ -134,8 +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: "../resources/ " +
- configurations.runtime.resolve().collect { it.toURI() }.join(' '))
+ attribute(name: "Class-Path", value: configurations.runtime.resolve().collect { it.toURI() }.join(' '))
}
}
}
@@ -158,8 +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: "../resources/ " +
- configurations.runtime.resolve().collect { it.toURI() }.join(' ').replaceAll("${libDir}", "${jarDir}"))
+ attribute(name: "Class-Path", value: configurations.runtime.resolve().collect { it.toURI() }.join(' ').replaceAll("${libDir}", "${jarDir}"))
}
}
}