X-Git-Url: http://svarog.pmf.uns.ac.rs/gitweb/?p=mjc2wsl.git;a=blobdiff_plain;f=build.xml;h=206065dba752a3b9cea8995e174e6c5c9f03cada;hp=a2de8b05af57f6d436103bd80c74a74e94910a3e;hb=3215eb36e56cb67d07ab2bdcf1858880897f97ac;hpb=3f48f8ab0fdd7ffc6d9e15cd89968470ef9ac52d

diff --git a/build.xml b/build.xml
index a2de8b0..206065d 100644
--- a/build.xml
+++ b/build.xml
@@ -1,7 +1,7 @@
 <project name="mjc2wsl" default="all">
     <property file="custom.properties"/>
     <property environment="env"/>
-    
+
      <condition property="fermat.dir" value="C:\fermat3">
        <os family="windows" />
      </condition>
@@ -10,10 +10,13 @@
        <not><os family="windows" /></not>
      </condition>
 
-    
+
     <property name="java.encoding" value="utf-8" />
     <taskdef resource="net/sf/antcontrib/antlib.xml"/>
     
+    <!-- when using multiple threads there is a problem with logging!-->
+    <property name="global.max.threads" value="1" />
+    
     <property name="mjc2wsl.class.dir" value="bin" />
     <property name="mjc2wsl.src.dir" value="src" />
     <property name="mjc2wsl.options" value="" />
@@ -32,10 +35,14 @@
 
     <property name="transf.wsl.file" value="src-wsl/transf-min.wsl" />
     <property name="transf.wsl.ini" value="transf.ini" />
+    <property name="transf.wsl.ext" value="_t.wsl" />
+    
+    <property name="tests.dir" value="tests" />
 
     <property name="log.dir" value="logs" />
     <property name="log.file.transformations" value="${log.dir}/transformations" />
     <property name="log.file.mjc2wsl" value="${log.dir}/mjc2wsl" />
+    <property name="log.file.tests.m" value="${log.dir}/tests-mj" />
 
     <description>
         Builder script for mjc2wsl and related tools, runs test
@@ -44,6 +51,11 @@
         Also gives options to chain the tools on individual files.
     </description>
 
+    <patternset id="non.transformed.sources">
+        <include name="**/*.wsl"/>
+        <exclude name="**/*${transf.wsl.ext}"/>
+    </patternset>
+
     <!-- general tasks -->
 
     <target name="init" depends="init-time">
@@ -77,37 +89,37 @@
             <fileset dir="${log.dir}"/>
         </delete>
     </target>
-	
-	<!-- version tasks
-	based on ideas by Jesper Öqvist http://llbit.se/?p=1876 -->
-    
-	<!-- this target is only run if the 'version' property is undefined -->
-	
-	<target name="update-version-string" unless="version">
-	        <!-- get a new version string using git describe if possible -->
-	        <echo message="Updating version string..."/>
-	        <exec executable="git" outputproperty="version"
-	                failifexecutionfails="false">
-	                <arg value="describe"/>
-	        </exec>
-	        <antcall target="-store-version-string"/>
-	        <!-- ensure version is defined even if git was not available -->
-	        <property file="${res.dir}/version.properties"/>
-	</target>
-    
-	<target name="-store-version-string" if="version">
-	        <!-- store the new  version string in the correct property file -->
-	        <echo message="version=${version}"/>
-	        <propertyfile file="${res.dir}/version.properties">
-	                <entry key="version" value="${version}"/>
-	        </propertyfile>
-	        <exec executable="git" failifexecutionfails="false">
-	                <arg value="update-index"/>
-	                <arg value="--assume-unchanged"/>
-	                <arg value="${res.dir}/version.properties"/>
-	        </exec>
-	</target>
-	
+    
+    <!-- version tasks
+    based on ideas by Jesper Öqvist http://llbit.se/?p=1876 -->
+    
+    <!-- this target is only run if the 'version' property is undefined -->
+    
+    <target name="update-version-string" unless="version">
+            <!-- get a new version string using git describe if possible -->
+            <echo message="Updating version string..."/>
+            <exec executable="git" outputproperty="version"
+                    failifexecutionfails="false">
+                    <arg value="describe"/>
+            </exec>
+            <antcall target="-store-version-string"/>
+            <!-- ensure version is defined even if git was not available -->
+            <property file="${res.dir}/version.properties"/>
+    </target>
+    
+    <target name="-store-version-string" if="version">
+            <!-- store the new  version string in the correct property file -->
+            <echo message="version=${version}"/>
+            <propertyfile file="${res.dir}/version.properties">
+                    <entry key="version" value="${version}"/>
+            </propertyfile>
+            <exec executable="git" failifexecutionfails="false">
+                    <arg value="update-index"/>
+                    <arg value="--assume-unchanged"/>
+                    <arg value="${res.dir}/version.properties"/>
+            </exec>
+    </target>
+    
     <!-- mjc2wsl related tasks -->
     
     <target name="build" depends="init,update-version-string" description="build the mjc2wsl tool">
