X-Git-Url: http://svarog.pmf.uns.ac.rs/gitweb/?p=mjc2wsl.git;a=blobdiff_plain;f=build.xml;h=467aacd9dadc0d5b8fab00843cab37f0be08f23a;hp=6324755e7235a995ae1782b3c864e95fc8b68769;hb=86fe051b588dd5a39fbc9345729310304408c1a9;hpb=15d44a73a7ad38a12df848d302c5a8aa5c792e2a

diff --git a/build.xml b/build.xml
index 6324755..467aacd 100644
--- a/build.xml
+++ b/build.xml
@@ -57,6 +57,10 @@
         <exclude name="**/*${transf.wsl.ext}"/>
     </patternset>
 
+    <patternset id="transformed.sources">
+        <include name="**/*${transf.wsl.ext}"/>
+    </patternset>
+
     <!-- general tasks -->
 
     <target name="init" depends="init-time">
@@ -225,7 +229,9 @@
 
     <target name="wsl-run" >
         <property name="args" value=""/>
-        <exec executable="${fermat.dir}/bin/wsl" inputstring="${inputstring}">
+        <property name="wslrun.workdir" value=""/>
+        <exec executable="${fermat.dir}/bin/wsl" inputstring="${inputstring}"
+            dir="${wslrun.workdir}" >
             <env key="PATH" path="${fermat.dir}/bin:${env.PATH}"/>
             <env key="FermaT" path="${fermat.dir}" />
             <env key="SCHEME_LIBRARY_PATH" path="${fermat.dir}/slib/" />
@@ -481,7 +487,7 @@
     <!-- output a comparison Latex file and compile it -->
 
     <target name="output-comparison-pdf-single">
-        <basename property="file.name" file="${filename}" suffix=".obj"/>
+        <basename property="file.name" file="${filename}" suffix=".mj"/>
         <echo append='true' file="${samples.temp.dir}/tex/comparison.tex">
         \section{${file.name}}
         \begin{paracol}{4}
@@ -504,7 +510,7 @@
         <foreach param="filename" target="output-comparison-pdf-single" inheritall="true">
             <path>
             <fileset dir='${samples.temp.dir}'>
-                <include name="*.obj"/>
+                <include name="*.mj"/>
             </fileset>
             </path>
         </foreach>