Return-Path: <rubys@locus.apache.org>
Mailing-List: contact ant-dev-help@jakarta.apache.org; run by ezmlm
Delivered-To: mailing list ant-dev@jakarta.apache.org
Received: (qmail 70013 invoked by uid 500); 6 Feb 2000 00:28:47 -0000
Delivered-To: apmail-jakarta-ant-cvs@jakarta.apache.org
Received: (qmail 70010 invoked from network); 6 Feb 2000 00:28:46 -0000
Received: from taz.hyperreal.org (HELO hyperreal.org) (209.133.83.16)
  by locus.apache.org with SMTP; 6 Feb 2000 00:28:46 -0000
Received: (qmail 9726 invoked by uid 2016); 6 Feb 2000 00:27:00 -0000
Delivered-To: apcore-jakarta-ant-cvs@apache.org
Received: (qmail 9687 invoked from network); 6 Feb 2000 00:26:59 -0000
Received: from locus.apache.org (63.211.145.10)
  by taz.hyperreal.org with SMTP; 6 Feb 2000 00:26:59 -0000
Received: (qmail 69982 invoked by uid 1064); 6 Feb 2000 00:26:58 -0000
Date: 6 Feb 2000 00:26:58 -0000
Message-ID: <20000206002658.69981.qmail@locus.apache.org>
From: rubys@locus.apache.org
To: jakarta-ant-cvs@apache.org
Subject: cvs commit: jakarta-ant/src/main/org/apache/tools/ant/taskdefs
 Javadoc.java

rubys       00/02/05 16:26:58

  Modified:    src/main/org/apache/tools/ant/taskdefs Javadoc.java
  Log:
  Merge classpath+sourcepath for jdk 1.1
  
  Revision  Changes    Path
  1.3       +14 -8     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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Javadoc.java	2000/01/27 03:54:43	1.2
  +++ Javadoc.java	2000/02/06 00:26:57	1.3
  @@ -251,16 +251,22 @@
           Vector argList = new Vector();
   
   // ------------------------------------------------ general javadoc arguments
  -        if (sourcePath != null) {
  -            argList.addElement("-sourcepath");
  -            argList.addElement(sourcePath);
  -        }
  -        argList.addElement("-classpath");
  -        if (classpath != null) {
  +        if (classpath == null)
  +            classpath = System.getProperty("java.class.path");
  +
  +        if ( (!javadoc1) || (sourcePath == null) ) {
  +            argList.addElement("-classpath");
               argList.addElement(classpath);
  -        } else {
  -            argList.addElement(System.getProperty("java.class.path"));
  +            if (sourcePath != null) {
  +                argList.addElement("-sourcepath");
  +                argList.addElement(sourcePath);
  +            }
  +        } else { 
  +            argList.addElement("-classpath");
  +            argList.addElement(sourcePath + 
  +                System.getProperty("path.separator") + classpath);
           }
  +
           if (destDir != null) {
               argList.addElement("-d");
               argList.addElement(destDir.getAbsolutePath());