This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository libxalan2-java.
commit b03c731faedfdb3eb9473a3a0c2154e1a518d2ef Author: Ludovic Claude <[email protected]> Date: Tue Aug 4 14:56:22 2009 +0000 Include the dependent jars (java_cup, JLex, bcel) from the Debian distribution into xalan.jar --- debian/changelog | 2 ++ debian/patches/build.patch | 74 ++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 64 insertions(+), 12 deletions(-) diff --git a/debian/changelog b/debian/changelog index 51c3b5e..08840f7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,8 @@ libxalan2-java (2.7.1-4) experimental; urgency=low * Migrate the patch to quilt and update it * Remove JLex.jar from the source tarball and use the Debian version for the build. + * Include the dependent jars (java_cup, JLex, bcel) from the + Debian distribution into xalan.jar -- Ludovic Claude <[email protected]> Mon, 13 Jul 2009 23:43:51 +0100 diff --git a/debian/patches/build.patch b/debian/patches/build.patch index a133512..439b5e7 100644 --- a/debian/patches/build.patch +++ b/debian/patches/build.patch @@ -1,5 +1,42 @@ --- a/build.xml +++ b/build.xml +@@ -80,10 +80,10 @@ + <!-- Xalan Java directories --> + <!-- <property name="bin.dir" value="./bin"/> --> + <property name="build.dir" value="./build"/> +- <property name="lib.dir" value="./lib"/> ++ <property name="lib.dir" value="/usr/share/java"/> + <property name="samples.dir" value="./samples"/> + <property name="src.dir" value="./src"/> +- <property name="tools.dir" value="./tools"/> ++ <property name="tools.dir" value="/usr/share/java"/> + <property name="xdocs.dir" value="./xdocs"/> + + <property name="apachexml.reldir" value="org/apache/xml"/> +@@ -98,19 +98,19 @@ + <property name="xmlapis.jar" value="${lib.dir}/${xmlapis.jar.name}"/> + <property name="parser.jar.name" value="xercesImpl.jar"/> + <property name="parser.jar" value="${lib.dir}/${parser.jar.name}"/> +- <property name="bcel.jar.name" value="BCEL.jar"/> ++ <property name="bcel.jar.name" value="bcel.jar"/> + <property name="bcel.jar" value="${lib.dir}/${bcel.jar.name}"/> +- <property name="runtime.jar.name" value="runtime.jar"/> ++ <property name="runtime.jar.name" value="cup.jar"/> + <property name="runtime.jar" value="${lib.dir}/${runtime.jar.name}"/> + <property name="regexp.jar.name" value="regexp.jar"/> + <property name="regexp.jar" value="${lib.dir}/${regexp.jar.name}"/> + + <!-- Jars need to build Xalan Java (Interpretive, Compiled, or both) or build the docs --> +- <property name="java_cup.jar.name" value="java_cup.jar"/> ++ <property name="java_cup.jar.name" value="cup.jar"/> + <property name="java_cup.jar" value="${tools.dir}/${java_cup.jar.name}"/> + <property name="jlex.jar.name" value="JLex.jar"/> + <property name="jlex.jar" value="${tools.dir}/${jlex.jar.name}"/> +- <property name="stylebook.jar.name" value="stylebook-1.0-b3_xalan-2.jar"/> ++ <property name="stylebook.jar.name" value="stylebook.jar"/> + <property name="stylebook.jar" value="${tools.dir}/${stylebook.jar.name}"/> + <property name="doclet.jar.name" value="xalan2jdoc.jar"/> + <property name="doclet.jar" value="${tools.dir}/${doclet.jar.name}"/> @@ -354,11 +354,13 @@ puts the result in xdocs/sources/xalan for inclusion in the readme.xml --> <echo message="Transform commits.xml and put the result in ${xdocs.dir}"/> @@ -43,7 +80,20 @@ </java> <echo message="JLex move output file"/> <move file="${src.dir}/${xsltc.reldir}/compiler/xpath.lex.java" tofile="${generated.xpathlexer}"/> -@@ -958,6 +964,7 @@ +@@ -588,6 +594,12 @@ + <param name="param_jar_name" value="${runtime.jar.name}" /> + </antcall> + ++ <delete dir="${build.classes}"> ++ <include name="java_cup/*.class" /> ++ <include name="java_cup/anttask/**" /> ++ <include name="java_cup/anttask" /> ++ </delete> ++ + <antcall target="xsltc.copy-deps-jar"> + <param name="param_unless" value="xsltc.regexp_jar.not_needed" /> + <param name="param_jar_name" value="${regexp.jar.name}" /> +@@ -958,6 +970,7 @@ <java fork="yes" classname="${doc.generator}" classpathref="docs.class.path" > @@ -51,7 +101,7 @@ <arg line="targetDirectory=${build.docs} ${xdocs.book} ${xdocs.style}"/> </java> </target> -@@ -1028,6 +1035,7 @@ +@@ -1028,6 +1041,7 @@ <javadoc additionalparam="-breakiterator" destdir="${build.apidocs}" @@ -59,7 +109,7 @@ public="true" sourcepath="${src.dir}" overview="${src.dir}/javadocOverview.html" -@@ -1039,7 +1047,9 @@ +@@ -1039,7 +1053,9 @@ doctitle="${Name-in-docs} ${impl.version}" bottom="Copyright © ${year} Apache XML Project. All Rights Reserved."> <classpath refid="docs.class.path" /> @@ -69,7 +119,7 @@ <group title="Transformations API for XML (TrAX)" packages="javax.xml.transform*"/> <group title="Java API for XML Parsing" packages="javax.xml.parsers"/> <group title="Xalan Core" -@@ -1394,6 +1404,7 @@ +@@ -1394,6 +1410,7 @@ <java fork="yes" classname="${doc.generator}" classpathref="docs.class.path" > @@ -77,7 +127,7 @@ <arg line="targetDirectory=${site.dir} ${site.book} ${xdocs.style}"/> </java> -@@ -1422,6 +1433,7 @@ +@@ -1422,6 +1439,7 @@ <java fork="yes" classname="${doc.generator}" classpathref="docs.class.path" > @@ -85,7 +135,7 @@ <arg line="targetDirectory=${xalan.apache.org.site.dir} ${xalan.apache.org.site.book} ${xdocs.style}"/> </java> -@@ -1474,6 +1486,7 @@ +@@ -1474,6 +1492,7 @@ <java fork="yes" classname="${doc.generator}" classpathref="docs.class.path" > @@ -93,7 +143,7 @@ <arg line="loaderConfig=sbk:/style/loaderdesign.xml targetDirectory=${build.dir}/docs/design/ ${xdocs.dir}/sources/xalandesign.xml ${xdocs.style}"/> </java> -@@ -1490,6 +1503,7 @@ +@@ -1490,6 +1509,7 @@ <java fork="yes" classname="${xalan.cmdline.class}" classpathref="docs.class.path" > @@ -101,7 +151,7 @@ <arg line="-xsl ${xdocs.dir}/sources/xalan-collate.xsl -out xdocs/sources/xalan/xalan-collate.xml"/> </java> -@@ -1499,6 +1513,7 @@ +@@ -1499,6 +1519,7 @@ <java fork="yes" classname="${xalan.cmdline.class}" classpathref="docs.class.path" > @@ -109,7 +159,7 @@ <arg line="-in ${xdocs.dir}/sources/xalan/xalan-collate.xml -param resourceFile '../../sources/xalan/resources.xml' -param project ${Name-in-docs} -@@ -1510,6 +1525,7 @@ +@@ -1510,6 +1531,7 @@ <java fork="yes" classname="org.apache.fop.apps.CommandLine" classpath="${java.class.path}:${build.xalan.jar}:${bin.dir}/fop.jar:${bin.dir}/w3c.jar"> @@ -117,7 +167,7 @@ <arg line="${build.docs}/xalan-collate.fo build/docs/xalan.pdf"/> </java> </target> -@@ -1536,6 +1552,7 @@ +@@ -1536,6 +1558,7 @@ <java fork="yes" classname="${doc.generator}" classpathref="docs.class.path" > @@ -125,7 +175,7 @@ <arg line="targetDirectory=${build.docs}/xsltc ${xdocs.dir}/sources/xsltc.xml ${xdocs.style}"/> </java> <copy todir="${build.docs}/xsltc" -@@ -1695,7 +1712,7 @@ +@@ -1695,7 +1718,7 @@ use="true" windowtitle="${Name-in-docs} Serializer ${impl.version}" doctitle="${Name-in-docs} Serializer ${impl.version}" @@ -134,7 +184,7 @@ <classpath refid="docs.class.path" /> <taglet name="xalan2jtaglet.XSLUsageTag" path="${taglet.jar}"/> <group title="Serializer" packages="org.apache.xml.serialize*"/> -@@ -1713,7 +1730,7 @@ +@@ -1713,7 +1736,7 @@ use="true" windowtitle="${Name-in-docs} Serializer ${impl.version}" doctitle="${Name-in-docs} Serializer ${impl.version}" -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libxalan2-java.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
