To protect your data, the CISO officer has suggested users to enable GitLab 2FA as soon as possible.

Commit c7de5d3b authored by John Zhang's avatar John Zhang
Browse files

Merge branch 'version-bump-fop'

parents 173fd914 47f79bf8
......@@ -11,14 +11,14 @@
<property file="dacapo.properties" />
<property name="bm-name" value="fop" />
<property name="bm-version" value="0.95" />
<property name="bm-version" value="2.2" />
<property name="bm-url" value="${apache.dl.url}/xmlgraphics/fop/source" />
<property name="bm-src" value="${bm-name}-${bm-version}-src.tar.gz" />
<import file="../common.xml" />
<!-- <property name="bm-harness-classpath" value="${bm-jars}/fop.jar" /> -->
<property name="bm-build-top" value="${bm-build-dir}/${bm-name}-${bm-version}" />
<property name="bm-build-top" value="${bm-build-dir}/${bm-name}-${bm-version}/fop" />
<target name="unpack" depends="untar, patch" />
......@@ -28,16 +28,18 @@
<target name="jar">
<copy file="${bm-build-top}/build/fop.jar" todir="${bm-jars}" />
<copy file="${bm-build-top}/lib/avalon-framework-4.2.0.jar" todir="${bm-jars}" />
<copy file="${bm-build-top}/lib/batik-all-1.7.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/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/serializer-2.7.0.jar" todir="${bm-jars}" />
<copy file="${bm-build-top}/lib/fontbox-2.0.4.jar" todir="${bm-jars}" />
<copy file="${bm-build-top}/lib/serializer-2.7.2.jar" todir="${bm-jars}" />
<copy file="${bm-build-top}/lib/servlet-2.2.jar" todir="${bm-jars}" />
<copy file="${bm-build-top}/lib/xalan-2.7.0.jar" todir="${bm-jars}" />
<copy file="${bm-build-top}/lib/xercesImpl-2.7.1.jar" todir="${bm-jars}" />
<copy file="${bm-build-top}/lib/xalan-2.7.2.jar" todir="${bm-jars}" />
<copy file="${bm-build-top}/lib/xercesImpl-2.9.1.jar" todir="${bm-jars}" />
<copy file="${bm-build-top}/lib/xml-apis-1.3.04.jar" todir="${bm-jars}" />
<copy file="${bm-build-top}/lib/xml-apis-ext-1.3.04.jar" todir="${bm-jars}" />
<copy file="${bm-build-top}/lib/xmlgraphics-commons-1.3.1.jar" todir="${bm-jars}" />
<copy file="${bm-build-top}/lib/xmlgraphics-commons-2.2.jar" todir="${bm-jars}" />
</target>
</project>
benchmark fop
class org.dacapo.harness.Fop
thread-model single
jars "fop.jar", "avalon-framework-4.2.0.jar", "batik-all-1.7.jar", "commons-io-1.3.1.jar", "commons-logging-1.0.4.jar", "serializer-2.7.0.jar", "servlet-2.2.jar", "xalan-2.7.0.jar", "xercesImpl-2.7.1.jar", "xml-apis-1.3.04.jar", "xml-apis-ext-1.3.04.jar", "xmlgraphics-commons-1.3.1.jar" ;
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" ;
/*
* 'small' uses debug mode ("-d"), which puts current stats in the output,
......
diff -ur ../fop-0.95/src/java/org/apache/fop/cli/Main.java fop-0.95/src/java/org/apache/fop/cli/Main.java
--- ../fop-0.95/src/java/org/apache/fop/cli/Main.java 2008-08-01 00:02:56.000000000 +1000
+++ fop-0.95/src/java/org/apache/fop/cli/Main.java 2009-06-16 23:02:09.000000000 +1000
@@ -174,9 +174,9 @@
--- fop-2.2/fop-core/src/main/java/org/apache/fop/cli/Main.java 2017-04-03 21:23:57.000000000 +1000
+++ ../Main.java 2017-12-01 13:16:56.657538089 +1100
@@ -194,9 +194,9 @@
// System.exit(0) called to close AWT/SVG-created threads, if any.
// AWTRenderer closes with window shutdown, so exit() should not
// be called here
......
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