X-Git-Url: http://svarog.pmf.uns.ac.rs/gitweb/?p=mjc2wsl.git;a=blobdiff_plain;f=build.xml;h=9af121c95e804b81d96904b515e22748e2159c4d;hp=59b015598563bf05fd564870682255e1c6107d39;hb=b0be96abb7620720a4bf5731dca5855318e1cefd;hpb=3f11a7134ca76ea30f1c97252697204e8af29359

diff --git a/build.xml b/build.xml
index 59b0155..9af121c 100644
--- a/build.xml
+++ b/build.xml
@@ -37,6 +37,9 @@
     <property name="transf.wsl.ini" value="transf.ini" />
     <property name="transf.wsl.ext" value="_t.wsl" />
     
+    <property name="metrics.wsl.file" value="src-wsl/metrics.wsl" />
+    <property name="metrics.extension" value=".met" />
+
     <property name="tests.dir" value="tests" />
 
     <property name="log.dir" value="logs" />
@@ -443,7 +446,45 @@
             <param name="file.dir" value="${samples.temp.dir}"/>
         </antcall>
     </target>
-    
+
+    <!-- metrics -->
+
+    <target name="metrics-compare-wsl">
+        <basename property="metrics.temp.name" file="${metrics.run.filename}" suffix="${transf.wsl.ext}"/>
+        <dirname property="metrics.temp.dir" file="${metrics.run.filename}"/>
+        <antcall target="wsl-run">
+            <param name="filename" value="${metrics.wsl.file}" />
+            <param name="args" value="-o ${metrics.temp.dir}/${metrics.temp.name}${metrics.extension} -c ${metrics.temp.dir}/${metrics.temp.name}.wsl ${metrics.temp.dir}/${metrics.temp.name}${transf.wsl.ext}" />
+
+        </antcall>
+
+        <!--
+        <echo>-o ${metrics.temp.name}.met -c ${metrics.temp.name}.wsl ${metrics.temp.name}${transf.wsl.ext}</echo>
+        -->
+    </target>
+
+    <target name="metrics-samples-compare-wsl" depends="init"
+    description="metrics on transformed wsl files (csv file)" >
+
+        <antcall target="wsl-run">
+            <param name="filename" value="${metrics.wsl.file}" />
+            <param name="args" value="-o ${samples.temp.dir}/0000-header${metrics.extension} -HC" />
+
+        </antcall>
+
+        <foreach param="metrics.run.filename" target="metrics-compare-wsl" parallel="true" maxthreads="${global.max.threads}">
+            <path>
+            <fileset dir='${samples.temp.dir}'>
+                <patternset refid="transformed.sources"/>
+            </fileset>
+            </path>
+        </foreach>
+
+        <concat destfile="${samples.temp.dir}/metrics-wsl-compare.csv">
+          <fileset dir="${samples.temp.dir}" includes="*${metrics.extension}"/>
+        </concat>
+    </target>
+
     <!-- output serveral versions of files -->
 
     <target name="output-all-versions"
@@ -487,7 +528,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}
@@ -510,7 +551,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>