Browse Source

Build fixes

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@272597 13f79535-47bb-0310-9956-ffa450edef68
master
Conor MacNeill 23 years ago
parent
commit
fc8a1957b0
4 changed files with 7 additions and 4 deletions
  1. +1
    -0
      proposal/mutant/build/ant1compat.xml
  2. +2
    -0
      proposal/mutant/src/java/antcore/org/apache/ant/antcore/execution/Frame.java
  3. +1
    -0
      proposal/mutant/src/java/bootstrap/org/apache/ant/builder/Builder.java
  4. +3
    -4
      proposal/mutant/src/java/frontend/org/apache/ant/cli/BuildLogger.java

+ 1
- 0
proposal/mutant/build/ant1compat.xml View File

@@ -31,6 +31,7 @@
<exclude name="org/apache/tools/ant/taskdefs/AntStructure.java"/>
<exclude name="org/apache/tools/ant/taskdefs/Recorder.java"/>
<exclude name="org/apache/tools/ant/taskdefs/RecorderEntry.java"/>
<exclude name="org/apache/tools/ant/taskdefs/Do.java"/>
<exclude name="org/apache/tools/ant/taskdefs/optional/jdepend/*.java"/>
</patternset>


+ 2
- 0
proposal/mutant/src/java/antcore/org/apache/ant/antcore/execution/Frame.java View File

@@ -72,6 +72,7 @@ import org.apache.ant.common.service.DataService;
import org.apache.ant.common.service.EventService;
import org.apache.ant.common.service.ExecService;
import org.apache.ant.common.service.FileService;
import org.apache.ant.common.service.InputService;
import org.apache.ant.common.service.MagicProperties;
import org.apache.ant.common.util.DemuxOutputReceiver;
import org.apache.ant.common.util.ExecutionException;
@@ -898,6 +899,7 @@ public class Frame implements DemuxOutputReceiver {
services.put(DataService.class, dataService);
services.put(EventService.class, new CoreEventService(this));
services.put(ExecService.class, execService);
services.put(InputService.class, new CoreInputService(this));
}




+ 1
- 0
proposal/mutant/src/java/bootstrap/org/apache/ant/builder/Builder.java View File

@@ -176,6 +176,7 @@ public class Builder {
files.remove(new File(TASKDEFS_ROOT, "Recorder.java"));
files.remove(new File(TASKDEFS_ROOT, "RecorderEntry.java"));
files.remove(new File(TASKDEFS_ROOT, "SendEmail.java"));
files.remove(new File(TASKDEFS_ROOT, "Do.java"));
files.remove(new File(INPUT_ROOT, "InputRequest.java"));
// not needed for bootstrap


+ 3
- 4
proposal/mutant/src/java/frontend/org/apache/ant/cli/BuildLogger.java View File

@@ -72,21 +72,20 @@ public interface BuildLogger extends BuildListener {
*
* @param level the logging level for the logger.
*/
public void setMessageOutputLevel(int level);
void setMessageOutputLevel(int level);

/**
* Set the output stream to which this logger is to send its output.
*
* @param output the output stream for the logger.
*/
public void setOutputPrintStream(PrintStream output);
void setOutputPrintStream(PrintStream output);

/**
* Set the output stream to which this logger is to send error messages.
*
* @param err the error stream for the logger.
*/
public void setErrorPrintStream(PrintStream err);

void setErrorPrintStream(PrintStream err);
}


Loading…
Cancel
Save