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
<project name="mjc2wsl" default="all">
<project name="mjc2wsl" default="all">
+ <property file="custom.properties"/>
+
+ <condition property="fermat.dir" value="C:\fermat3">
+ <os family="windows" />
+ </condition>
+
+ <condition property="fermat.dir" value="${user.home}/fermat3">
+ <not><os family="windows" /></not>
+ </condition>
+
+
<property name="java.encoding" value="utf-8" />
<property name="java.encoding" value="utf-8" />
- <taskdef resource="net/sf/antcontrib/antlib.xml">
- <classpath>
- <pathelement location="/usr/share/java/"/>
- </classpath>
- </taskdef>
+ <taskdef resource="net/sf/antcontrib/antlib.xml"/>
<property name="mjc2wsl.class.dir" value="bin" />
<property name="mjc2wsl.src.dir" value="src" />
<property name="mjc2wsl.options" value="" />
<property name="mjc2wsl.class.dir" value="bin" />
<property name="mjc2wsl.src.dir" value="src" />
<property name="mjc2wsl.options" value="" />
+
+ <property name="res.dir" value="res" />
<property name="compiler.class.dir" value="compiler-bin" />
<property name="compiler.src.dir" value="compiler" />
<property name="samples.main.dir" value="samples" />
<property name="samples.temp.dir" value="samples-temp" />
<property name="compiler.class.dir" value="compiler-bin" />
<property name="compiler.src.dir" value="compiler" />
<property name="samples.main.dir" value="samples" />
<property name="samples.temp.dir" value="samples-temp" />
-
- <target name="help">
- <echo>Possible options:
- all - build the tool and the compiler and test on the samples
- build - build the mjc2wsl tool
- mj-build - build the mj compiler
- mj-samples - run the mj compiler on the samples (build if needed)
- </echo>
- </target>
-
+
+ <property name="transf.wsl.file" value="src-wsl/transf-min.wsl" />
+ <property name="transf.wsl.ini" value="transf.ini" />
+
+ <description>
+ Builder script for mjc2wsl and related tools, runs test
+ on given samples.
+
+ Also gives options to chain the tools on individual files.
+ </description>
+
<target name="init">
<mkdir dir="${mjc2wsl.class.dir}"/>
<mkdir dir="${compiler.class.dir}"/>
<mkdir dir="${samples.temp.dir}"/>
<copy todir="${samples.temp.dir}">
<target name="init">
<mkdir dir="${mjc2wsl.class.dir}"/>
<mkdir dir="${compiler.class.dir}"/>
<mkdir dir="${samples.temp.dir}"/>
<copy todir="${samples.temp.dir}">
- <fileset dir="${samples.main.dir}">
- <include name="*.mj"/>
- </fileset>
+ <fileset dir="${samples.main.dir}">
+ <include name="*.mj"/>
+ </fileset>
</copy>
</target>
</copy>
</target>
- <target name="build" depends="init">
+ <target name="build" depends="init" description="build the mjc2wsl tool">
<javac srcdir="${mjc2wsl.src.dir}" destdir="${mjc2wsl.class.dir}" includeAntRuntime='no' />
</target>
<javac srcdir="${mjc2wsl.src.dir}" destdir="${mjc2wsl.class.dir}" includeAntRuntime='no' />
</target>
- <target name="mj-build" depends="init">
+ <target name="mj-build" depends="init" description="build the mj compiler">
<javac srcdir="${compiler.src.dir}" destdir="${compiler.class.dir}" includeAntRuntime='no' />
</target>
<javac srcdir="${compiler.src.dir}" destdir="${compiler.class.dir}" includeAntRuntime='no' />
</target>
</java>
</target>
</java>
</target>
- <target name="mj-samples" depends="build">
+ <target name="mj-samples" depends="mj-build" description="run the mj compiler on the samples">
<foreach param="filename" target="mj-compile">
<path>
<fileset dir='${samples.temp.dir}'>
<foreach param="filename" target="mj-compile">
<path>
<fileset dir='${samples.temp.dir}'>
- <include name="*.mj"/>
+ <include name="*.mj"/>
</fileset>
</path>
</foreach>
</fileset>
</path>
</foreach>
<target name="mj-samples1" depends="mj-build">
<!-- simplistic version when antlib (foreach) is not available -->
<target name="mj-samples1" depends="mj-build">
<!-- simplistic version when antlib (foreach) is not available -->
- <antcall target="mj-compile">
+ <antcall target="mj-compile">
<param name="filename" value="samples-temp/sample.mj" />
</antcall>
<antcall target="mj-compile">
<param name="filename" value="samples-temp/sample.mj" />
</antcall>
<antcall target="mj-compile">
<target name="mjc2wsl">
<echo message="${filename}" />
<target name="mjc2wsl">
<echo message="${filename}" />
- <java classpath="${mjc2wsl.class.dir}" classname="mjc2wsl">
+ <java classpath="${mjc2wsl.class.dir}:${res.dir}" classname="mjc2wsl">
<arg line="${mjc2wsl.options}" />
<arg value="${filename}" />
</java>
</target>
<arg line="${mjc2wsl.options}" />
<arg value="${filename}" />
</java>
</target>
- <target name="mjc2wsl-samples" depends="build">
+ <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}'>
<foreach param="filename" target="mjc2wsl">
<path>
<fileset dir='${samples.temp.dir}'>
- <include name="*.obj"/>
+ <include name="*.obj"/>
</fileset>
</path>
</foreach>
</fileset>
</path>
</foreach>
</antcall>
</target>
</antcall>
</target>
- <target name="all" depends='mj-samples,mjc2wsl-samples'>
+ <target name="wsl-run" >
+ <exec executable="${fermat.dir}/bin/wsl" inputstring="${inputstring}">
+ <env key="PATH" path="${env.PATH}:${fermat.dir}/bin"/>
+ <env key="FermaT" path="${fermat.dir}" />
+ <env key="SCHEME_LIBRARY_PATH" path="${fermat.dir}/slib/" />
+ <env key="SCM_INIT_PATH" path="${fermat.dir}/scm/Init5e5.scm" />
+ <arg value="${filename}"/>
+ </exec>
+ </target>
+ <target name="wsl-transf"
+ description="transform (simplify) a single wsl file generated by mjc2wsl">
+ <delete file="${transf.wsl.ini}"/>
+
+ <antcall target="wsl-run">
+ <param name="filename" value="${transf.wsl.file}" />
+ <param name="inputstring" value="${transf.filename}" />
+ </antcall>
</target>
</target>
- <target name="clean" >
+ <target name="wsl-transf-samples" depends="make-transf-ini-samples"
+ description="transform (simplify) the wsl files generated by mjc2wsl">
+ <antcall target="wsl-run">
+ <param name="filename" value="${transf.wsl.file}" />
+ </antcall>
+ </target>
+
+ <target name="make-transf-ini-samples">
+ <fileset dir="${samples.temp.dir}" casesensitive="no" id="generated-wsl-fileset">
+ <patternset id="non.transformed.sources">
+ <include name="**/*.wsl"/>
+ <exclude name="**/*_t.wsl"/>
+ </patternset>
+ </fileset>
+ <pathconvert pathsep="${line.separator}"
+ property="generated-wsl-files" refid="generated-wsl-fileset" />
+
+ <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">
+
+ </target>
+
+ <target name="clean" description="clean up all the generated content">
<delete includeemptydirs="true">
<fileset dir=".">
<include name="${mjc2wsl.class.dir}/*.class"/>
<delete includeemptydirs="true">
<fileset dir=".">
<include name="${mjc2wsl.class.dir}/*.class"/>
</dirset>
</delete>
</target>
</dirset>
</delete>
</target>
-
+
+ <!-- jedit specific flags; needs to be the first or the last 10 lines
+ :noTabs=true:
+ -->
</project>
\ No newline at end of file
</project>
\ No newline at end of file