From 5091358aad632e0c7dab0e493c6ed7e28692ebe5 Mon Sep 17 00:00:00 2001
From: Doni Pracner <quinnuendo@gmail.com>
Date: Tue, 12 Nov 2013 00:28:27 +0100
Subject: [PATCH] ant build - new task to run a transf on a single file; minor
 updates to the properties; target 'all' now has the wsl transf as well

---
 build.xml              | 31 +++++++++++++++++++++++--------
 src-wsl/transf-min.wsl |  2 +-
 2 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/build.xml b/build.xml
index af75d04..854816a 100644
--- a/build.xml
+++ b/build.xml
@@ -14,11 +14,16 @@
     
     <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" />
+
     <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}"/>
@@ -94,7 +99,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,16 +108,26 @@
         </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>
@@ -120,10 +135,10 @@
         <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' 
+    <target name="all" depends='mj-samples,mjc2wsl-samples,wsl-transf-samples'
         description="build the tools, run them on the samples to check">
     
     </target>
diff --git a/src-wsl/transf-min.wsl b/src-wsl/transf-min.wsl
index 7437909..629e91b 100755
--- a/src-wsl/transf-min.wsl
+++ b/src-wsl/transf-min.wsl
@@ -78,7 +78,7 @@ IF @File_Exists?(inifilename) THEN
 	OD;
 	@Close_Input_Port(inifile);
 ELSE
-    PRINT("ini file (",inifile,") not found.",
+    PRINT("ini file (",inifilename,") not found.",
     " it should contain a list of filenames to be converted");
     PRINT("you can input a filename now:");
     filename := @Read_Line(Standard_Input_Port);
-- 
2.17.1