ant - microjava run task

[mjc2wsl.git] / build.xml

diff --git a/build.xml b/build.xml
index a69c609..252d381 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -1,19 +1,29 @@
 <project name="mjc2wsl" default="all">
     <property file="custom.properties"/>
+    
+     <condition property="fermat.dir" value="C:\fermat3">
+       <os family="windows" />
+     </condition>
+
+     <condition property="fermat.dir" value="${user.home}/fermat3">
+       <not><os family="windows" /></not>
+     </condition>
+
+    
     <property name="java.encoding" value="utf-8" />
     <taskdef resource="net/sf/antcontrib/antlib.xml"/>
     
     <property name="mjc2wsl.class.dir" value="bin" />
     <property name="mjc2wsl.src.dir" value="src" />
     <property name="mjc2wsl.options" value="" />
+
+    <property name="res.dir" value="res" />
     
     <property name="compiler.class.dir" value="compiler-bin" />
     <property name="compiler.src.dir" value="compiler" />
 
     <property name="samples.main.dir" value="samples" />
     <property name="samples.temp.dir" value="samples-temp" />
-    
-    <property name="fermat.dir" value="${user.home}/fermat3" />
 
     <property name="transf.wsl.file" value="src-wsl/transf-min.wsl" />
     <property name="transf.wsl.ini" value="transf.ini" />
@@ -61,6 +71,13 @@
         </foreach>
     </target>
 
+    <target name="mj-run">
+        <echo message="${filename}" />
+        <java classpath="${compiler.class.dir}" classname="Run">
+            <arg value="${filename}" />
+        </java>
+    </target>
+
     <target name="mj-samples1" depends="mj-build">
     <!-- simplistic version when antlib (foreach) is not available -->
         <antcall target="mj-compile">
@@ -76,7 +93,7 @@
     
     <target name="mjc2wsl">
         <echo message="${filename}" />
-        <java classpath="${mjc2wsl.class.dir}" classname="mjc2wsl">
+        <java classpath="${mjc2wsl.class.dir}:${res.dir}" classname="mjc2wsl">
             <arg line="${mjc2wsl.options}" />
             <arg value="${filename}" />
         </java>