X-Git-Url: http://svarog.pmf.uns.ac.rs/gitweb/?p=mjc2wsl.git;a=blobdiff_plain;f=build.xml;h=a69c6099c431b11805e8e61d80ccb929c08bfd86;hp=854816a7c586f11b4fac9551fdf2ba6c1143960d;hb=db60afe01e31e932e653dc1cf1c5aaa8fd94ad12;hpb=5091358aad632e0c7dab0e493c6ed7e28692ebe5

diff --git a/build.xml b/build.xml
index 854816a..a69c609 100644
--- a/build.xml
+++ b/build.xml
@@ -1,4 +1,5 @@
 <project name="mjc2wsl" default="all">
+    <property file="custom.properties"/>
     <property name="java.encoding" value="utf-8" />
     <taskdef resource="net/sf/antcontrib/antlib.xml"/>
     
@@ -12,7 +13,7 @@
     <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="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" />
@@ -35,7 +36,7 @@
         </copy>
     </target>
 
-    <target name="build" depends="init" description="build the mjv2wsl tool">
+    <target name="build" depends="init" description="build the mjc2wsl tool">
         <javac srcdir="${mjc2wsl.src.dir}" destdir="${mjc2wsl.class.dir}" includeAntRuntime='no' />
     </target>
 
@@ -50,7 +51,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}'>
@@ -81,7 +82,7 @@
         </java>
     </target>
     
-    <target name="mjc2wsl-samples" depends="build">
+    <target name="mjc2wsl-samples" depends="build" description="run the mjc2wsl tool on the samples">
         <foreach param="filename" target="mjc2wsl">
             <path>
             <fileset dir='${samples.temp.dir}'>