Fix a few issues with build process

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@271881 13f79535-47bb-0310-9956-ffa450edef68

proposal/myrmidon/build.xml

@@ -223,7 +223,7 @@ Legal:
                debug="${debug}"
                deprecation="${deprecation}" >
             <classpath refid="project.class.path"/>
-            <src location="src/main"/>
+            <src location="src/todo"/>
             <src path="${java.dir}" />
             <!--
             <exclude name="${constants.file}"/>
@@ -274,7 +274,7 @@ Legal:
         </patternset>
 
         <property name="ant.package" value="org/apache/tools/todo"/>
-        <property name="taskdef.package" value="${ant.package}/taskdefs"/>
+        <property name="taskdefs.package" value="${ant.package}/taskdefs"/>
         <property name="antlib.package" value="org/apache/antlib"/>
         <property name="optional.type.package" value="${ant.package}/types/optional"/>
         <property name="util.package" value="${ant.package}/util"/>
@@ -307,41 +307,41 @@ Legal:
                      unless="xalan.present" />
             <exclude name="${taskdefs.package}/Javah.java"
                      unless="jdk1.2+" />
-            <exclude name="${taskdef.package}/junit/*"
+            <exclude name="${taskdefs.package}/junit/*"
                      unless="junit.present" />
-            <exclude name="${taskdef.package}/net/**.java"
+            <exclude name="${taskdefs.package}/net/**.java"
                      unless="netcomp.present" />
-            <exclude name="${taskdef.package}/net/MimeMail.java"
+            <exclude name="${taskdefs.package}/net/MimeMail.java"
                      unless="javamail.complete" />
-            <exclude name="${taskdef.package}/scm/AntStarTeam*.java"
+            <exclude name="${taskdefs.package}/scm/AntStarTeam*.java"
                      unless="starteam.present" />
             <exclude name="${taskdefs.package}/ANTLR.java"
                      unless="antlr.present" />
-            <exclude name="${taskdef.package}/perforce/*.java"
+            <exclude name="${taskdefs.package}/perforce/*.java"
                      unless="jakarta.oro.present" />
-            <exclude name="${taskdef.package}/junit/XMLResultAggregator.java"
+            <exclude name="${taskdefs.package}/junit/XMLResultAggregator.java"
                      unless="trax.present" />
-            <exclude name="${taskdef.package}/junit/AggregateTransformer.java"
+            <exclude name="${taskdefs.package}/junit/AggregateTransformer.java"
                      unless="trax.present" />
-            <exclude name="${taskdef.package}/junit/XMLResultAggregator.java"
+            <exclude name="${taskdefs.package}/junit/XMLResultAggregator.java"
                      unless="xalan2.present" />
-            <exclude name="${taskdef.package}/junit/AggregateTransformer.java"
+            <exclude name="${taskdefs.package}/junit/AggregateTransformer.java"
                      unless="xalan2.present" />
-            <exclude name="${taskdef.package}/junit/XalanExecutor.java"
+            <exclude name="${taskdefs.package}/junit/XalanExecutor.java"
                      unless="xalan2.present" />
-            <exclude name="${taskdef.package}/junit/Xalan2Executor.java"
+            <exclude name="${taskdefs.package}/junit/Xalan2Executor.java"
                      unless="xalan2.present" />
-            <exclude name="${taskdef.package}/junit/Xalan1Executor.java"
+            <exclude name="${taskdefs.package}/junit/Xalan1Executor.java"
                      unless="xalan.present" />
-            <exclude name="${taskdef.package}/jdepend/*"
+            <exclude name="${taskdefs.package}/jdepend/*"
                      unless="jdepend.present" />
-            <exclude name="${taskdef.package}/sitraka/**"
+            <exclude name="${taskdefs.package}/sitraka/**"
                      unless="some.regexp.support"/>
-            <exclude name="${taskdef.package}/metamata/MAudit*"
+            <exclude name="${taskdefs.package}/metamata/MAudit*"
                      unless="jakarta.oro.present"/>
-            <exclude name="${taskdef.package}/metamata/MMetrics*"
+            <exclude name="${taskdefs.package}/metamata/MMetrics*"
                      unless="trax.present"/>
-            <exclude name="${taskdef.package}/metamata/**"
+            <exclude name="${taskdefs.package}/metamata/**"
                      unless="jdk1.2+" />
             <exclude name="${optional.type.package}/depend/*.java"
                      unless="bcel.present" />

proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/ANTLR.java

@@ -18,7 +18,7 @@ import org.apache.myrmidon.api.TaskException;
 import org.apache.myrmidon.api.TaskContext;
 import org.apache.myrmidon.framework.Execute;
 import org.apache.tools.todo.taskdefs.ExecuteJava;
-import org.apache.tools.ant.types.Argument;
+import org.apache.tools.todo.types.Argument;
 import org.apache.tools.todo.types.Commandline;
 import org.apache.tools.todo.types.CommandlineJava;
 import org.apache.tools.todo.types.Path;

proposal/myrmidon/src/todo/org/apache/tools/todo/taskdefs/IContract.java

@@ -15,14 +15,10 @@ import java.io.PrintStream;
 import java.util.Date;
 import java.util.Properties;
 import org.apache.myrmidon.api.TaskException;
-import org.apache.myrmidon.api.AbstractTask;
-import org.apache.myrmidon.api.TaskContext;
 import org.apache.myrmidon.listeners.AbstractProjectListener;
 import org.apache.myrmidon.listeners.LogEvent;
-import org.apache.tools.todo.taskdefs.Java;
-import org.apache.tools.todo.taskdefs.javac.Javac;
-import org.apache.tools.todo.taskdefs.MatchingTask;
 import org.apache.tools.todo.taskdefs.javac.DefaultCompilerAdapter;
+import org.apache.tools.todo.taskdefs.javac.Javac;
 import org.apache.tools.todo.types.DirectoryScanner;
 import org.apache.tools.todo.types.Path;
 
@@ -353,18 +349,9 @@ import org.apache.tools.todo.types.Path;
  */
 public class IContract extends MatchingTask
 {
-
     private final static String ICONTROL_PROPERTIES_HEADER =
         " You might want to set classRoot to point to your normal compilation class root directory.";
 
-    private final static String ICONTROL_PROPERTIES_MESSAGE =
-        "You should probably modify icontrol.properties' classRoot to where comiled (uninstrumented) classes go.";
-
-    /**
-     * \ on windows, / on linux/unix
-     */
-    private final static String ps = System.getProperty( "path.separator" );
-
     /**
      * compiler to use for instrumenation
      */
@@ -431,11 +418,6 @@ public class IContract extends MatchingTask
      */
     private boolean quiet = false;
 
-    /**
-     * Indicates whether or not to use internal compilation
-     */
-    private boolean internalcompilation = false;
-
     /**
      * The -m option
      */