From 26818e380ea4c3ef0efdd00594e632b83a68225b Mon Sep 17 00:00:00 2001
From: Doni Pracner <quinnuendo@gmail.com>
Date: Fri, 24 Jan 2014 19:44:18 +0100
Subject: [PATCH] ant - added logging to main tasks that work on all the
 samples; slightly improved clean

---
 build.xml | 44 +++++++++++++++++++++++++++++---------------
 1 file changed, 29 insertions(+), 15 deletions(-)

diff --git a/build.xml b/build.xml
index d03ecff..f4dcd55 100644
--- a/build.xml
+++ b/build.xml
@@ -31,6 +31,10 @@
     <property name="transf.wsl.file" value="src-wsl/transf-min.wsl" />
     <property name="transf.wsl.ini" value="transf.ini" />
 
+    <property name="log.dir" value="logs" />
+    <property name="log.file.transformations" value="${log.dir}/transformations" />
+    <property name="log.file.mjc2wsl" value="${log.dir}/mjc2wsl" />
+
     <description>
         Builder script for mjc2wsl and related tools, runs test
         on given samples.
@@ -40,17 +44,24 @@
 
     <!-- general tasks -->
 
-    <target name="init">
+    <target name="init" depends="init-time">
         <mkdir dir="${mjc2wsl.class.dir}"/>
         <mkdir dir="${compiler.class.dir}"/>
         <mkdir dir="${samples.temp.dir}"/>
+        <mkdir dir="${log.dir}"/>
         <copy todir="${samples.temp.dir}">
             <fileset dir="${samples.main.dir}">
                 <include name="*.mj"/>
             </fileset>
         </copy>
     </target>
-    
+
+    <target name="init-time">
+        <tstamp>
+          <format property="time" pattern="(yy-MM-dd)-(HH-mm-ss)"/>
+        </tstamp>
+    </target>
+
     <target name="all" depends='mj-samples,mjc2wsl-samples,wsl-transf-samples'
         description="build the tools, run them on the samples to check">
     
@@ -58,16 +69,10 @@
     
     <target name="clean" description="clean up all the generated content">
         <delete includeemptydirs="true">
-            <fileset dir=".">
-                <include name="${mjc2wsl.class.dir}/*.class"/>
-                <include name="${compiler.class.dir}/*.class"/>
-                <include name="${samples.temp.dir}/*"/>
-            </fileset>
-            <dirset dir=".">
-                <include name="${mjc2wsl.class.dir}"/>
-                <include name="${compiler.class.dir}"/>
-                <include name="${samples.temp.dir}"/>
-            </dirset>
+            <fileset dir="${mjc2wsl.class.dir}"/>
+            <fileset dir="${compiler.class.dir}"/>
+            <fileset dir="${samples.temp.dir}"/>
+            <fileset dir="${log.dir}"/>
         </delete>
     </target>
     
@@ -86,7 +91,9 @@
         </java>
     </target>
     
-    <target name="mjc2wsl-samples" depends="build" description="run the mjc2wsl tool on the samples">
+    <target name="mjc2wsl-samples" depends="build,init-time" description="run the mjc2wsl tool on the samples">
+        <record name="${log.file.mjc2wsl}${time}.txt" emacsmode="true" />
+        <echo>Used options:${mjc2wsl.options}</echo>
         <foreach param="filename" target="mjc2wsl">
             <path>
             <fileset dir='${samples.temp.dir}'>
@@ -94,6 +101,8 @@
             </fileset>
             </path>
         </foreach>
+        <record name="${log.file.mjc2wsl}${time}.txt" action="stop" />
+        <copy file="${log.file.mjc2wsl}${time}.txt" tofile="${log.file.mjc2wsl}.txt"/>
     </target>
     
     <target name="mjc2wsl-samples1" depends="build">
@@ -135,7 +144,8 @@
         </java>
     </target>
     
-    <target name="mj-decode-samples" depends="mj-build" description="decode all of the compiled samples">
+    <target name="mj-decode-samples" depends="mj-build" description="decode all of the compiled samples and save into file 'decoded.txt'">
+        <record name="${samples.temp.dir}/decoded.txt" emacsmode="true" loglevel="info"/>
         <foreach param="filename" target="mj-decode">
             <path>
             <fileset dir='${samples.temp.dir}'>
@@ -143,6 +153,7 @@
             </fileset>
             </path>
         </foreach>
+        <record name="${samples.temp.dir}/decoded.txt" action="stop"/>
     </target>
     
     <target name="mj-run" description="run a MJ obj file given in ${filename} with ${inputstring}">
@@ -188,11 +199,14 @@
         </antcall>
     </target>
     
-    <target name="wsl-transf-samples" depends="make-transf-ini-samples"
+    <target name="wsl-transf-samples" depends="init-time,make-transf-ini-samples"
         description="transform (simplify) the wsl files generated by mjc2wsl">
+        <record name="${log.file.transformations}${time}.txt" emacsmode="true" />
         <antcall target="wsl-run">
             <param name="filename" value="${transf.wsl.file}" />
         </antcall>
+        <record name="${log.file.transformations}${time}" action="stop" />
+        <copy file="${log.file.transformations}${time}.txt" tofile="${log.file.transformations}.txt"/>
     </target>
     
     <target name="make-transf-ini-samples">
-- 
2.25.1