need only one build.xml file to build and test ...

need only one build.xml file to build and test the scala ant task

2 files changed, 21 insertions, 42 deletions

diff --git a/support/ant/build.xml b/support/ant/build.xml
index ffaa5c7067..25e6c03772 100644
--- a/support/ant/build.xml
+++ b/support/ant/build.xml
@@ -8,16 +8,16 @@
   <property name="sources" value="src.java" />            <!-- the source directory -->
   <property name="classes" value="../../classes" />       <!-- the target directory -->
 
-  <!-- task definitions for pico -->
+  <!-- task definitions for pico                                       -->
+  <!-- your classpath must contain "jaco.jar"                          -->
   <taskdef name="pico"
-           classname="jaco.pizza.AntTask">
-    <classpath path="${bootstrap.jar}"/>
-  </taskdef>
+           classname="jaco.pizza.AntTask"/>
 
   <!-- compiling the ant task -->
 
   <target name="build.anttask">
-      <pico srcdir="${sources}" destdir="${classes}" source="1.4" classpath="${classes}">
+      <pico srcdir="${sources}" destdir="${classes}" 
+            source="1.4" classpath="${classes}">
          <include name="scala/tools/scalac4ant/*.java"/>
       </pico>
   </target>
@@ -31,10 +31,25 @@
     </jar>
   </target>
 
+  <!-- testing scalac4ant.jar -->
+  
+  <target name="test">
+  <!-- your classpath must contain                                    -->
+  <!--    "scalac4ant.jar", "tools.jar", scala.jar", "fjbg.jar"       -->
+  <!--                                                                -->
+  <taskdef name="scalac"
+	   classname="scala.tools.scalac4ant.AntTask"/>
+    <scalac srcdir="src.scala" destdir="/tmp/classes" force="true"
+	    scalaClasspath="/tmp/classes" 
+	    scalaBootClasspath="/tmp/classes:/home/buraq/scala/sources">
+	    <include name="**/*.scala"/>
+      </scalac>
+    </target>
+
   <!-- clean up -->
 
   <target name="clean">
     <delete file="${jar.file}"/>
-    <delete file="${classes}/scala/tools/scalac4ant/*.class"/>
+    <delete dir="${classes}/scala/tools/scalac4ant"/>
   </target>
 </project>
diff --git a/support/ant/test.xml b/support/ant/test.xml
deleted file mode 100644
index d171ae6481..0000000000
--- a/support/ant/test.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<project name="scala.scalac4ant.test" default="build.jar" basedir=".">
-
-  <!-- the compiler MUST be on your classpath -->
-
-  <property name="jar.file" value="scalac4ant.jar"/>
-  <property name="sources" value="src.scala" />            <!-- the source directory -->
-  <property name="build.dir" value="build"/>               <!-- the target directory -->
-
-  <!-- task definition for scalac -->
-  <!-- due to a bug in ant, giving a classpath here does not work. 
-       scalac4jar and the scalac compiler must be on your classpath already -->
-  <taskdef name="scalac"
-           classname="scala.tools.scalac4ant.AntTask"/>
-
-  <target name="init">
-    <mkdir dir="${build.dir}"/>
-  </target>
-
-  <!-- testing the ant task by compiling the ant task -->
-
-  <target name="build.anttask" depends="init">
-    <scalac srcdir="${sources}" destdir="${build.dir}" force="true">
-      <include name="scala/tools/scalac4ant/*.scala"/>
-    </scalac>
-  </target>
-
- <!-- building jar -->
-
-  <target name="build.jar" depends="build.anttask">
-    <!-- Create war file  -->
-    <jar jarfile="${jar.file}" basedir="${build.dir}">
-	 <include name="scala/tools/scalac4ant/**"/>
-    </jar>
-  </target>  
-
-</project>
\ No newline at end of file