X-Git-Url: http://svarog.pmf.uns.ac.rs/gitweb/?p=mjc2wsl.git;a=blobdiff_plain;f=build.xml;h=a122a38cda7cd4010998e35f5f93e3ec9a58c5f9;hp=89e8a44382d7bffd062a557b82b51e3d704a58c0;hb=refs%2Fheads%2Fmaster;hpb=c3bc1172cbfc67b0d1c74fa91acce6023617be72

diff --git a/build.xml b/build.xml
index 89e8a44..a122a38 100644
--- a/build.xml
+++ b/build.xml
@@ -35,6 +35,7 @@
     <property name="mjc2wsl.class.dir" value="bin" />
     <property name="mjc2wsl.src.dir" value="src" />
     <property name="mjc2wsl.options" value="" />
+    <property name="mjc2wsl.main" value="com.quemaster.transformations.mjc2wsl.Mjc2wsl" />
 
     <property name="res.dir" value="res" />
     <property name="dist.dir" value="dist" />
@@ -46,16 +47,16 @@
     <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.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="" />
 
-    <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" />
@@ -100,11 +101,11 @@
 
     <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>
 
-    <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>
@@ -131,7 +132,7 @@
               <attribute name="Implementation-Title"
                value="MicroJava bytecode to WSL"/>
               <attribute name="Implementation-Version" value="${version}"/>
-              <attribute name="Main-Class" value="com.quemaster.transformations.mjc2wsl.mjc2wsl"/>
+              <attribute name="Main-Class" value="${mjc2wsl.main}"/>
             </manifest>
             <fileset dir="${mjc2wsl.class.dir}"/>
         </jar>
@@ -172,6 +173,28 @@
             </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 -->
     <!-- **************************************** -->
@@ -185,7 +208,7 @@
 
     <target name="mjc2wsl">
         <echo message="${filename}" />
-        <java classpath="${mjc2wsl.class.dir}:${res.dir}" classname="com.quemaster.transformations.mjc2wsl.mjc2wsl">
+        <java classpath="${mjc2wsl.class.dir}:${res.dir}" classname="${mjc2wsl.main}">
             <arg line="${mjc2wsl.options}" />
             <arg value="${filename}" />
         </java>
@@ -298,11 +321,14 @@
 
     <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>
+        <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"