X-Git-Url: http://svarog.pmf.uns.ac.rs/gitweb/?p=mjc2wsl.git;a=blobdiff_plain;f=build.xml;h=f7855572d025f93ca6c1893bb4f63855797b970d;hp=fc76dd0157d104141b92a340944af7b1ff1f8e20;hb=9715cc5ed9268c6a3647cdabed470d32440b8699;hpb=5f2febcd4392a76c7fb4399be6213f1058efb77c

diff --git a/build.xml b/build.xml
index fc76dd0..f785557 100644
--- a/build.xml
+++ b/build.xml
@@ -52,19 +52,21 @@
     <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" />
     <property name="log.file.tests.t" value="${log.dir}/tests-wsl" />
 
-    <property name="version.file" value="${res.dir}/version.properties" />
+    <property name="version.file" value="${res.dir}/com/quemaster/transformations/mjc2wsl/version.properties" />
 
     <!-- **************************************** -->
     <!-- patterns -->
@@ -98,7 +100,7 @@
 
     <target name="init-time">
         <tstamp>
-          <format property="time" pattern="yy-MM-dd--HH-mm-ss"/>
+          <format property="time" pattern="yy-MM-dd--HH-mm-ss-SSS"/>
         </tstamp>
     </target>
 
@@ -132,7 +134,6 @@
               <attribute name="Main-Class" value="com.quemaster.transformations.mjc2wsl.mjc2wsl"/>
             </manifest>
             <fileset dir="${mjc2wsl.class.dir}"/>
-            <fileset dir="${res.dir}"/>
         </jar>
 
     </target>
@@ -159,6 +160,8 @@
     <target name="-store-version-string" if="version">
             <!-- store the new  version string in the correct property file -->
             <echo message="version=${version}"/>
+            <dirname file="${version.file}" property="version.file.dir"/>
+            <mkdir dir="${version.file.dir}" />
             <propertyfile file="${version.file}">
                     <entry key="version" value="${version}"/>
             </propertyfile>
@@ -175,6 +178,9 @@
 
     <target name="build" depends="init,update-version-string" description="build the mjc2wsl tool">
         <javac srcdir="${mjc2wsl.src.dir}" destdir="${mjc2wsl.class.dir}" includeAntRuntime='no' />
+        <copy todir="${mjc2wsl.class.dir}">
+            <fileset dir="${res.dir}"/>
+        </copy>
     </target>
 
     <target name="mjc2wsl">
@@ -295,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>
 
@@ -306,6 +312,7 @@
             <path>
             <fileset dir='${samples.temp.dir}'>
                 <patternset refid="non.transformed.sources"/>
+                <depth max="0"/>
             </fileset>
             </path>
         </foreach>
@@ -542,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"/>
@@ -572,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"/>