From 454c12b7fe74d675d9ee050176aaa162d7533123 Mon Sep 17 00:00:00 2001
From: Conor MacNeill <conor@apache.org>
Date: Thu, 28 Mar 2002 14:49:27 +0000
Subject: [PATCH] Make sure XSL resources are available for Junit task

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@272071 13f79535-47bb-0310-9956-ffa450edef68
---
 proposal/mutant/build/ant1compat.xml          | 31 +++++++++++++------
 .../apache/ant/builder/Ant1CompatBuilder.java | 13 +++++---
 .../org/apache/ant/builder/Builder.java       |  2 +-
 3 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/proposal/mutant/build/ant1compat.xml b/proposal/mutant/build/ant1compat.xml
index 8bdec3194..8ea227575 100644
--- a/proposal/mutant/build/ant1compat.xml
+++ b/proposal/mutant/build/ant1compat.xml
@@ -8,7 +8,12 @@
   <property name="dist.dir" value="dist"/>
   <property name="javadocs.dir" value="${dist.dir}/javadocs"/>
   <property name="distlib.dir" value="${dist.dir}/lib"/>
-  
+
+  <property name="ant1base.dir" value="../.."/>  
+  <property name="ant1src.dir" value="${ant1base.dir}/src"/>
+  <property name="ant1java.dir" value="${ant1src.dir}/main"/>
+  <property name="ant1etc.dir" value="${ant1src.dir}/etc"/>
+
   <property name="debug" value="true"/>
 
   <property name="ant.package" value="org/apache/tools/ant"/>
@@ -34,7 +39,7 @@
     <exclude name="org/apache/tools/ant/taskdefs/CallTarget.java"/>
   </patternset>
 
-  <fileset id="ant1src" dir="../../src/main">
+  <fileset id="ant1src_tocopy" dir="${ant1java.dir}">
     <include name="**/*.properties"/>
     <include name="**/*.mf"/>
     <include name="org/apache/tools/ant/taskdefs/**/*.java"/>
@@ -390,16 +395,16 @@
   </target>
 
   <target name="ant1compat" depends="check_for_optional_packages">
-    <mkdir dir="${bin.dir}/ant1src"/>
+    <mkdir dir="${bin.dir}/ant1src_copy"/>
     <mkdir dir="${bin.dir}/ant1compat"/>
-    <copy todir="${bin.dir}/ant1src">
-      <fileset refid="ant1src"/>
+    <copy todir="${bin.dir}/ant1src_copy">
+      <fileset refid="ant1src_tocopy"/>
     </copy>
-    <depend destdir="${bin.dir}/ant1compat" srcdir="${bin.dir}/ant1src;${java.dir}/antlibs/ant1compat">
+    <depend destdir="${bin.dir}/ant1compat" srcdir="${bin.dir}/ant1src_copy:${java.dir}/antlibs/ant1compat">
       <classpath refid="classpath"/>
     </depend>
     <javac destdir="${bin.dir}/ant1compat" 
-           srcdir="${bin.dir}/ant1src:${java.dir}/antlibs/ant1compat"
+           srcdir="${bin.dir}/ant1src_copy:${java.dir}/antlibs/ant1compat"
            debug="${debug}">
       <classpath refid="classpath"/>
       <patternset refid="needs.jdk1.2+" />
@@ -435,8 +440,16 @@
       <patternset refid="needs.swing" />
      </javac>
     <copy todir="${bin.dir}/ant1compat">
-      <fileset dir="${bin.dir}/ant1src" excludes="**/*.java"/>
+      <fileset dir="${bin.dir}/ant1src_copy" excludes="**/*.java"/>
     </copy>
+
+    <copy todir="${bin.dir}/ant1compat/${optional.package}/junit/xsl">
+       <fileset dir="${ant1etc.dir}">
+         <include name="junit-frames.xsl" />
+         <include name="junit-noframes.xsl" />
+       </fileset>
+    </copy>
+
     <jar basedir="${bin.dir}/ant1compat" jarfile="${distlib.dir}/antlibs/ant1compat.jar">
       <metainf dir="${java.dir}/antlibs/ant1compat" 
                 includes="antlib.xml"/>