@@ -125,7 +137,7 @@
     <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">
+        <foreach param="filename" target="mjc2wsl"  parallel="true" maxthreads="${global.max.threads}">
             <path>
             <fileset dir='${samples.temp.dir}'>
                 <include name="*.obj"/>
@@ -159,7 +171,7 @@
     </target>
     
     <target name="mj-samples" description="run the mj compiler on the samples" depends="init">
-        <foreach param="filename" target="mj-compile">
+        <foreach param="filename" target="mj-compile"  parallel="true" maxthreads="${global.max.threads}">
             <path>
             <fileset dir='${samples.temp.dir}'>
                 <include name="*.mj"/>
@@ -170,13 +182,14 @@
 
     <target name="mj-decode" description="decode a MJ obj file given in ${filename}">
         <echo message="${filename}" />
-        <java classpath="${compiler.class.dir}:${compiler.class.jar}" classname="${compiler.classname.decoder}">
+        <java classpath="${compiler.class.dir}:${compiler.class.jar}" 
+              classname="${compiler.classname.decoder}"
+              output="${filename}.decoded" >
             <arg value="${filename}" />
         </java>
     </target>
     
-    <target name="mj-decode-samples" description="decode all of the compiled samples and save into file 'decoded.txt'">
-        <record name="${samples.temp.dir}/decoded.txt" emacsmode="true" loglevel="info"/>
+    <target name="mj-decode-samples" description="decode all of the obj files in ${samples.temp.dir}">
         <foreach param="filename" target="mj-decode">
             <path>
             <fileset dir='${samples.temp.dir}'>
@@ -184,7 +197,6 @@
             </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}">
@@ -211,41 +223,52 @@
     <!-- wsl related tasks -->
 
     <target name="wsl-run" >
+        <property name="args" value=""/>
         <exec executable="${fermat.dir}/bin/wsl" inputstring="${inputstring}">
             <env key="PATH" path="${fermat.dir}/bin:${env.PATH}"/>
             <env key="FermaT" path="${fermat.dir}" />
             <env key="SCHEME_LIBRARY_PATH" path="${fermat.dir}/slib/" />
             <env key="SCM_INIT_PATH" path="${fermat.dir}/scm/Init5e7.scm" />
-            <arg value="${filename}"/>
+            <arg line="${filename} ${args}"/>
         </exec>
     </target>
     
     <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}" />
+            <param name="args" value="${transf.filename}" />
         </antcall>
     </target>
     
-    <target name="wsl-transf-samples" depends="init-time,make-transf-ini-samples"
-        description="transform (simplify) the wsl files generated by mjc2wsl">
+    <target name="wsl-transf-samples" depends="init"
+    description="transform (simplify) the wsl files generated by mjc2wsl" >
         <record name="${log.file.transformations}${time}.txt" emacsmode="true" />
