ant - updates to use the jar for the MJ compiler. The compiler.class.dir can still...

diff --git a/build.xml b/build.xml
index 7fb3ee4..eaeef45 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -20,6 +20,7 @@
 
     <property name="res.dir" value="res" />
     
 
     <property name="res.dir" value="res" />
     

+    <property name="compiler.class.jar" value="lib/mj.jar" />

     <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.class.dir" value="lib/compiler-bin" />
     <property name="compiler.src.dir" value="lib/compiler-src" />
     <property name="compiler.classname.compiler" value="MJ.Compiler" />


@@ -123,12 +124,12 @@
     
     <target name="mj-compile" description="compile a MJ into obj file; given ${filename}">
         <echo message="${filename}" />
     
     <target name="mj-compile" description="compile a MJ into obj file; given ${filename}">
         <echo message="${filename}" />

-        <java classpath="${compiler.class.dir}" classname="${compiler.classname.compiler}">
+        <java classpath="${compiler.class.dir}:${compiler.class.jar}" classname="${compiler.classname.compiler}">

             <arg value="${filename}" />
         </java>
     </target>
     
             <arg value="${filename}" />
         </java>
     </target>
     

-    <target name="mj-samples" depends="mj-build" description="run the mj compiler on the samples">
+    <target name="mj-samples" description="run the mj compiler on the samples">

         <foreach param="filename" target="mj-compile">
             <path>
             <fileset dir='${samples.temp.dir}'>
         <foreach param="filename" target="mj-compile">
             <path>
             <fileset dir='${samples.temp.dir}'>


@@ -140,12 +141,12 @@
 
     <target name="mj-decode" description="decode a MJ obj file given in ${filename}">
         <echo message="${filename}" />
 
     <target name="mj-decode" description="decode a MJ obj file given in ${filename}">
         <echo message="${filename}" />

-        <java classpath="${compiler.class.dir}" classname="${compiler.classname.decoder}">
+        <java classpath="${compiler.class.dir}:${compiler.class.jar}" classname="${compiler.classname.decoder}">

             <arg value="${filename}" />
         </java>
     </target>
     
             <arg value="${filename}" />
         </java>
     </target>
     

-    <target name="mj-decode-samples" depends="mj-build" description="decode all of the compiled samples and save into file 'decoded.txt'">
+    <target name="mj-decode-samples" description="decode all of the compiled samples and save into file 'decoded.txt'">

         <record name="${samples.temp.dir}/decoded.txt" emacsmode="true" loglevel="info"/>
         <foreach param="filename" target="mj-decode">
             <path>
         <record name="${samples.temp.dir}/decoded.txt" emacsmode="true" loglevel="info"/>
         <foreach param="filename" target="mj-decode">
             <path>


@@ -159,7 +160,7 @@
     
     <target name="mj-run" description="run a MJ obj file given in ${filename} with ${inputstring}">
         <echo message="${filename}" />
     
     <target name="mj-run" description="run a MJ obj file given in ${filename} with ${inputstring}">
         <echo message="${filename}" />

-        <java classpath="${compiler.class.dir}" classname="${compiler.classname.interpreter}" inputstring="${inputstring}">
+        <java classpath="${compiler.class.dir}:${compiler.class.jar}" classname="${compiler.classname.interpreter}" inputstring="${inputstring}">

             <arg value="${filename}" />
         </java>
     </target>
             <arg value="${filename}" />
         </java>
     </target>

diff --git a/docs/running-ant.txt b/docs/running-ant.txt
index 03c399d..2380404 100644 (file)
--- a/docs/running-ant.txt
+++ b/docs/running-ant.txt
@@ -4,7 +4,7 @@ Running the ant tasks
 This project supplies an ant build file.
 
 When used without parameters it will 
 This project supplies an ant build file.
 
 When used without parameters it will 

-- build the main tool, mjc2wsl, as well as the MicroJava compiler
+- build the main tool, mjc2wsl

 - compile all the given MicroJava samples in a temp folder
 - translated these to WSL
 - run a transformation script for all of these files 
 - compile all the given MicroJava samples in a temp folder
 - translated these to WSL
 - run a transformation script for all of these files 


@@ -42,7 +42,10 @@ mjc2wsl - runs the tool on all obj files in "samples.temp.dir"
 MicroJava tasks
 ---------------
 
 MicroJava tasks
 ---------------
 

-These tasks use "compiler.class.dir"
+These tasks use "compiler.class.jar" to get the classes,
+but will also look first into "compiler.class.dir" if there
+is any override.
+

 
 mj-decode - decode the bytecode given in "filename" into
 operation names and parameteres (uses
 
 mj-decode - decode the bytecode given in "filename" into
 operation names and parameteres (uses