ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dona...@apache.org
Subject cvs commit: jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs Javac.java
Date Sun, 06 Jan 2002 02:04:42 GMT
donaldp     02/01/05 18:04:42

  Modified:    proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs
                        Javac.java
  Log:
  
  
  Revision  Changes    Path
  1.20      +9 -4      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Javac.java
  
  Index: Javac.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/Javac.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- Javac.java	4 Jan 2002 09:25:12 -0000	1.19
  +++ Javac.java	6 Jan 2002 02:04:42 -0000	1.20
  @@ -380,6 +380,11 @@
           return compileClasspath;
       }
   
  +    protected File getBaseDir()
  +    {
  +        return getBaseDirectory();
  +    }
  +
       /**
        * Get the additional implementation specific command line arguments.
        *
  @@ -622,7 +627,7 @@
       public boolean isForkedJavac()
       {
           return !"false".equals( fork ) ||
  -            "extJavac".equals( getProject().getProperty( "build.compiler" ) );
  +            "extJavac".equals( getProperty( "build.compiler" ) );
       }
   
       /**
  @@ -846,13 +851,13 @@
   
       private String determineCompiler()
       {
  -        String compiler = getProject().getProperty( "build.compiler" );
  +        Object compiler = getProperty( "build.compiler" );
   
           if( !"false".equals( fork ) )
           {
               if( compiler != null )
               {
  -                if( isJdkCompiler( compiler ) )
  +                if( isJdkCompiler( compiler.toString() ) )
                   {
                       final String message = "Since fork is true, ignoring build.compiler
setting.";
                       getLogger().warn( message );
  @@ -880,7 +885,7 @@
                   compiler = "classic";
               }
           }
  -        return compiler;
  +        return compiler.toString();
       }
   
       /**
  
  
  

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