wsl scripts, new ARGV handling

[mjc2wsl.git] / build.xml

diff --git a/build.xml b/build.xml
index 2f6f580..89e8a44 100644 (file)
--- 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" />
     <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.extension" value=".met" />
 
     <property name="tests.dir" value="tests" />
 
 
     <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" />
+    <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.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" />


@@ -132,7 +134,6 @@
               <attribute name="Main-Class" value="com.quemaster.transformations.mjc2wsl.mjc2wsl"/>
             </manifest>
             <fileset dir="${mjc2wsl.class.dir}"/>
               <attribute name="Main-Class" value="com.quemaster.transformations.mjc2wsl.mjc2wsl"/>
             </manifest>
             <fileset dir="${mjc2wsl.class.dir}"/>

-            <fileset dir="${res.dir}"/>

         </jar>
 
     </target>
         </jar>
 
     </target>


@@ -177,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' />
 
     <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">
     </target>
 
     <target name="mjc2wsl">


@@ -297,7 +301,7 @@
 
         <antcall target="wsl-run">
             <param name="filename" value="${transf.wsl.file}" />
 
         <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>
 
         </antcall>
     </target>
 


@@ -308,6 +312,7 @@
             <path>
             <fileset dir='${samples.temp.dir}'>
                 <patternset refid="non.transformed.sources"/>
             <path>
             <fileset dir='${samples.temp.dir}'>
                 <patternset refid="non.transformed.sources"/>

+                <depth max="0"/>

             </fileset>
             </path>
         </foreach>
             </fileset>
             </path>
         </foreach>


@@ -544,6 +549,10 @@
 
     <target name="output-all-versions"
         description="generate variations on the translations in the 'local' folder and tar them">
 
     <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"/>
         <antcall>
             <target name="mj-samples"/>
             <target name="mjc2wsl-samples"/>


@@ -574,6 +583,12 @@
             <param name="samples.temp.dir" value="local/out/popPush-glob"/>
             <param name="mjc2wsl.options" value="--genPopPush --genGlobalVars"/>
         </antcall>
             <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"/>
         <tar basedir="local/out" compression="gzip"
             destfile="local/mjc2wsl-samples.tgz"
             includes="*/*.wsl"/>