X-Git-Url: http://svarog.pmf.uns.ac.rs/gitweb/?p=mjc2wsl.git;a=blobdiff_plain;f=build.xml;h=d9c6d1488b6b433eaf0f2651a88f69ce11fc5ddc;hp=fac261a021b712478ffe461289d76d966159c258;hb=e3140851cb2899b2a352ef2825317bc939f5bf50;hpb=8f8cbd8366373da7251a39f2e415ad22ae388e50

diff --git a/build.xml b/build.xml
index fac261a..d9c6d14 100644
--- a/build.xml
+++ b/build.xml
@@ -19,8 +19,10 @@
 
     <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" />
@@ -110,7 +112,7 @@
     
     <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>
@@ -127,7 +129,7 @@
 
     <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" inputstring="${inputstring}">
+        <java classpath="${compiler.class.dir}" classname="${compiler.classname.interpreter}" inputstring="${inputstring}">
             <arg value="${filename}" />
         </java>
     </target>