WARNING! Access to this system is limited to authorised users only.
Unauthorised users may be subject to prosecution.
Unauthorised access to this system is a criminal offence under Australian law (Federal Crimes Act 1914 Part VIA)
It is a criminal offence to:
(1) Obtain access to data without authority. -Penalty 2 years imprisonment.
(2) Damage, delete, alter or insert data without authority. -Penalty 10 years imprisonment.
User activity is monitored and recorded. Anyone using this system expressly consents to such monitoring and recording.

Commit 7e8a956b authored by John Zhang's avatar John Zhang
Browse files

fix: fop's dependency on batik

If batik is built before fop, fop's lib dependency on batik
will overwrite the patched batik jar.
There was a previous commit that attempts to deal with the issue,
but it created dependency not found problem when
fop is the only one built.
This commit properly deals with the issue by renaming the
batik jar that fop depends on, thus not overwriting the patched
batik benchmark.
parent b5d5625c
Pipeline #2181 failed with stage
in 1383 minutes and 1 second
......@@ -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,
......
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