Browse Source

IBM has decided that one runtime jar simply is not enough.

PR: 15289
Submitted by:	Ville Skytt� <ville dot skytta at iki dot fi>


git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@273661 13f79535-47bb-0310-9956-ffa450edef68
master
Stefan Bodewig 22 years ago
parent
commit
1584102bcf
2 changed files with 13 additions and 1 deletions
  1. +2
    -0
      WHATSNEW
  2. +11
    -1
      src/main/org/apache/tools/ant/types/Path.java

+ 2
- 0
WHATSNEW View File

@@ -69,6 +69,8 @@ Fixed bugs:
from the system classloader. The packages are determined by the from the system classloader. The packages are determined by the
version of the JVM running Ant. version of the JVM running Ant.


* Ant didn't find the runtime libraries on IBM's JDK 1.4 for Linux.

Other changes: Other changes:
-------------- --------------
* The filesetmanifest attribute of <jar> has been reenabled. * The filesetmanifest attribute of <jar> has been reenabled.


+ 11
- 1
src/main/org/apache/tools/ant/types/Path.java View File

@@ -602,7 +602,17 @@ public class Path extends DataType implements Cloneable {
+ File.separator + "jre" + File.separator + "jre"
+ File.separator + "lib" + File.separator + "lib"
+ File.separator + "rt.jar")); + File.separator + "rt.jar"));

// IBM's 1.4 has rt.jar split into 5 smaller jars.
String[] ibmJars =
{ "core", "graphics", "security", "server", "xml" };
for (int i = 0; i < ibmJars.length; i++) {
addExisting(new Path(null,
System.getProperty("java.home")
+ File.separator + "lib"
+ File.separator + ibmJars[i] + ".jar"));
}

// Added for MacOS X // Added for MacOS X
addExisting(new Path(null, addExisting(new Path(null,
System.getProperty("java.home") System.getProperty("java.home")


Loading…
Cancel
Save