bodewig 00/10/19 07:53:03
Modified: . build.xml
docs index.html
src/main/org/apache/tools/ant/taskdefs Javac.java
Log:
Ensure the output of the modern compiler is going to be redirected as
well.
Prepare for a second release candidate build.
Revision Changes Path
1.86 +1 -1 jakarta-ant/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-ant/build.xml,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- build.xml 2000/10/17 11:15:19 1.85
+++ build.xml 2000/10/19 14:52:40 1.86
@@ -12,7 +12,7 @@
<property name="Name" value="Ant"/>
<property name="name" value="ant"/>
- <property name="version" value="1.2rc1"/>
+ <property name="version" value="1.2rc2"/>
<property name="ant.home" value="."/>
<property name="src.bin.dir" value="src/bin"/>
1.134 +1 -1 jakarta-ant/docs/index.html
Index: index.html
===================================================================
RCS file: /home/cvs/jakarta-ant/docs/index.html,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -r1.133 -r1.134
--- index.html 2000/10/18 09:49:27 1.133
+++ index.html 2000/10/19 14:52:50 1.134
@@ -26,7 +26,7 @@
<li>Dave Walend (<a href="mailto:[EMAIL PROTECTED]">[EMAIL
PROTECTED]</a>)</li>
</ul>
-<p>Version 1.2 - 2000/10/13</p>
+<p>Version 1.2 - 2000/10/19</p>
<hr>
<h2>Table of Contents</h2>
1.52 +9 -4
jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Javac.java
Index: Javac.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/Javac.java,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- Javac.java 2000/10/18 08:46:10 1.51
+++ Javac.java 2000/10/19 14:52:58 1.52
@@ -508,13 +508,15 @@
log("Using modern compiler", Project.MSG_VERBOSE);
Commandline cmd = setupJavacCommand();
- // This won't build under JDK1.2.2 because the new compiler
- // doesn't exist there.
- //com.sun.tools.javac.Main compiler = new com.sun.tools.javac.Main();
- //if (compiler.compile(args) != 0) {
+ PrintStream err = System.err;
+ PrintStream out = System.out;
// Use reflection to be able to build on all JDKs >= 1.1:
try {
+ PrintStream logstr =
+ new PrintStream(new LogOutputStream(this, Project.MSG_WARN));
+ System.setErr(logstr);
+ System.setErr(logstr);
Class c = Class.forName ("com.sun.tools.javac.Main");
Object compiler = c.newInstance ();
Method compile = c.getMethod ("compile",
@@ -530,6 +532,9 @@
} else {
throw new BuildException("Error starting modern compiler",
ex, location);
}
+ } finally {
+ System.setErr(err);
+ System.setErr(out);
}
}
