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/taskdefs Javadoc.java
Date Thu, 13 Jun 2002 14:08:02 GMT
bodewig     2002/06/13 07:08:02

  Modified:    .        Tag: ANT_15_BRANCH WHATSNEW
               src/main/org/apache/tools/ant/taskdefs Tag: ANT_15_BRANCH
                        Javadoc.java
  Log:
  If you used <javadoc>'s packagelist attribute and no additional way to
  specify source files or packages, the task would claim you had not
  specified any packages.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.263.2.40 +2 -0      jakarta-ant/WHATSNEW
  
  Index: WHATSNEW
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/WHATSNEW,v
  retrieving revision 1.263.2.39
  retrieving revision 1.263.2.40
  diff -u -r1.263.2.39 -r1.263.2.40
  --- WHATSNEW	13 Jun 2002 12:13:29 -0000	1.263.2.39
  +++ WHATSNEW	13 Jun 2002 14:08:02 -0000	1.263.2.40
  @@ -39,6 +39,8 @@
   * <javac>'s sourcepath setting has been ignored by some compiler 
     implementations.
   
  +* <javadoc>'s packagelist attribute didn't work.
  +
   Other changes:
   --------------
   
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.96.2.6  +8 -1      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
  
  Index: Javadoc.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Javadoc.java,v
  retrieving revision 1.96.2.5
  retrieving revision 1.96.2.6
  diff -u -r1.96.2.5 -r1.96.2.6
  --- Javadoc.java	13 Jun 2002 12:40:18 -0000	1.96.2.5
  +++ Javadoc.java	13 Jun 2002 14:08:02 -0000	1.96.2.6
  @@ -1439,6 +1439,12 @@
           Vector packagesToDoc = new Vector();
           Path sourceDirs = new Path(getProject());
   
  +        if (packageList != null && sourcePath == null) {
  +            String msg = "sourcePath attribute must be set when "
  +                + "specifying packagelist.";
  +            throw new BuildException(msg);
  +        }
  +
           if (sourcePath != null) {
               sourceDirs.addExisting(sourcePath);
           }
  @@ -1454,7 +1460,8 @@
           Vector sourceFilesToDoc = (Vector) sourceFiles.clone();
           addFileSets(sourceFilesToDoc);
   
  -        if (packagesToDoc.size() == 0 && sourceFilesToDoc.size() == 0) {
  +        if (packageList == null && packagesToDoc.size() == 0 
  +            && sourceFilesToDoc.size() == 0) {
               throw new BuildException("No source files and no packages have "
                                        + "been specified.");
           }
  
  
  

--
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