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">
<property file="custom.properties"/>
<project name="mjc2wsl" default="all">
<property file="custom.properties"/>
+ <property environment="env"/>
<condition property="fermat.dir" value="C:\fermat3">
<os family="windows" />
<condition property="fermat.dir" value="C:\fermat3">
<os family="windows" />
<property name="res.dir" value="res" />
<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" />
<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" />
<target name="init-time">
<tstamp>
<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"/>
</tstamp>
</target>
</tstamp>
</target>
<target name="mj-compile" description="compile a MJ into obj file; given ${filename}">
<echo message="${filename}" />
<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>
<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}'>
<foreach param="filename" target="mj-compile">
<path>
<fileset dir='${samples.temp.dir}'>
<target name="mj-decode" description="decode a MJ obj file given in ${filename}">
<echo message="${filename}" />
<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>
<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>
<record name="${samples.temp.dir}/decoded.txt" emacsmode="true" loglevel="info"/>
<foreach param="filename" target="mj-decode">
<path>
<target name="mj-run" description="run a MJ obj file given in ${filename} with ${inputstring}">
<echo message="${filename}" />
<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>
<arg value="${filename}" />
</java>
</target>
<target name="wsl-run" >
<exec executable="${fermat.dir}/bin/wsl" inputstring="${inputstring}">
<target name="wsl-run" >
<exec executable="${fermat.dir}/bin/wsl" inputstring="${inputstring}">
- <env key="PATH" path="${env.PATH}:${fermat.dir}/bin"/>
+ <env key="PATH" path="${fermat.dir}/bin:${env.PATH}"/>
<env key="FermaT" path="${fermat.dir}" />
<env key="SCHEME_LIBRARY_PATH" path="${fermat.dir}/slib/" />
<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" />
+ <env key="SCM_INIT_PATH" path="${fermat.dir}/scm/Init5e7.scm" />
<arg value="${filename}"/>
</exec>
</target>
<arg value="${filename}"/>
</exec>
</target>
<antcall target="wsl-run">
<param name="filename" value="${transf.wsl.file}" />
</antcall>
<antcall target="wsl-run">
<param name="filename" value="${transf.wsl.file}" />
</antcall>
- <record name="${log.file.transformations}${time}" action="stop" />
+ <record name="${log.file.transformations}${time}.txt" action="stop" />
<copy file="${log.file.transformations}${time}.txt" tofile="${log.file.transformations}.txt"/>
</target>
<copy file="${log.file.transformations}${time}.txt" tofile="${log.file.transformations}.txt"/>
</target>