X-Git-Url: http://svarog.pmf.uns.ac.rs/gitweb/?p=mjc2wsl.git;a=blobdiff_plain;f=build.xml;h=c2cd80f686467ca9073d4100fc7fd11c4ceee08e;hp=419f536384ccc88d21eb73fd2a79ac803a313188;hb=20a0aa220ffc6b632d2fc52f2be66854791678d7;hpb=973fd00c49f955b896582652d1f3b5270b93dcaf

diff --git a/build.xml b/build.xml
index 419f536..c2cd80f 100644
--- a/build.xml
+++ b/build.xml
@@ -19,11 +19,13 @@
 
     <property name="res.dir" value="res" />
     
-    <property name="compiler.class.dir" value="compiler-bin" />
-    <property name="compiler.src.dir" value="compiler" />
+    <property name="compiler.class.dir" value="lib/compiler-bin" />
+    <property name="compiler.src.dir" value="lib/compiler-src" />
+    <property name="compiler.classname.compiler" value="MJ.Compiler" />
+    <property name="compiler.classname.interpreter" value="MJ.Run" />
 
     <property name="samples.main.dir" value="samples" />
-    <property name="samples.temp.dir" value="samples-temp" />
+    <property name="samples.temp.dir" value="temp" />
 
     <property name="transf.wsl.file" value="src-wsl/transf-min.wsl" />
     <property name="transf.wsl.ini" value="transf.ini" />
@@ -108,9 +110,9 @@
         <javac srcdir="${compiler.src.dir}" destdir="${compiler.class.dir}" includeAntRuntime='no' />
     </target>
     
-    <target name="mj-compile">
+    <target name="mj-compile" description="compile a MJ into obj file; given ${filename}">
         <echo message="${filename}" />
-        <java classpath="${compiler.class.dir}" classname="Compiler">
+        <java classpath="${compiler.class.dir}" classname="${compiler.classname.compiler}">
             <arg value="${filename}" />
         </java>
     </target>
@@ -125,9 +127,9 @@
         </foreach>
     </target>
 
-    <target name="mj-run">
+    <target name="mj-run" description="run a MJ obj file given in ${filename} with ${inputstring}">
         <echo message="${filename}" />
-        <java classpath="${compiler.class.dir}" classname="Run">
+        <java classpath="${compiler.class.dir}" classname="${compiler.classname.interpreter}" inputstring="${inputstring}">
             <arg value="${filename}" />
         </java>
     </target>
@@ -188,6 +190,31 @@
         <echo file="${transf.wsl.ini}">${generated-wsl-files}</echo>
     </target>
     
+    <!-- Testing tasks -->
+    
+    <target name="test-run" 
+    description="run .obj .wsl _t.wsl, given are ${file.dir}, ${file.name} (no extension) and an ${inputstring}">
+        <antcall target="mj-run">
+            <param name="filename" value="${file.dir}/${file.name}.obj" />
+            <param name="inputstring" value="${inputstring}" />
+        </antcall>
+        <antcall target="wsl-run">
+            <param name="filename" value="${file.dir}/${file.name}.wsl" />
+            <param name="inputstring" value="${inputstring}" />
+        </antcall>
+        <antcall target="wsl-run">
+            <param name="filename" value="${file.dir}/${file.name}_t.wsl" />
+            <param name="inputstring" value="${inputstring}" />
+        </antcall>
+    </target>
+    
+    <target name="test-run-samples-dir"
+    description="run .obj .wsl _t.wsl, in the samples-temp directory; given ${file.name} (no extension) and an ${inputstring}">
+        <antcall target="test-run">
+            <param name="file.dir" value="${samples.temp.dir}"/>
+        </antcall>
+    </target>
+    
     <!-- jedit specific flags; needs to be the first or the last 10 lines
     :noTabs=true:
     -->