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

diff --git a/build.xml b/build.xml
index fa1fcbc..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,13 +13,18 @@
     <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" />
 
     <description>
         Builder script for mjc2wsl and related tools, runs test
         on given samples.
+        
+        Also gives options to chain the tools on individual files.
     </description>
-    
+
     <target name="init">
         <mkdir dir="${mjc2wsl.class.dir}"/>
         <mkdir dir="${compiler.class.dir}"/>
@@ -30,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>
 
@@ -45,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}'>
@@ -76,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}'>
@@ -94,7 +100,7 @@
     </target>
     
     <target name="wsl-run" >
-        <exec executable="${fermat.dir}/bin/wsl" >
+        <exec executable="${fermat.dir}/bin/wsl" inputstring="${inputstring}">
             <env key="PATH" path="${env.PATH}:${fermat.dir}/bin"/>
             <env key="FermaT" path="${fermat.dir}" />
             <env key="SCHEME_LIBRARY_PATH" path="${fermat.dir}/slib/" />
@@ -103,28 +109,38 @@
         </exec>
     </target>
     
-    <target name="wsl-transf" depends="make-transf-ini"
+    <target name="wsl-transf" 
+        description="transform (simplify) a single wsl file generated by mjc2wsl">
+        <delete file="${transf.wsl.ini}"/>
+        
+        <antcall target="wsl-run">
+            <param name="filename" value="${transf.wsl.file}" />
+            <param name="inputstring" value="${transf.filename}" />
+        </antcall>
+    </target>
+    
+    <target name="wsl-transf-samples" depends="make-transf-ini-samples"
         description="transform (simplify) the wsl files generated by mjc2wsl">
         <antcall target="wsl-run">
-            <param name="filename" value="src-wsl/transf-min.wsl" />
+            <param name="filename" value="${transf.wsl.file}" />
         </antcall>
     </target>
     
-    <target name="make-transf-ini">
+    <target name="make-transf-ini-samples">
         <fileset dir="${samples.temp.dir}" casesensitive="no" id="generated-wsl-fileset">
-                <patternset id="non.test.sources">
+                <patternset id="non.transformed.sources">
                     <include name="**/*.wsl"/>
                     <exclude name="**/*_t.wsl"/>
                 </patternset>
         </fileset>
-        <pathconvert pathsep="${line.separator}" property="generated-wsl-files" refid="generated-wsl-fileset">
-            
-        </pathconvert>
+        <pathconvert pathsep="${line.separator}" 
+            property="generated-wsl-files" refid="generated-wsl-fileset" />
 
-        <echo file="transf.ini">${generated-wsl-files}</echo>
+        <echo file="${transf.wsl.ini}">${generated-wsl-files}</echo>
     </target>
     
-    <target name="all" depends='mj-samples,mjc2wsl-samples' description="build the tools, run them on the samples to check">
+    <target name="all" depends='mj-samples,mjc2wsl-samples,wsl-transf-samples'
+        description="build the tools, run them on the samples to check">
     
     </target>