gitweb on Svarog
projekti pod git sistemom za održavanje verzija -- projects under the git version control system
diff --git a/build.xml b/build.xml
--- a/build.xml
+++ b/build.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="mjc2wsl.main" value="com.quemaster.transformations.mjc2wsl.Mjc2wsl" />
<property name="res.dir" value="res" />
<property name="dist.dir" value="dist" />
<property name="res.dir" value="res" />
<property name="dist.dir" value="dist" />
<property name="compiler.classname.interpreter" value="MJ.Run" />
<property name="compiler.classname.decoder" value="MJ.Decode" />
<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.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" />
<property name="metrics.extension" value=".met" />
<property name="tests.dir" value="tests" />
- <property name="log.dir" value="logs" />
+ <property name="log.dir" value="${basedir}/logs" />
<property name="log.file.transformations" value="${log.dir}/transformations" />
<property name="log.file.mjc2wsl" value="${log.dir}/mjc2wsl" />
<property name="log.file.tests.m" value="${log.dir}/tests-mj" />
<property name="log.file.transformations" value="${log.dir}/transformations" />
<property name="log.file.mjc2wsl" value="${log.dir}/mjc2wsl" />
<property name="log.file.tests.m" value="${log.dir}/tests-mj" />
<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-SSS"/>
</tstamp>
</target>
</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>
description="build the tools, run them on the samples to check">
</target>
<attribute name="Implementation-Title"
value="MicroJava bytecode to WSL"/>
<attribute name="Implementation-Version" value="${version}"/>
<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>
</manifest>
<fileset dir="${mjc2wsl.class.dir}"/>
</jar>
</exec>
</target>
</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 -->
<!-- **************************************** -->
<!-- **************************************** -->
<!-- mjc2wsl related tasks -->
<!-- **************************************** -->
<target name="mjc2wsl">
<echo message="${filename}" />
<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>
<arg line="${mjc2wsl.options}" />
<arg value="${filename}" />
</java>
<target name="wsl-transf"
description="transform (simplify) a single wsl file generated by mjc2wsl">
<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}" />
<antcall target="wsl-run">
<param name="filename" value="${transf.wsl.file}" />
- <param name="args" value="${transf.filename}" />
+ <param name="args" value="${transf.wsl.args} ${transf.filename}" />
</antcall>
</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"
</target>
<target name="wsl-transf-samples" depends="init"
<path>
<fileset dir='${samples.temp.dir}'>
<patternset refid="non.transformed.sources"/>
<path>
<fileset dir='${samples.temp.dir}'>
<patternset refid="non.transformed.sources"/>
+ <depth max="0"/>
</fileset>
</path>
</foreach>
</fileset>
</path>
</foreach>
<target name="output-all-versions"
description="generate variations on the translations in the 'local' folder and tar them">
<target name="output-all-versions"
description="generate variations on the translations in the 'local' folder and tar them">
+ <delete>
+ <fileset dir="local/out/"/>
+ </delete>
+ <mkdir dir="local/out"/>
<antcall>
<target name="mj-samples"/>
<target name="mjc2wsl-samples"/>
<antcall>
<target name="mj-samples"/>
<target name="mjc2wsl-samples"/>