+        <foreach param="transf.filename" target="wsl-transf" parallel="true" maxthreads="${global.max.threads}">
+            <path>
+            <fileset dir='${samples.temp.dir}'>
+                <patternset refid="non.transformed.sources"/>
+            </fileset>
+            </path>
+        </foreach>
+        <record name="${log.file.transformations}${time}.txt" action="stop" />
+        <copy file="${log.file.transformations}${time}.txt" tofile="${log.file.transformations}.txt"/>
+    </target>
+
+    <target name="wsl-transf-samples-ini" depends="init-time,make-transf-ini-samples"
+        description="transform (simplify) the wsl files generated by mjc2wsl - uses ini file">
+        <record name="${log.file.transformations}${time}i.txt" emacsmode="true" />
         <antcall target="wsl-run">
             <param name="filename" value="${transf.wsl.file}" />
         </antcall>
-	<record name="${log.file.transformations}${time}.txt" action="stop" />
-        <copy file="${log.file.transformations}${time}.txt" tofile="${log.file.transformations}.txt"/>
+        <record name="${log.file.transformations}${time}i.txt" action="stop" />
+        <copy file="${log.file.transformations}${time}i.txt" tofile="${log.file.transformations}.txt"/>
     </target>
     
     <target name="make-transf-ini-samples">
         <fileset dir="${samples.temp.dir}" casesensitive="no" id="generated-wsl-fileset">
-                <patternset id="non.transformed.sources">
-                    <include name="**/*.wsl"/>
-                    <exclude name="**/*_t.wsl"/>
-                </patternset>
+                <patternset refid="non.transformed.sources"/>
         </fileset>
         <pathconvert pathsep="${line.separator}" 
             property="generated-wsl-files" refid="generated-wsl-fileset" />
@@ -255,35 +278,161 @@
     
     <!-- Testing tasks -->
     
-    <target name="test-run" 
-    description="run .obj .wsl _t.wsl, given are ${file.dir}, ${file.name} (no extension) and an ${inputstring}">
-    	<record name="${file.dir}/${file.name}.out1"  emacsmode="true" />
-    	<antcall target="mj-run">
+    <target name="manual-test-run" 
+    description="run .obj .wsl ${transf.wsl.ext}, given are ${file.dir}, ${file.name} (no extension) and an ${inputstring}">
+        <record name="${file.dir}/${file.name}.out1"  emacsmode="true" />
+        <antcall target="mj-run">
             <param name="filename" value="${file.dir}/${file.name}.obj" />
             <param name="inputstring" value="${inputstring}" />
         </antcall>
-    	<record name="${file.dir}/${file.name}.out1" action="stop" />
-    	<record name="${file.dir}/${file.name}.out2"  emacsmode="true" />
+        <record name="${file.dir}/${file.name}.out1" action="stop" />
+        <record name="${file.dir}/${file.name}.out2"  emacsmode="true" />
         <antcall target="wsl-run">
             <param name="filename" value="${file.dir}/${file.name}.wsl" />
             <param name="inputstring" value="${inputstring}" />
         </antcall>
-    	<record name="${file.dir}/${file.name}.out2" action="stop" />
-    	<record name="${file.dir}/${file.name}.out3" emacsmode="true" />
+        <record name="${file.dir}/${file.name}.out2" action="stop" />
+        <record name="${file.dir}/${file.name}.out3" emacsmode="true" />
         <antcall target="wsl-run">
-            <param name="filename" value="${file.dir}/${file.name}_t.wsl" />
+            <param name="filename" value="${file.dir}/${file.name}${transf.wsl.ext}" />
             <param name="inputstring" value="${inputstring}" />
         </antcall>
-    	<record name="${file.dir}/${file.name}.out3" action="stop" />
+        <record name="${file.dir}/${file.name}.out3" action="stop" />
     </target>
     
-    <target name="test-run-samples-dir"
-    description="run .obj .wsl _t.wsl, in the samples-temp directory; given ${file.name} (no extension) and an ${inputstring}">
-        <antcall target="test-run">
+    <target name="manual-test-run-samples-dir"
+    description="run .obj .wsl ${transf.wsl.ext}, in the samples-temp directory; given ${file.name} (no extension) and an ${inputstring}">
+        <antcall target="manual-test-run">
             <param name="file.dir" value="${samples.temp.dir}"/>
         </antcall>
     </target>
