X-Git-Url: http://svarog.pmf.uns.ac.rs/gitweb/?p=mjc2wsl.git;a=blobdiff_plain;f=build.xml;h=af75d0462da6867d970e8527a6da238623927fcf;hp=cf34eaeae8fa356745de3c17e8fe3389d2680dcf;hb=7b37ada1974e628c7e208d8405714a2e610631e9;hpb=f7d7f53c0ab16b5278cb09f8a208a2a8a0034b54

diff --git a/build.xml b/build.xml
index cf34eae..af75d04 100644
--- a/build.xml
+++ b/build.xml
@@ -1,10 +1,6 @@
 <project name="mjc2wsl" default="all">
     <property name="java.encoding" value="utf-8" />
-    <taskdef resource="net/sf/antcontrib/antlib.xml">
-        <classpath>
-            <pathelement location="/usr/share/java/"/>
-        </classpath>
-    </taskdef>
+    <taskdef resource="net/sf/antcontrib/antlib.xml"/>
     
     <property name="mjc2wsl.class.dir" value="bin" />
     <property name="mjc2wsl.src.dir" value="src" />
@@ -16,14 +12,12 @@
     <property name="samples.main.dir" value="samples" />
     <property name="samples.temp.dir" value="samples-temp" />
     
-    <target name="help">
-        <echo>Possible options:
-        all - build the tool and the compiler and test on the samples
-        build - build the mjc2wsl tool
-        mj-build - build the mj compiler
-        mj-samples - run the mj compiler on the samples (build if needed)
-        </echo>
-    </target>
+    <property name="fermat.dir" value="/home/donny/d/donny/fermat3" />
+
+    <description>
+        Builder script for mjc2wsl and related tools, runs test
+        on given samples.
+    </description>
     
     <target name="init">
         <mkdir dir="${mjc2wsl.class.dir}"/>
@@ -36,11 +30,11 @@
         </copy>
     </target>
 
-    <target name="build" depends="init">
+    <target name="build" depends="init" description="build the mjv2wsl tool">
         <javac srcdir="${mjc2wsl.src.dir}" destdir="${mjc2wsl.class.dir}" includeAntRuntime='no' />
     </target>
 
-    <target name="mj-build" depends="init">
+    <target name="mj-build" depends="init" description="build the mj compiler">
         <javac srcdir="${compiler.src.dir}" destdir="${compiler.class.dir}" includeAntRuntime='no' />
     </target>
     
@@ -51,7 +45,7 @@
         </java>
     </target>
     
-    <target name="mj-samples" depends="build">
+    <target name="mj-samples" depends="build" description="run the mj compiler on the samples">
         <foreach param="filename" target="mj-compile">
             <path>
             <fileset dir='${samples.temp.dir}'>
@@ -99,11 +93,42 @@
         </antcall>
     </target>
     
-    <target name="all" depends='mj-samples,mjc2wsl-samples'>
+    <target name="wsl-run" >
+        <exec executable="${fermat.dir}/bin/wsl" >
+            <env key="PATH" path="${env.PATH}:${fermat.dir}/bin"/>
+            <env key="FermaT" path="${fermat.dir}" />
+            <env key="SCHEME_LIBRARY_PATH" path="${fermat.dir}/slib/" />
+            <env key="SCM_INIT_PATH" path="${fermat.dir}/scm/Init5e5.scm" />
+            <arg value="${filename}"/>
+        </exec>
+    </target>
+    
+    <target name="wsl-transf" depends="make-transf-ini"
+        description="transform (simplify) the wsl files generated by mjc2wsl">
+        <antcall target="wsl-run">
+            <param name="filename" value="src-wsl/transf-min.wsl" />
+        </antcall>
+    </target>
+    
+    <target name="make-transf-ini">
+        <fileset dir="${samples.temp.dir}" casesensitive="no" id="generated-wsl-fileset">
+                <patternset id="non.test.sources">
+                    <include name="**/*.wsl"/>
+                    <exclude name="**/*_t.wsl"/>
+                </patternset>
+        </fileset>
+        <pathconvert pathsep="${line.separator}" 
+            property="generated-wsl-files" refid="generated-wsl-fileset" />
+
+        <echo file="transf.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>
     
-    <target name="clean" >
+    <target name="clean" description="clean up all the generated content">
         <delete includeemptydirs="true">
             <fileset dir=".">
                 <include name="${mjc2wsl.class.dir}/*.class"/>