conor 02/04/29 16:47:27
Modified: proposal/mutant/build ant1compat.xml
proposal/mutant/src/java/antcore/org/apache/ant/antcore/execution
Frame.java
proposal/mutant/src/java/bootstrap/org/apache/ant/builder
Builder.java
proposal/mutant/src/java/frontend/org/apache/ant/cli
BuildLogger.java
Log:
Build fixes
Revision Changes Path
1.16 +1 -0 jakarta-ant/proposal/mutant/build/ant1compat.xml
Index: ant1compat.xml
===================================================================
RCS file: /home/cvs/jakarta-ant/proposal/mutant/build/ant1compat.xml,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -w -u -r1.15 -r1.16
--- ant1compat.xml 29 Apr 2002 15:29:11 -0000 1.15
+++ ant1compat.xml 29 Apr 2002 23:47:27 -0000 1.16
@@ -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>
1.20 +2 -0
jakarta-ant/proposal/mutant/src/java/antcore/org/apache/ant/antcore/execution/Frame.java
Index: Frame.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/mutant/src/java/antcore/org/apache/ant/antcore/execution/Frame.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -w -u -r1.19 -r1.20
--- Frame.java 17 Apr 2002 15:51:06 -0000 1.19
+++ Frame.java 29 Apr 2002 23:47:27 -0000 1.20
@@ -72,6 +72,7 @@
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 @@
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.17 +1 -0
jakarta-ant/proposal/mutant/src/java/bootstrap/org/apache/ant/builder/Builder.java
Index: Builder.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/mutant/src/java/bootstrap/org/apache/ant/builder/Builder.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -w -u -r1.16 -r1.17
--- Builder.java 29 Apr 2002 15:29:12 -0000 1.16
+++ Builder.java 29 Apr 2002 23:47:27 -0000 1.17
@@ -176,6 +176,7 @@
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
1.2 +3 -4
jakarta-ant/proposal/mutant/src/java/frontend/org/apache/ant/cli/BuildLogger.java
Index: BuildLogger.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/mutant/src/java/frontend/org/apache/ant/cli/BuildLogger.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -u -r1.1 -r1.2
--- BuildLogger.java 16 Apr 2002 14:07:47 -0000 1.1
+++ BuildLogger.java 29 Apr 2002 23:47:27 -0000 1.2
@@ -72,21 +72,20 @@
*
* @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);
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
