Commit 6139b5a9 authored by John Zhang's avatar John Zhang

Merge latest changes from dev head, ready for release

parents 1133e02f ab561e89
......@@ -50,11 +50,6 @@ lusearch:
- ant -Dbuild.target-jar=dacapo.jar lusearch
- java -jar dacapo.jar lusearch
lusearch-fix:
script:
- ant -Dbuild.target-jar=dacapo.jar lusearch-fix
- java -jar dacapo.jar lusearch-fix
pmd:
script:
- ant -Dbuild.target-jar=dacapo.jar pmd
......@@ -72,13 +67,13 @@ tomcat:
tradebeans:
script:
- ant -Dbuild.target-jar=dacapo.jar tradebeans
- java -jar dacapo.jar tradebeans
- script -q -c "ant -Dbuild.target-jar=dacapo.jar tradebeans" script.out
- sleep 120 | script -q -c "java -jar dacapo.jar tradebeans" script.out
tradesoap:
script:
- ant -Dbuild.target-jar=dacapo.jar tradesoap
- java -jar dacapo.jar tradesoap
- script -q -c "ant -Dbuild.target-jar=dacapo.jar tradesoap" script.out
- sleep 120 | script -q -c "java -jar dacapo.jar tradesoap" script.out
xalan:
script:
......
......@@ -23,7 +23,7 @@
<property name="bm-doc-dir" value="${bm-files}/doc"/>
<property name="bm-output-dir" value="${bm-files}/dist"/>
<property name="bm-output-doc-dir" value="${bm-files}/dist/doc/${bm-name}"/>
<property name="bm-output-harness-dir" value="${bm-files}/dist/harness"/>
<property name="bm-output-harness-dir" value="${bm-files}/dist"/>
<property name="bm-output-benchmark-dir" value="${bm-files}/dist/benchmark"/>
<property name="bm-deps-output-dir" value="${bm-files}/deps"/>
<property name="bm-data" value="${bm-files}/data"/>
......@@ -37,7 +37,7 @@
<property name="bm-dat" value="${bm-output-dir}/dat"/>
<property name="bm-cnf" value="${bm-output-dir}/cnf"/>
<property name="harness-classpath" value="harness/dist/harness"/>
<property name="harness-classpath" value="harness/dist/"/>
<target name="all" depends="source,svn-source,cvs-source,hg-source,pre-build,build,complete"/>
......
......@@ -30,7 +30,7 @@
<copy file="${bm-build-top}/build/fop.jar" todir="${bm-jars}" />
<copy file="${bm-build-top}/lib/avalon-framework-api-4.3.1.jar" todir="${bm-jars}" />
<copy file="${bm-build-top}/lib/avalon-framework-impl-4.3.1.jar" todir="${bm-jars}" />
<!-- <copy file="${bm-build-top}/lib/batik-all-1.9.jar" todir="${bm-jars}" /> -->
<copy file="${bm-build-top}/lib/batik-all-1.9.jar" tofile="${bm-jars}/batik-all-1.9-fop.jar" />
<copy file="${bm-build-top}/lib/commons-io-1.3.1.jar" todir="${bm-jars}" />
<copy file="${bm-build-top}/lib/commons-logging-1.0.4.jar" todir="${bm-jars}" />
<copy file="${bm-build-top}/lib/fontbox-2.0.4.jar" todir="${bm-jars}" />
......
benchmark fop
class org.dacapo.harness.Fop
thread-model single
jars "fop.jar", "avalon-framework-api-4.3.1.jar", "avalon-framework-impl-4.3.1.jar", "batik-all-1.9.jar", "commons-io-1.3.1.jar", "commons-logging-1.0.4.jar", "fontbox-2.0.4.jar", "serializer-2.7.2.jar", "servlet-2.2.jar", "xalan-2.7.2.jar", "xercesImpl-2.9.1.jar", "xml-apis-1.3.04.jar", "xml-apis-ext-1.3.04.jar", "xmlgraphics-commons-2.2.jar" ;
jars "fop.jar", "avalon-framework-api-4.3.1.jar", "avalon-framework-impl-4.3.1.jar", "batik-all-1.9-fop.jar", "commons-io-1.3.1.jar", "commons-logging-1.0.4.jar", "fontbox-2.0.4.jar", "serializer-2.7.2.jar", "servlet-2.2.jar", "xalan-2.7.2.jar", "xercesImpl-2.9.1.jar", "xml-apis-1.3.04.jar", "xml-apis-ext-1.3.04.jar", "xmlgraphics-commons-2.2.jar" ;
/*
* 'small' uses debug mode ("-d"), which puts current stats in the output,
......
......@@ -266,8 +266,8 @@ BUILDING:
<copy file="${basedir}/RELEASE_NOTES.txt" todir="${dacapo.build.dir}"/>
<!-- this forms the base document section -->
<copy file="${basedir}/../LICENSE" todir="${dacapo.build.dir}"/>
<copy file="${basedir}/../README.md" todir="${dacapo.build.dir}"/>
<copy file="${basedir}/../LICENSE" todir="${dacapo.build.doc.dir}"/>
<copy file="${basedir}/../README.md" todir="${dacapo.build.doc.dir}"/>
<copy file="${basedir}/RELEASE_NOTES.txt" todir="${dacapo.build.doc.dir}" />
<copy todir="${dacapo.build.doc.dir}">
......
......@@ -11,8 +11,8 @@
<P>
Overview
<UL>
<LI><A HREF="LICENSE.txt" TARGET="MAIN">License</A></LI>
<LI><A HREF="README.txt" TARGET="MAIN">Readme</A></LI>
<LI><A HREF="LICENSE" TARGET="MAIN">License</A></LI>
<LI><A HREF="README.md" TARGET="MAIN">Readme</A></LI>
<LI><A HREF="RELEASE_NOTES.txt" TARGET="MAIN">Release Notes</A></LI>
</UL>
<P/>
......
......@@ -9,9 +9,8 @@
<property name="base-dir" value="harness"/>
<property name="src" value="${base-dir}/src"/>
<property name="output-parent-dir" value="${base-dir}/dist"/>
<property name="output-dir" value="${output-parent-dir}/harness"/>
<property name="output-doc-dir" value="${output-parent-dir}/doc/harness"/>
<property name="output-dir" value="${base-dir}/dist"/>
<property name="output-doc-dir" value="${output-dir}/doc/harness"/>
<property name="build-dir" value="${base-dir}/build"/>
<property name="harness-downloads" value="${base-dir}/downloads"/>
......@@ -25,7 +24,7 @@
<target name="all" depends="clean,init,harness,jar"/>
<target name="clean">
<delete dir="${output-parent-dir}"/>
<delete dir="${output-dir}"/>
<delete dir="${build-dir}"/>
</target>
......@@ -65,6 +64,6 @@
</target>
<target name="jar">
<jar jarfile="${build.target-jar}" basedir="${output-parent-dir}" update="true"/>
<jar jarfile="${build.target-jar}" basedir="${output-dir}" update="true"/>
</target>
</project>
......@@ -20,7 +20,7 @@ public class Harness {
// The DaCapo Harness is in a separate library within the dacapo.jar
// allowing a separate class loader to be used for loading the dacapo harness
private static final String HARNESS_PATH = "harness/";
private static final String HARNESS_PATH = "org/dacapo/harness";
private static final String HARNESS_CLASS = "org.dacapo.harness.TestHarness";
private static final String HARNESS_METHOD = "main";
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment