conor 02/03/28 06:49:27
Modified: proposal/mutant/build ant1compat.xml
proposal/mutant/src/java/bootstrap/org/apache/ant/builder
Ant1CompatBuilder.java Builder.java
Log:
Make sure XSL resources are available for Junit task
Revision Changes Path
1.10 +22 -9 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.9
retrieving revision 1.10
diff -u -w -u -r1.9 -r1.10
--- ant1compat.xml 25 Mar 2002 13:27:18 -0000 1.9
+++ ant1compat.xml 28 Mar 2002 14:49:27 -0000 1.10
@@ -9,6 +9,11 @@
<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>
1.4 +9 -4
jakarta-ant/proposal/mutant/src/java/bootstrap/org/apache/ant/builder/Ant1CompatBuilder.java
Index: Ant1CompatBuilder.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/mutant/src/java/bootstrap/org/apache/ant/builder/Ant1CompatBuilder.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -u -r1.3 -r1.4
--- Ant1CompatBuilder.java 6 Mar 2002 08:17:07 -0000 1.3
+++ Ant1CompatBuilder.java 28 Mar 2002 14:49:27 -0000 1.4
@@ -8,6 +8,10 @@
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 @@
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");
}
1.10 +1 -1
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.9
retrieving revision 1.10
diff -u -w -u -r1.9 -r1.10
--- Builder.java 28 Mar 2002 12:51:13 -0000 1.9
+++ Builder.java 28 Mar 2002 14:49:27 -0000 1.10
@@ -276,7 +276,7 @@
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);
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
