ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject cvs commit: ant/src/main/org/apache/tools/ant/types Path.java
Date Wed, 23 Jun 2004 13:33:19 GMT
bodewig     2004/06/23 06:33:19

  Modified:    .        Tag: ANT_16_BRANCH CONTRIBUTORS TODO
               src/main/org/apache/tools/ant/types Tag: ANT_16_BRANCH
                        Path.java
  Log:
  merge
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.1.2.19  +1 -0      ant/CONTRIBUTORS
  
  Index: CONTRIBUTORS
  ===================================================================
  RCS file: /home/cvs/ant/CONTRIBUTORS,v
  retrieving revision 1.1.2.18
  retrieving revision 1.1.2.19
  diff -u -r1.1.2.18 -r1.1.2.19
  --- CONTRIBUTORS	22 Jun 2004 21:51:12 -0000	1.1.2.18
  +++ CONTRIBUTORS	23 Jun 2004 13:33:18 -0000	1.1.2.19
  @@ -5,6 +5,7 @@
   Andrew Everitt
   Anil K. Vijendran
   Anli Shundi
  +Anthony Green
   Antoine Levy-Lambert
   Anton Mazkovoi
   Arnaud Vandyck
  
  
  
  1.3.2.21  +0 -2      ant/Attic/TODO
  
  Index: TODO
  ===================================================================
  RCS file: /home/cvs/ant/Attic/TODO,v
  retrieving revision 1.3.2.20
  retrieving revision 1.3.2.21
  diff -u -r1.3.2.20 -r1.3.2.21
  --- TODO	23 Jun 2004 12:26:34 -0000	1.3.2.20
  +++ TODO	23 Jun 2004 13:33:18 -0000	1.3.2.21
  @@ -11,8 +11,6 @@
   
   * Fix or at least document support for tomcat 5.0 jsp
   
  -* gcj support in Path.addJavaRuntime [Stefan]
  -
   * review claimed AntClassLoader memory leak [Stefan]
   
   * <junitreport> and JDK 1.5 [Stefan hopes that Stephane solves it for
  
  
  
  No                   revision
  No                   revision
  1.57.2.5  +12 -1     ant/src/main/org/apache/tools/ant/types/Path.java
  
  Index: Path.java
  ===================================================================
  RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/types/Path.java,v
  retrieving revision 1.57.2.4
  retrieving revision 1.57.2.5
  diff -u -r1.57.2.4 -r1.57.2.5
  --- Path.java	9 Mar 2004 17:01:55 -0000	1.57.2.4
  +++ Path.java	23 Jun 2004 13:33:18 -0000	1.57.2.5
  @@ -66,6 +66,15 @@
   
   
       /**
  +     * The system bootclassspath as a Path object.
  +     *
  +     * @since Ant 1.6.2
  +     */
  +    public static Path systemBootClasspath =
  +        new Path(null, System.getProperty("sun.boot.class.path"));
  +
  +
  +    /**
        * Helper class, holds the nested <code>&lt;pathelement&gt;</code>
values.
        */
       public class PathElement {
  @@ -365,7 +374,7 @@
       public static String[] translatePath(Project project, String source) {
           final Vector result = new Vector();
           if (source == null) {
  -          return new String[0];
  +            return new String[0];
           }
   
           PathTokenizer tok = new PathTokenizer(source);
  @@ -576,6 +585,8 @@
                   kaffeJarFiles.setIncludes("*.jar");
                   addFileset(kaffeJarFiles);
               }
  +        } else if ("GNU libgcj".equals(System.getProperty("java.vm.name"))) {
  +            addExisting(systemBootClasspath);
           }
   
           if (System.getProperty("java.vendor").toLowerCase(Locale.US).indexOf("microsoft")
>= 0) {
  
  
  

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


Mime
View raw message