X-Git-Url: http://svarog.pmf.uns.ac.rs/gitweb/?p=mjc2wsl.git;a=blobdiff_plain;f=build.xml;h=ee686f5245ed77ce303604ccdb4b11b83786a3dd;hp=17ee30f6a2f6766fb9ddfd509276fdb3c40a23ee;hb=4a6f2c29f278c0f08ad9670e2ac9878b0c17c2df;hpb=376108fe68a6fc7695810c2faf480d730050abfc

diff --git a/build.xml b/build.xml
index 17ee30f..ee686f5 100644
--- a/build.xml
+++ b/build.xml
@@ -52,13 +52,15 @@
     <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" />
+    <!-- args can be used to send additional arguments to a script -->
+    <property name="transf.wsl.args" value="" />
 
-    <property name="metrics.wsl.file" value="src-wsl/metrics.wsl" />
+    <property name="metrics.wsl.file" value="src-wsl/metrics_csv.wsl" />
     <property name="metrics.extension" value=".met" />
 
     <property name="tests.dir" value="tests" />
 
-    <property name="log.dir" value="logs" />
+    <property name="log.dir" value="${basedir}/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" />
@@ -299,7 +301,7 @@
 
         <antcall target="wsl-run">
             <param name="filename" value="${transf.wsl.file}" />
-            <param name="args" value="${transf.filename}" />
+            <param name="args" value="${transf.wsl.args} ${transf.filename}" />
         </antcall>
     </target>
 
@@ -310,6 +312,7 @@
             <path>
             <fileset dir='${samples.temp.dir}'>
                 <patternset refid="non.transformed.sources"/>
+                <depth max="0"/>
             </fileset>
             </path>
         </foreach>
@@ -546,6 +549,10 @@
 
     <target name="output-all-versions"
         description="generate variations on the translations in the 'local' folder and tar them">
+        <delete>
+                <fileset dir="local/out/"/>
+        </delete>
+        <mkdir dir="local/out"/>
         <antcall>
             <target name="mj-samples"/>
             <target name="mjc2wsl-samples"/>
@@ -576,6 +583,12 @@
             <param name="samples.temp.dir" value="local/out/popPush-glob"/>
             <param name="mjc2wsl.options" value="--genPopPush --genGlobalVars"/>
         </antcall>
+        <antcall>
+            <target name="mj-samples"/>
+            <target name="mjc2wsl-samples"/>
+            <param name="samples.temp.dir" value="local/out/popPush-loc-separate"/>
+            <param name="mjc2wsl.options" value="--genPopPush --genInlinePrint --genLocalsSeparate --genLocalVars"/>
+        </antcall>
         <tar basedir="local/out" compression="gzip"
             destfile="local/mjc2wsl-samples.tgz"
             includes="*/*.wsl"/>