ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@locus.apache.org
Subject cvs commit: jakarta-ant/src/main/org/apache/tools/ant/taskdefs Rmic.java
Date Thu, 13 Jul 2000 08:11:33 GMT
bodewig     00/07/13 01:11:33

  Modified:    src/main/org/apache/tools/ant/taskdefs Rmic.java
  Log:
  Make Rmic work when only one class is specified.
  Submitted by:	Phillip Davidov <phillip.davidov@chipdata.com>
  
  Revision  Changes    Path
  1.8       +9 -9      jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Rmic.java
  
  Index: Rmic.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Rmic.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- Rmic.java	2000/07/06 16:48:18	1.7
  +++ Rmic.java	2000/07/13 08:11:33	1.8
  @@ -154,14 +154,14 @@
           }
           String classpath = getCompileClasspath(baseDir);
   
  -        // scan base dirs to build up compile lists
  -
  -        DirectoryScanner ds = this.getDirectoryScanner(baseDir);
  -
  -        String[] files = ds.getIncludedFiles();
  -
  -        scanDir(baseDir, files, verify);
  -
  +        // scan base dirs to build up compile lists only if a
  +        // specific classname is not given
  +        if (classname == null) {
  +            DirectoryScanner ds = this.getDirectoryScanner(baseDir);
  +            String[] files = ds.getIncludedFiles();
  +            scanDir(baseDir, files, verify);
  +        }
  +        
           // XXX
           // need to provide an input stream that we read in from!
   
  @@ -187,7 +187,7 @@
           if (null != sourceBase) args[i++] = "-keepgenerated";
   
           if (classname != null) {
  -            if (shouldCompile(new File(baseDir, classname.replace('.', File.separatorChar))))
{
  +            if (shouldCompile(new File(baseDir, classname.replace('.', File.separatorChar)
+ ".class"))) {
                   args[i++] = classname;
                   compiler.compile(args);
               }
  
  
  

Mime
View raw message