ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject cvs commit: jakarta-ant/src/main/org/apache/tools/ant/types Path.java
Date Fri, 13 Dec 2002 12:32:43 GMT
bodewig     2002/12/13 04:32:43

  Modified:    .        Tag: ANT_15_BRANCH WHATSNEW
               src/main/org/apache/tools/ant/types Tag: ANT_15_BRANCH
                        Path.java
  Log:
  Merge fix for 15289 from HEAD
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.263.2.105 +2 -0      jakarta-ant/WHATSNEW
  
  Index: WHATSNEW
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/WHATSNEW,v
  retrieving revision 1.263.2.104
  retrieving revision 1.263.2.105
  diff -u -r1.263.2.104 -r1.263.2.105
  --- WHATSNEW	10 Dec 2002 16:21:19 -0000	1.263.2.104
  +++ WHATSNEW	13 Dec 2002 12:32:42 -0000	1.263.2.105
  @@ -42,6 +42,8 @@
     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:
   --------------
   
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.38.2.2  +11 -1     jakarta-ant/src/main/org/apache/tools/ant/types/Path.java
  
  Index: Path.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/types/Path.java,v
  retrieving revision 1.38.2.1
  retrieving revision 1.38.2.2
  diff -u -r1.38.2.1 -r1.38.2.2
  --- Path.java	10 May 2002 16:06:32 -0000	1.38.2.1
  +++ Path.java	13 Dec 2002 12:32:42 -0000	1.38.2.2
  @@ -604,7 +604,17 @@
                                    + 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")
  
  
  

--
To unsubscribe, e-mail:   <mailto:ant-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:ant-dev-help@jakarta.apache.org>


Mime
View raw message