gitweb on Svarog
projekti pod git sistemom za održavanje verzija -- projects under the git version control systemdiff --git a/build.xml b/build.xml
--- a/build.xml
+++ b/build.xml
<property name="compiler.class.dir" value="compiler-bin" />
<property name="compiler.src.dir" value="compiler" />
+ <property name="compiler.classname.compiler" value="Compiler" />
+ <property name="compiler.classname.interpreter" value="Run" />
<property name="samples.main.dir" value="samples" />
<property name="samples.temp.dir" value="samples-temp" />
Also gives options to chain the tools on individual files.
</description>
+ <!-- general tasks -->
+
<target name="init">
<mkdir dir="${mjc2wsl.class.dir}"/>
<mkdir dir="${compiler.class.dir}"/>
</fileset>
</copy>
</target>
-
+
+ <target name="all" depends='mj-samples,mjc2wsl-samples,wsl-transf-samples'
+ description="build the tools, run them on the samples to check">
+
+ </target>
+
+ <target name="clean" description="clean up all the generated content">
+ <delete includeemptydirs="true">
+ <fileset dir=".">
+ <include name="${mjc2wsl.class.dir}/*.class"/>
+ <include name="${compiler.class.dir}/*.class"/>
+ <include name="${samples.temp.dir}/*"/>
+ </fileset>
+ <dirset dir=".">
+ <include name="${mjc2wsl.class.dir}"/>
+ <include name="${compiler.class.dir}"/>
+ <include name="${samples.temp.dir}"/>
+ </dirset>
+ </delete>
+ </target>
+
+
+ <!-- mjc2wsl related tasks -->
+
<target name="build" depends="init" 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">
+ <arg line="${mjc2wsl.options}" />
+ <arg value="${filename}" />
+ </java>
+ </target>
+
+ <target name="mjc2wsl-samples" depends="build" description="run the mjc2wsl tool on the samples">
+ <foreach param="filename" target="mjc2wsl">
+ <path>
+ <fileset dir='${samples.temp.dir}'>
+ <include name="*.obj"/>
+ </fileset>
+ </path>
+ </foreach>
+ </target>
+
+ <target name="mjc2wsl-samples1" depends="build">
+ <!-- simplistic version when antlib (foreach) is not available -->
+ <antcall target="mjc2wsl">
+ <param name="filename" value="samples-temp/sample0.obj" />
+ </antcall>
+ </target>
+
+
+ <!-- MicroJava related tasks -->
+
+
<target name="mj-build" depends="init" description="build the mj compiler">
<javac srcdir="${compiler.src.dir}" destdir="${compiler.class.dir}" includeAntRuntime='no' />
</target>
- <target name="mj-compile">
+ <target name="mj-compile" description="compile a MJ into obj file; given ${filename}">
<echo message="${filename}" />
- <java classpath="${compiler.class.dir}" classname="Compiler">
+ <java classpath="${compiler.class.dir}" classname="${compiler.classname.compiler}">
<arg value="${filename}" />
</java>
</target>
</foreach>
</target>
+ <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}">
+ <arg value="${filename}" />
+ </java>
+ </target>
+
<target name="mj-samples1" depends="mj-build">
<!-- simplistic version when antlib (foreach) is not available -->
<antcall target="mj-compile">
<param name="filename" value="samples-temp/sample0.mj" />
</antcall>
</target>
-
- <target name="mjc2wsl">
- <echo message="${filename}" />
- <java classpath="${mjc2wsl.class.dir}:${res.dir}" classname="mjc2wsl">
- <arg line="${mjc2wsl.options}" />
- <arg value="${filename}" />
- </java>
- </target>
-
- <target name="mjc2wsl-samples" depends="build" description="run the mjc2wsl tool on the samples">
- <foreach param="filename" target="mjc2wsl">
- <path>
- <fileset dir='${samples.temp.dir}'>
- <include name="*.obj"/>
- </fileset>
- </path>
- </foreach>
- </target>
-
- <target name="mjc2wsl-samples1" depends="build">
- <!-- simplistic version when antlib (foreach) is not available -->
- <antcall target="mjc2wsl">
- <param name="filename" value="samples-temp/sample0.obj" />
- </antcall>
- </target>
-
+
+
+ <!-- wsl related tasks -->
+
<target name="wsl-run" >
<exec executable="${fermat.dir}/bin/wsl" inputstring="${inputstring}">
<env key="PATH" path="${env.PATH}:${fermat.dir}/bin"/>
<echo file="${transf.wsl.ini}">${generated-wsl-files}</echo>
</target>
- <target name="all" depends='mj-samples,mjc2wsl-samples,wsl-transf-samples'
- description="build the tools, run them on the samples to check">
+ <!-- Testing tasks -->
+ <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">
+ <param name="filename" value="${file.dir}/${file.name}.obj" />
+ <param name="inputstring" value="${inputstring}" />
+ </antcall>
+ <antcall target="wsl-run">
+ <param name="filename" value="${file.dir}/${file.name}.wsl" />
+ <param name="inputstring" value="${inputstring}" />
+ </antcall>
+ <antcall target="wsl-run">
+ <param name="filename" value="${file.dir}/${file.name}_t.wsl" />
+ <param name="inputstring" value="${inputstring}" />
+ </antcall>
</target>
- <target name="clean" description="clean up all the generated content">
- <delete includeemptydirs="true">
- <fileset dir=".">
- <include name="${mjc2wsl.class.dir}/*.class"/>
- <include name="${compiler.class.dir}/*.class"/>
- <include name="${samples.temp.dir}/*"/>
- </fileset>
- <dirset dir=".">
- <include name="${mjc2wsl.class.dir}"/>
- <include name="${compiler.class.dir}"/>
- <include name="${samples.temp.dir}"/>
- </dirset>
- </delete>
+ <target name="test-run-samples-dir"
+ description="run .obj .wsl _t.wsl, in the samples-temp directory; given ${file.name} (no extension) and an ${inputstring}">
+ <antcall target="test-run">
+ <param name="file.dir" value="${samples.temp.dir}"/>
+ </antcall>
</target>
<!-- jedit specific flags; needs to be the first or the last 10 lines