From 1584102bcf4a746edab9bdc58b0024e1c9c32544 Mon Sep 17 00:00:00 2001 From: Stefan Bodewig Date: Fri, 13 Dec 2002 12:29:33 +0000 Subject: [PATCH] IBM has decided that one runtime jar simply is not enough. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit PR: 15289 Submitted by: Ville Skytt� git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@273661 13f79535-47bb-0310-9956-ffa450edef68 --- WHATSNEW | 2 ++ src/main/org/apache/tools/ant/types/Path.java | 12 +++++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/WHATSNEW b/WHATSNEW index 1618700b7..cdfa8b5b3 100644 --- a/WHATSNEW +++ b/WHATSNEW @@ -69,6 +69,8 @@ Fixed bugs: from the system classloader. The packages are determined by the version of the JVM running Ant. +* Ant didn't find the runtime libraries on IBM's JDK 1.4 for Linux. + Other changes: -------------- * The filesetmanifest attribute of has been reenabled. diff --git a/src/main/org/apache/tools/ant/types/Path.java b/src/main/org/apache/tools/ant/types/Path.java index 9f71ab21e..1a3d3ceb5 100644 --- a/src/main/org/apache/tools/ant/types/Path.java +++ b/src/main/org/apache/tools/ant/types/Path.java @@ -602,7 +602,17 @@ public class Path extends DataType implements Cloneable { + File.separator + "jre" + File.separator + "lib" + 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 addExisting(new Path(null, System.getProperty("java.home")