+    
+    <target name="init-compare">
+        <mkdir dir="${samples.temp.dir}/outputs"/>
+    </target>
+        
+    <target name="test-m-w">
+    
+    <basename property="file.out" file="${inputfile}" suffix=".txt"/>
+    
+        <java classpath="${compiler.class.dir}:${compiler.class.jar}" 
+        classname="${compiler.classname.interpreter}" 
+        input="${inputfile}"
+        error="${samples.temp.dir}/outputs/${file.out}.errmj"
+        output="${samples.temp.dir}/outputs/${file.out}.outmj">
+            <arg value="${file.dir}/${file.name}.obj" />
+        </java>
+        
+        <exec executable="${fermat.dir}/bin/wsl" 
+        input="${inputfile}"
+        error="${samples.temp.dir}/outputs/${file.out}.errwsl"
+        output="${samples.temp.dir}/outputs/${file.out}.outwsl" >
+            <env key="PATH" path="${fermat.dir}/bin:${env.PATH}"/>
+            <env key="FermaT" path="${fermat.dir}" />
+            <env key="SCHEME_LIBRARY_PATH" path="${fermat.dir}/slib/" />
+            <env key="SCM_INIT_PATH" path="${fermat.dir}/scm/Init5e7.scm" />
+            <arg value="${file.dir}/${file.name}.wsl"/>
+        </exec>
+        
+        <exec executable="perl" resultproperty="ook">
+            <arg value="lib/compare-m-w.pl"/>
+            <arg value="${file.dir}/outputs"/>
+            <arg value="${file.out}"/>
+        </exec>
+        
+    </target>
+    
+    <target name="test-w-wt">
+    
+    <basename property="file.out" file="${inputfile}" suffix=".txt"/>
+    
+        <exec executable="${fermat.dir}/bin/wsl" 
+        input="${inputfile}"
+        error="${samples.temp.dir}/outputs/${file.out}.errwsl"
+        output="${samples.temp.dir}/outputs/${file.out}.outwsl" >
+            <env key="PATH" path="${fermat.dir}/bin:${env.PATH}"/>
+            <env key="FermaT" path="${fermat.dir}" />
+            <env key="SCHEME_LIBRARY_PATH" path="${fermat.dir}/slib/" />
+            <env key="SCM_INIT_PATH" path="${fermat.dir}/scm/Init5e7.scm" />
+            <arg value="${file.dir}/${file.name}.wsl"/>
+        </exec>
+        
+        <exec executable="${fermat.dir}/bin/wsl" 
+        input="${inputfile}"
+        error="${samples.temp.dir}/outputs/${file.out}.errwslt"
+        output="${samples.temp.dir}/outputs/${file.out}.outwslt" >
+            <env key="PATH" path="${fermat.dir}/bin:${env.PATH}"/>
+            <env key="FermaT" path="${fermat.dir}" />
+            <env key="SCHEME_LIBRARY_PATH" path="${fermat.dir}/slib/" />
+            <env key="SCM_INIT_PATH" path="${fermat.dir}/scm/Init5e7.scm" />
+            <arg value="${file.dir}/${file.name}${transf.wsl.ext}"/>
+        </exec>
+        
+        <exec executable="perl">
+            <arg value="lib/compare-w-wt.pl"/>
+            <arg value="${file.dir}/outputs"/>
+            <arg value="${file.out}"/>
+        </exec>
+    </target>
+
+    <target name="test-fn">
+        <basename property="file.name" file="${filename}" suffix=".obj"/>
+        <dirname property="file.dir" file="${filename}"/>
+        <foreach param="inputfile" target="test-m-w" inheritall="true">
+            <path>
+            <fileset dir='${tests.dir}'>
+                <include name="${file.name}*.txt"/>
+            </fileset>
+            </path>
+        </foreach>
+    </target>
+    
+    <target name="test-fn-t">
+        <basename property="file.name" file="${filename}" suffix="${transf.wsl.ext}"/>
+        <dirname property="file.dir" file="${filename}"/>
+        <foreach param="inputfile" target="test-w-wt" inheritall="true">
+            <path>
+            <fileset dir='${tests.dir}'>
+                <include name="${file.name}*.txt"/>
+            </fileset>
+            </path>
+        </foreach>
+    </target>
+    
+    <target name="test-all-m" depends="init-compare,init-time"
+    description="Run all the tests from the test directory to compare MJ and WSL" >
+        <record name="${log.file.tests.m}${time}.txt" emacsmode="true" />
+        <foreach param="filename" target="test-fn" inheritall="true">
+            <path>
+            <fileset dir='${samples.temp.dir}'>
+                <include name="*.obj"/>
+            </fileset>
+            </path>
+        </foreach>
+        <record name="${log.file.tests}${time}.txt" action="stop" />
+        <move file="${log.file.tests.m}.txt" tofile="${log.file.tests.m}-previous.txt" failonerror="false"/>
+        <copy file="${log.file.tests.m}${time}.txt" tofile="${log.file.tests.m}.txt"/>        
+    </target>
 