@@ -444,7 +457,7 @@
   </target>
   
   <target name="clean">
-    <delete dir="${bin.dir}/ant1src"/>
+    <delete dir="${bin.dir}/ant1src_copy"/>
     <delete dir="${bin.dir}/ant1compat"/>
   </target>
 
diff --git a/proposal/mutant/src/java/bootstrap/org/apache/ant/builder/Ant1CompatBuilder.java b/proposal/mutant/src/java/bootstrap/org/apache/ant/builder/Ant1CompatBuilder.java
index 441f09742..aa938727f 100644
--- a/proposal/mutant/src/java/bootstrap/org/apache/ant/builder/Ant1CompatBuilder.java
+++ b/proposal/mutant/src/java/bootstrap/org/apache/ant/builder/Ant1CompatBuilder.java
@@ -8,6 +8,10 @@ public class Ant1CompatBuilder {
         helper.setProperty("dist.dir", "dist");
         helper.setProperty("javadocs.dir", "${dist.dir}/javadocs");
         helper.setProperty("distlib.dir", "${dist.dir}/lib");
+        helper.setProperty("ant1base.dir", "../..");
+        helper.setProperty("ant1src.dir", "${ant1base.dir}/src");
+        helper.setProperty("ant1java.dir", "${ant1src.dir}/main");
+        helper.setProperty("ant1etc.dir", "${ant1src.dir}/etc");
         helper.setProperty("debug", "true");
         helper.setProperty("ant.package", "org/apache/tools/ant");
         helper.setProperty("optional.package", "${ant.package}/taskdefs/optional");
@@ -26,11 +30,12 @@ public class Ant1CompatBuilder {
     protected void check_for_optional_packages(BuildHelper helper) {
     }
     protected void ant1compat(BuildHelper helper) {
-        helper.mkdir("${bin.dir}/ant1src");
+        helper.mkdir("${bin.dir}/ant1src_copy");
         helper.mkdir("${bin.dir}/ant1compat");
-        helper.copyFilesetRef("ant1src", "${bin.dir}/ant1src");
-        helper.javac("${bin.dir}/ant1src:${java.dir}/antlibs/ant1compat", "${bin.dir}/ant1compat", "classpath");
-        helper.copyFileset("${bin.dir}/ant1src", "${bin.dir}/ant1compat");
+        helper.copyFilesetRef("ant1src_tocopy", "${bin.dir}/ant1src_copy");
+        helper.javac("${bin.dir}/ant1src_copy:${java.dir}/antlibs/ant1compat", "${bin.dir}/ant1compat", "classpath");
+        helper.copyFileset("${bin.dir}/ant1src_copy", "${bin.dir}/ant1compat");
+        helper.copyFileset("${ant1etc.dir}", "${bin.dir}/ant1compat/${optional.package}/junit/xsl");
         helper.jar("${bin.dir}/ant1compat", "${distlib.dir}/antlibs/ant1compat.jar",
                    "${java.dir}/antlibs/ant1compat", "antlib.xml");
     }
diff --git a/proposal/mutant/src/java/bootstrap/org/apache/ant/builder/Builder.java b/proposal/mutant/src/java/bootstrap/org/apache/ant/builder/Builder.java
index 53b088d30..371dadf25 100644
--- a/proposal/mutant/src/java/bootstrap/org/apache/ant/builder/Builder.java
+++ b/proposal/mutant/src/java/bootstrap/org/apache/ant/builder/Builder.java
@@ -276,7 +276,7 @@ public class Builder {
         Ant1CompatBuilder ant1Builder = new Ant1CompatBuilder();
         BuildHelper ant1Build = new BuildHelper();
         ant1Build.setProperty("dist.dir", "bootstrap");
-        ant1Build.addFileSet("ant1src", ANT1_SRC_ROOT, getAnt1Files());
+        ant1Build.addFileSet("ant1src_tocopy", ANT1_SRC_ROOT, getAnt1Files());
         ant1Builder._init(ant1Build);
         ant1Builder.ant1compat(ant1Build);
     }