X-Git-Url: http://svarog.pmf.uns.ac.rs/gitweb/?p=mjc2wsl.git;a=blobdiff_plain;f=build.xml;h=1b7010b56969130cc1fabb3e1e12d0dfae0ab4dc;hp=afbb1f8b04f2528a16a5f2356b00a049d95defc3;hb=1225cbd4b29707406cd2b9f6735a674a251fc702;hpb=187580f7c0a25b0fc9c5110cdc25c6f71f4785eb

diff --git a/build.xml b/build.xml
index afbb1f8..1b7010b 100644
--- a/build.xml
+++ b/build.xml
@@ -1,18 +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="/home/donny/d/donny/fermat3" />
 
     <property name="transf.wsl.file" value="src-wsl/transf-min.wsl" />
     <property name="transf.wsl.ini" value="transf.ini" />
@@ -50,7 +61,7 @@
         </java>
     </target>
     
-    <target name="mj-samples" depends="build" description="run the mj compiler on the samples">
+    <target name="mj-samples" depends="mj-build" description="run the mj compiler on the samples">
         <foreach param="filename" target="mj-compile">
             <path>
             <fileset dir='${samples.temp.dir}'>
@@ -75,7 +86,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>