conor 02/03/25 05:27:18
Modified: proposal/mutant/build ant1compat.xml
proposal/mutant/src/java/antlibs/ant1compat/org/apache/tools/ant
Task.java
proposal/mutant/src/java/antlibs/system antlib.xml
Log:
Sync up with Ant1
Revision Changes Path
1.9 +16 -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.8
retrieving revision 1.9
diff -u -w -u -r1.8 -r1.9
--- ant1compat.xml 20 Mar 2002 12:35:48 -0000 1.8
+++ ant1compat.xml 25 Mar 2002 13:27:18 -0000 1.9
@@ -122,6 +122,8 @@
<patternset id="needs.sun.b64">
<exclude name="${ant.package}/taskdefs/Get.java"
unless="base64.present" />
+ <exclude name="${optional.package}/splash/SplashTask.java"
+ unless="base64.present" />
</patternset>
<!-- depends on external libraries -->
@@ -248,6 +250,9 @@
<patternset id="onlinetests">
<exclude name="**/GetTest.java" if="offline" />
</patternset>
+ <patternset id="needs.swing">
+ <exclude name="${optional.package}/splash/*.java" unless="swing.present"
/>
+ </patternset>
<!--
===================================================================
@@ -372,6 +377,16 @@
<available property="base64.present" classname="sun.misc.BASE64Encoder"
/>
+ <condition property="jasper.present">
+ <and>
+ <available classname="org.apache.jasper.compiler.Compiler" />
+ <available classname="org.apache.jasper.JasperException" />
+ </and>
+ </condition>
+
+ <available property="swing.present"
+ classname="javax.swing.ImageIcon"
+ classpathref="classpath"/>
</target>
<target name="ant1compat" depends="check_for_optional_packages">
@@ -417,6 +432,7 @@
<patternset refid="needs.sun.tools" />
<patternset refid="needs.sun.b64" />
<patternset refid="needs.jakarta.bcel" />
+ <patternset refid="needs.swing" />
</javac>
<copy todir="${bin.dir}/ant1compat">
<fileset dir="${bin.dir}/ant1src" excludes="**/*.java"/>
1.12 +11 -0
jakarta-ant/proposal/mutant/src/java/antlibs/ant1compat/org/apache/tools/ant/Task.java
Index: Task.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/mutant/src/java/antlibs/ant1compat/org/apache/tools/ant/Task.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -w -u -r1.11 -r1.12
--- Task.java 18 Mar 2002 02:44:25 -0000 1.11
+++ Task.java 25 Mar 2002 13:27:18 -0000 1.12
@@ -75,6 +75,17 @@
protected String description = null;
/**
+ * Called by the project to let the task do its work. This method may be
+ * called more than once, if the task is invoked more than once.
+ * For example,
+ * if target1 and target2 both depend on target3, then running
+ * "ant target1 target2" will run all tasks in target3 twice.
+ *
+ * @exception BuildException if something goes wrong with the build
+ */
+ public void execute() throws BuildException {}
+
+ /**
* Set the name to use in logging messages.
*
* @param name the name to use in logging messages.
1.6 +2 -2
jakarta-ant/proposal/mutant/src/java/antlibs/system/antlib.xml
Index: antlib.xml
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/mutant/src/java/antlibs/system/antlib.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -w -u -r1.5 -r1.6
--- antlib.xml 26 Feb 2002 13:43:54 -0000 1.5
+++ antlib.xml 25 Mar 2002 13:27:18 -0000 1.6
@@ -8,8 +8,8 @@
<taskdef name="ant" classname="org.apache.ant.antlib.system.Ant"/>
<taskdef name="antcall" classname="org.apache.ant.antlib.system.AntCall"/>
-<!-- <taskdef name="parallel"
classname="org.apache.ant.antlib.system.Parallel"/>
- <taskdef name="sequential"
classname="org.apache.ant.antlib.system.Sequential"/> -->
+ <taskdef name="parallel"
classname="org.apache.ant.antlib.system.Parallel"/>
+ <taskdef name="sequential"
classname="org.apache.ant.antlib.system.Sequential"/>
<converter classname="org.apache.ant.antlib.system.FileConverter"/>
<converter classname="org.apache.ant.antlib.system.URLConverter"/>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
