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/compilers DefaultCompilerAdapter.java
Date Sun, 30 Dec 2001 00:04:21 GMT
donaldp     01/12/29 16:04:21

  Modified:    proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/compilers
                        DefaultCompilerAdapter.java
  Log:
  Update to use new format of LogOutputStream where you pass in a Logger
  
  Revision  Changes    Path
  1.15      +4 -4      jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java
  
  Index: DefaultCompilerAdapter.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/compilers/DefaultCompilerAdapter.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- DefaultCompilerAdapter.java	23 Dec 2001 14:22:44 -0000	1.14
  +++ DefaultCompilerAdapter.java	30 Dec 2001 00:04:21 -0000	1.15
  @@ -179,7 +179,7 @@
           // as well as "bootclasspath" and "extdirs"
           if( Project.getJavaVersion().startsWith( "1.1" ) )
           {
  -            Path cp = new Path( m_project );
  +            Path cp = new Path();
               /*
                * XXX - This doesn't mix very well with build.systemclasspath,
                */
  @@ -324,7 +324,7 @@
       protected Path getCompileClasspath()
           throws TaskException
       {
  -        Path classpath = new Path( m_project );
  +        Path classpath = new Path();
   
           // add dest dir to classpath so that previously compiled and
           // untouched classes are on classpath
  @@ -438,8 +438,8 @@
               try
               {
                   final Execute exe = new Execute();
  -                exe.setOutput( new LogOutputStream( m_attributes, Project.MSG_INFO ) );
  -                exe.setError( new LogOutputStream( m_attributes, Project.MSG_WARN ) );
  +                exe.setOutput( new LogOutputStream( m_attributes.hackGetLogger(), false
) );
  +                exe.setError( new LogOutputStream( m_attributes.hackGetLogger(), true )
);
                   exe.setWorkingDirectory( m_project.getBaseDir() );
                   exe.setCommandline( commandArray );
                   return exe.execute();
  
  
  

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