+    <target name="test-all-t" depends="init-compare"
+    description="Run all the tests from the test directory to compare WSL and transformations" >
+        <foreach param="filename" target="test-fn-t">
+            <path>
+            <fileset dir='${samples.temp.dir}'>
+                <include name="*${transf.wsl.ext}"/>
+            </fileset>
+            </path>
+        </foreach>
+    </target>
+    
+    <target name="q-test">
+    <!-- for quick tests -->
+        <antcall target="test-fn">
+            <param name="file.name" value="Rek1"/>
+            <param name="file.dir" value="${samples.temp.dir}"/>
+        </antcall>
+    </target>
+    
     <!-- output serveral versions of files -->
 
     <target name="output-all-versions"
@@ -323,6 +472,48 @@
             includes="*/*.wsl"/>
     </target>
 
+
+    <!-- output a comparison Latex file and compile it -->
+
+    <target name="output-comparison-pdf-single">
+        <basename property="file.name" file="${filename}" suffix=".obj"/>
+        <echo append='true' file="${samples.temp.dir}/tex/comparison.tex">
+        \section{${file.name}}
+        \begin{paracol}{4}
+        \lstinputlisting[style=mj]{../${file.name}.mj}
+        \switchcolumn
+        \lstinputlisting[style=decoded]{../${file.name}.obj.decoded}
+        \switchcolumn
+        \lstinputlisting[style=wsl,lastline=200]{../${file.name}.wsl}
+        \switchcolumn
+        \lstinputlisting[style=wslt,lastline=200]{../${file.name}${transf.wsl.ext}}
+        \end{paracol}
+        </echo>
+    </target>
+    
+    <target name="output-comparison-pdf"
+        description="Makes a parallel display in Latex and produces a pdf (tex dir in temp dir)" >
+
+        <copy file="lib/tex/comparison-start.tex" overwrite="true" 
+            tofile="${samples.temp.dir}/tex/comparison.tex"/>
+        <foreach param="filename" target="output-comparison-pdf-single" inheritall="true">
+            <path>
+            <fileset dir='${samples.temp.dir}'>
+                <include name="*.obj"/>
+            </fileset>
+            </path>
+        </foreach>
+        <concat destfile="${samples.temp.dir}/tex/comparison.tex" append="true">
+            <filelist dir="lib/tex" files="comparison-end.tex"/>
+        </concat>
+        <antcall target="output-comparison-compile"/>
+    </target>
+    
+    <target name="output-comparison-compile">
+        <exec command="pdflatex comparison.tex"
+              dir="${samples.temp.dir}/tex"/>
+    </target>
+
     <!-- jedit specific flags; needs to be the first or the last 10 lines
     :noTabs=true:
     -->