ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ru...@apache.org
Subject cvs commit: jakarta-ant/src/main/org/apache/tools/ant/types Path.java
Date Wed, 10 Jan 2001 21:37:43 GMT
rubys       01/01/10 13:37:43

  Modified:    src/main/org/apache/tools/ant/types Path.java
  Log:
  Restore the default to "last".  Add a warning message if an invalid value
  is specified.
  
  Revision  Changes    Path
  1.13      +14 -8     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.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- Path.java	2001/01/05 14:26:27	1.12
  +++ Path.java	2001/01/10 21:37:42	1.13
  @@ -475,26 +475,32 @@
           Path result = new Path(project);
   
           String order = project.getProperty("build.sysclasspath");
  -        if (order == null) order="first";
  +        if (order == null) order="last";
   
           if (order.equals("only")) {
               // only: the developer knows what (s)he is doing
               result.addExisting(Path.systemClasspath);
           
  -        } else if (order.equals("last")) {
  -            // last: don't trust the developer
  -            result.addExisting(this);
  +        } else if (order.equals("first")) {
  +            // first: developer could use a little help
               result.addExisting(Path.systemClasspath);
  -        
  +            result.addExisting(this);
  +
           } else if (order.equals("ignore")) {
               // ignore: don't trust anyone
               result.addExisting(this);
  -        
  +
           } else {
  -            // first: developer could use a little help
  -            result.addExisting(Path.systemClasspath);
  +            // last: don't trust the developer
  +            if (!order.equals("last")) {
  +                project.log("invalid value for build.sysclasspath: " + order, 
  +                            Project.MSG_WARN);
  +            }
  +
               result.addExisting(this);
  +            result.addExisting(Path.systemClasspath);
           }
  +        
   
           return result;
   
  
  
  

Mime
View raw message