X-Git-Url: http://svarog.pmf.uns.ac.rs/gitweb/?p=mjc2wsl.git;a=blobdiff_plain;f=build.xml;h=4250bbf6ef167d09cdd24f3a55840c2f340f3149;hp=7fb3ee4bb30480964d36fb79156a6fe3aeb67b1e;hb=cb772f818f110f996bdd38b5da4a1c035838e7e5;hpb=da3aa9b750f5e09f1fbc8b4a7a120528cf5c24ef

diff --git a/build.xml b/build.xml
index 7fb3ee4..4250bbf 100644
--- a/build.xml
+++ b/build.xml
@@ -20,6 +20,7 @@
 
     <property name="res.dir" value="res" />
     
+    <property name="compiler.class.jar" value="lib/mj.jar" />
     <property name="compiler.class.dir" value="lib/compiler-bin" />
     <property name="compiler.src.dir" value="lib/compiler-src" />
     <property name="compiler.classname.compiler" value="MJ.Compiler" />
@@ -76,17 +77,46 @@
             <fileset dir="${log.dir}"/>
         </delete>
     </target>
+	
+	<!-- version tasks
+	based on ideas by Jesper Öqvist http://llbit.se/?p=1876 -->
     
+	<!-- this target is only run if the 'version' property is undefined -->
+	
+	<target name="update-version-string" unless="version">
+	        <!-- get a new version string using git describe if possible -->
+	        <echo message="Updating version string..."/>
+	        <exec executable="git" outputproperty="version"
+	                failifexecutionfails="false">
+	                <arg value="describe"/>
+	        </exec>
+	        <antcall target="-store-version-string"/>
+	        <!-- ensure version is defined even if git was not available -->
+	        <property file="${res.dir}/version.properties"/>
+	</target>
     
+	<target name="-store-version-string" if="version">
+	        <!-- store the new  version string in the correct property file -->
+	        <echo message="version=${version}"/>
+	        <propertyfile file="${res.dir}/version.properties">
+	                <entry key="version" value="${version}"/>
+	        </propertyfile>
+	        <exec executable="git" failifexecutionfails="false">
+	                <arg value="update-index"/>
+	                <arg value="--assume-unchanged"/>
+	                <arg value="${res.dir}/version.properties"/>
+	        </exec>
+	</target>
+	
     <!-- mjc2wsl related tasks -->
     
-    <target name="build" depends="init" description="build the mjc2wsl tool">
+    <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>
 
     <target name="mjc2wsl">
         <echo message="${filename}" />
-        <java classpath="${mjc2wsl.class.dir}:${res.dir}" classname="mjc2wsl">
+        <java classpath="${mjc2wsl.class.dir}:${res.dir}" classname="com.quemaster.transformations.mjc2wsl.mjc2wsl">
             <arg line="${mjc2wsl.options}" />
             <arg value="${filename}" />
         </java>
@@ -123,12 +153,12 @@
     
     <target name="mj-compile" description="compile a MJ into obj file; given ${filename}">
         <echo message="${filename}" />
-        <java classpath="${compiler.class.dir}" classname="${compiler.classname.compiler}">
+        <java classpath="${compiler.class.dir}:${compiler.class.jar}" classname="${compiler.classname.compiler}">
             <arg value="${filename}" />
         </java>
     </target>
     
-    <target name="mj-samples" depends="mj-build" description="run the mj compiler on the samples">
+    <target name="mj-samples" description="run the mj compiler on the samples" depends="init">
         <foreach param="filename" target="mj-compile">
             <path>
             <fileset dir='${samples.temp.dir}'>
@@ -140,12 +170,12 @@
 
     <target name="mj-decode" description="decode a MJ obj file given in ${filename}">
         <echo message="${filename}" />
-        <java classpath="${compiler.class.dir}" classname="${compiler.classname.decoder}">
+        <java classpath="${compiler.class.dir}:${compiler.class.jar}" classname="${compiler.classname.decoder}">
             <arg value="${filename}" />
         </java>
     </target>
     
-    <target name="mj-decode-samples" depends="mj-build" description="decode all of the compiled samples and save into file 'decoded.txt'">
+    <target name="mj-decode-samples" description="decode all of the compiled samples and save into file 'decoded.txt'">
         <record name="${samples.temp.dir}/decoded.txt" emacsmode="true" loglevel="info"/>
         <foreach param="filename" target="mj-decode">
             <path>
@@ -159,7 +189,7 @@
     
     <target name="mj-run" description="run a MJ obj file given in ${filename} with ${inputstring}">
         <echo message="${filename}" />
-        <java classpath="${compiler.class.dir}" classname="${compiler.classname.interpreter}" inputstring="${inputstring}">
+        <java classpath="${compiler.class.dir}:${compiler.class.jar}" classname="${compiler.classname.interpreter}" inputstring="${inputstring}">
             <arg value="${filename}" />
         </java>
     </target>
@@ -227,18 +257,24 @@
     
     <target name="test-run" 
     description="run .obj .wsl _t.wsl, given are ${file.dir}, ${file.name} (no extension) and an ${inputstring}">
-        <antcall target="mj-run">
+    	<record name="${file.dir}/${file.name}.out1"  emacsmode="true" />
+    	<antcall target="mj-run">
             <param name="filename" value="${file.dir}/${file.name}.obj" />
             <param name="inputstring" value="${inputstring}" />
         </antcall>
+    	<record name="${file.dir}/${file.name}.out1" action="stop" />
+    	<record name="${file.dir}/${file.name}.out2"  emacsmode="true" />
         <antcall target="wsl-run">
             <param name="filename" value="${file.dir}/${file.name}.wsl" />
             <param name="inputstring" value="${inputstring}" />
         </antcall>
+    	<record name="${file.dir}/${file.name}.out2" action="stop" />
+    	<record name="${file.dir}/${file.name}.out3" emacsmode="true" />
         <antcall target="wsl-run">
             <param name="filename" value="${file.dir}/${file.name}_t.wsl" />
             <param name="inputstring" value="${inputstring}" />
         </antcall>
+    	<record name="${file.dir}/${file.name}.out3" action="stop" />
     </target>
     
     <target name="test-run-samples-dir"