|
|
@@ -54,13 +54,13 @@ public class ManifestClassPath extends Task { |
|
|
|
*/ |
|
|
|
public void execute() { |
|
|
|
if (name == null) { |
|
|
|
throw new BuildException("Missing 'property' attribute!"); |
|
|
|
throw new BuildException("Missing 'property' attribute!"); |
|
|
|
} |
|
|
|
if (dir == null) { |
|
|
|
throw new BuildException("Missing 'jarfile' attribute!"); |
|
|
|
throw new BuildException("Missing 'jarfile' attribute!"); |
|
|
|
} |
|
|
|
if (getProject().getProperty(name) != null) { |
|
|
|
throw new BuildException("Property '" + name + "' already set!"); |
|
|
|
throw new BuildException("Property '" + name + "' already set!"); |
|
|
|
} |
|
|
|
if (path == null) { |
|
|
|
throw new BuildException("Missing nested <classpath>!"); |
|
|
@@ -104,9 +104,8 @@ public class ManifestClassPath extends Task { |
|
|
|
// No match, so bail out! |
|
|
|
if (relPath.equals(canonicalPath) |
|
|
|
|| relPath.startsWith(tooLongPrefix)) { |
|
|
|
throw new BuildException( |
|
|
|
"No suitable relative path from " |
|
|
|
+ dir + " to " + fullPath); |
|
|
|
throw new BuildException("No suitable relative path from " |
|
|
|
+ dir + " to " + fullPath); |
|
|
|
} |
|
|
|
|
|
|
|
if (pathEntry.isDirectory() && !relPath.endsWith("/")) { |
|
|
|