expanded sample size, first version

[mjc2wsl.git] / build.xml

diff --git a/build.xml b/build.xml
index 6f2572b..a122a38 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -47,12 +47,12 @@
     <property name="compiler.classname.interpreter" value="MJ.Run" />
     <property name="compiler.classname.decoder" value="MJ.Decode" />
 
     <property name="compiler.classname.interpreter" value="MJ.Run" />
     <property name="compiler.classname.decoder" value="MJ.Decode" />
 

-    <property name="samples.main.dir" value="samples" />
-    <property name="samples.temp.dir" value="temp" />
+    <property name="samples.main.dir" value="samples/alpha-mj" />
+    <property name="samples.temp.dir" value="temp/alpha-mj" />

 
 

-    <property name="transf.wsl.file" value="src-wsl/transf-min.wsl" />
+    <property name="transf.wsl.file" value="src-wsl/hill_climbing.wsl" />

     <property name="transf.wsl.ini" value="transf.ini" />
     <property name="transf.wsl.ini" value="transf.ini" />

-    <property name="transf.wsl.ext" value="_t.wsl" />
+    <property name="transf.wsl.ext" value="_tr.wsl" />

     <!-- args can be used to send additional arguments to a script -->
     <property name="transf.wsl.args" value="" />
 
     <!-- args can be used to send additional arguments to a script -->
     <property name="transf.wsl.args" value="" />
 


@@ -105,7 +105,7 @@
         </tstamp>
     </target>
 
         </tstamp>
     </target>
 

-    <target name="all" depends='mj-samples,mjc2wsl-samples,wsl-transf-samples'
+    <target name="all" depends='mj-samples,mjc2wsl-samples,wsl-transf-samples,metrics-samples-compare-wsl'

         description="build the tools, run them on the samples to check">
 
     </target>
         description="build the tools, run them on the samples to check">
 
     </target>


@@ -173,6 +173,28 @@
             </exec>
     </target>
 
             </exec>
     </target>
 

+    <target name="git-version-string" if="version">
+            <!-- explicitly store the new  version string in git -->
+            <!-- needs the version set already, preferably from the command line -->
+            <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>
+           <!-- remove the first line with the date if you can.
+                for whatever reason Java Properties always writes this
+             -->
+           <exec executable="sed" failifexecutionfails="false">
+             <arg line="-e '1d' -i ${version.file}"/>
+           </exec>
+            <exec executable="git" failifexecutionfails="false">
+                    <arg value="update-index"/>
+                    <arg value="--no-assume-unchanged"/>
+                    <arg value="${version.file}"/>
+            </exec>
+    </target>
+

     <!-- **************************************** -->
     <!-- mjc2wsl related tasks -->
     <!-- **************************************** -->
     <!-- **************************************** -->
     <!-- mjc2wsl related tasks -->
     <!-- **************************************** -->


@@ -299,11 +321,14 @@
 
     <target name="wsl-transf"
         description="transform (simplify) a single wsl file generated by mjc2wsl">
 
     <target name="wsl-transf"
         description="transform (simplify) a single wsl file generated by mjc2wsl">

-
+        <stopwatch name="transf-${transf.filename}" action="start"/>

         <antcall target="wsl-run">
             <param name="filename" value="${transf.wsl.file}" />
             <param name="args" value="${transf.wsl.args} ${transf.filename}" />
         </antcall>
         <antcall target="wsl-run">
             <param name="filename" value="${transf.wsl.file}" />
             <param name="args" value="${transf.wsl.args} ${transf.filename}" />
         </antcall>

+        <record name="${transf.filename}-time.txt" action="start" emacsmode="true"/>
+        <stopwatch name="transf-${transf.filename}" action="total"/>
+        <record name="${transf.filename}-time.txt" action="stop"/>

     </target>
 
     <target name="wsl-transf-samples" depends="init"
     </target>
 
     <target name="wsl-transf-samples" depends="init"