[pkg-java] r14183 - trunk/libwoodstox-java/debian/patches
Giovanni Mascellani
gio at alioth.debian.org
Mon Aug 15 14:52:32 UTC 2011
Author: gio
Date: 2011-08-15 14:52:31 +0000 (Mon, 15 Aug 2011)
New Revision: 14183
Modified:
trunk/libwoodstox-java/debian/patches/10-disable-unused.dpatch
Log:
Fixed build.xml patch for new release.
Modified: trunk/libwoodstox-java/debian/patches/10-disable-unused.dpatch
===================================================================
--- trunk/libwoodstox-java/debian/patches/10-disable-unused.dpatch 2011-08-15 13:53:58 UTC (rev 14182)
+++ trunk/libwoodstox-java/debian/patches/10-disable-unused.dpatch 2011-08-15 14:52:31 UTC (rev 14183)
@@ -1,161 +1,82 @@
From: Vincent Fourmond <fourmond at debian.org>
-diff -urNad libwoodstox-java-3.9.1~/build.xml libwoodstox-java-3.9.1/build.xml
---- libwoodstox-java-3.9.1~/build.xml 2008-03-16 06:33:27.000000000 +0100
-+++ libwoodstox-java-3.9.1/build.xml 2008-05-03 21:05:45.000000000 +0200
-@@ -20,11 +20,11 @@
- <property name="RelNotesDir" location="${basedir}/release-notes" />
+Index: libwoodstox-java/build.xml
+===================================================================
+--- libwoodstox-java.orig/build.xml 2011-01-28 06:39:41.000000000 +0100
++++ libwoodstox-java/build.xml 2011-08-15 16:50:42.000000000 +0200
+@@ -57,14 +57,19 @@
- <!-- Libs -->
-- <property name="LibDir" location="${basedir}/lib" />
-+ <property name="LibDir" location="${basedir}/lib" />
- <!-- Build-related -->
- <property name="BuildDir" location="${basedir}/build" />
- <property name="BuildClassesDir" location="${BuildDir}/classes" />
-- <property name="EmmaBuildClassesDir" location="${BuildDir}/emma-classes" />
-+<!-- <property name="EmmaBuildClassesDir" location="${BuildDir}/emma-classes" /> -->
-
- <!-- Documentation -->
- <property name="DocDir" location="${basedir}/doc" />
-@@ -56,16 +56,16 @@
-
<!-- jars needed for compilation -->
- <path id="compile-classpath">
-- <fileset dir="${LibDir}" includes="stax-api*.jar" />
-- <fileset dir="${LibDir}" includes="sax2.jar" />
-+<!-- <fileset dir="${LibDir}" includes="stax-api*.jar" /> -->
-+<!-- <fileset dir="${LibDir}" includes="sax2.jar" /> -->
+ <path id="classpath.compile">
+- <fileset dir="${dir.lib}" includes="stax-api*.jar" />
+- <fileset dir="${dir.lib}" includes="sax2.jar" />
++ <!--<fileset dir="${dir.lib}" includes="stax-api*.jar" />
++ <fileset dir="${dir.lib}" includes="sax2.jar" />-->
<!-- these are needed for optional MSV-based validators -->
-- <fileset dir="${LibDir}/msv" includes="*.jar" />
-- </path>
-- <path id="junit-libs">
-- <fileset dir="${LibDir}">
-- <include name="junit/junit*.jar" />
-- </fileset>
-+<!-- <fileset dir="${LibDir}/msv" includes="*.jar" /> -->
+- <fileset dir="${dir.lib}/msv" includes="*.jar" />
++ <!--<fileset dir="${dir.lib}/msv" includes="*.jar" />-->
++ <fileset file="/usr/share/java/msv-core.jar" />
++ <fileset file="/usr/share/java/xsdlib.jar" />
++ <fileset file="/usr/share/java/relaxngDatatype.jar" />
++ <fileset file="/usr/share/java/knopflerfish-framework.jar" />
++ <fileset file="/usr/share/java/junit4.jar" />
+ <!-- 17-Dec-2008, tatu: adding OSGi bundle activation
+ support, to register providers as services
+ -->
+- <fileset dir="${dir.lib}/osgi" includes="*.jar" />
++ <!--fileset dir="${dir.lib}/osgi" includes="*.jar" />-->
</path>
-+<!-- <path id="junit-libs"> -->
-+<!-- <fileset dir="${LibDir}"> -->
-+<!-- <include name="junit/junit*.jar" /> -->
-+<!-- </fileset> -->
-+<!-- </path> -->
-
- <!-- Source files to include in source packages (tar, zip) -->
- <patternset id="wstx-dist-src-files">
-@@ -96,6 +96,7 @@
- <!-- Core Woodstox class files common to all license flavours: -->
- <patternset id="wstx-dist-class-files">
- <include name="com/ctc/**/*.class" />
-+ <exclude name="com/ctc/**/msv/*.class" />
- <include name="META-INF/services/javax.xml.stream.*" />
- <include name="META-INF/services/org.codehaus.stax2.*" />
+ <path id="junit-libs">
+ <fileset dir="${dir.lib}">
+@@ -102,10 +107,10 @@
+ <include name="lib/msv/*.jar" />
</patternset>
-@@ -127,21 +128,21 @@
- <!-- Enabling support for Emma (http://emma.sourceforge.net) code
- - coverage library
- -->
-- <property name="emma.dir" value="${LibDir}/coverage" />
-- <property name="emma.coverage.dir" value="${BuildDir}/coverage" />
-- <path id="emma.lib">
-- <pathelement location="${emma.dir}/emma.jar" />
-- <pathelement location="${emma.dir}/emma_ant.jar" />
-- </path>
-- <taskdef resource="emma_ant.properties" classpathref="emma.lib" />
-+<!-- <property name="emma.dir" value="${LibDir}/coverage" /> -->
-+<!-- <property name="emma.coverage.dir" value="${BuildDir}/coverage" /> -->
-+<!-- <path id="emma.lib"> -->
-+<!-- <pathelement location="${emma.dir}/emma.jar" /> -->
-+<!-- <pathelement location="${emma.dir}/emma_ant.jar" /> -->
-+<!-- </path> -->
-+<!-- <taskdef resource="emma_ant.properties" classpathref="emma.lib" /> -->
+- <import file="build-osgi.xml" />
++ <!--<import file="build-osgi.xml" />
+ <import file="build-coverage.xml" />
+ <import file="build-maven-deploy.xml" />
+- <import file="repackage-msv.xml" />
++ <import file="repackage-msv.xml" />-->
- <!-- And/or support for Cobertura code coverage tool -->
-- <property name="cobertura.coverage.dir" value="${BuildDir}/coverage" />
-- <path id="cobertura.lib">
-- <fileset dir="${LibDir}/cobertura" includes="*.jar" />
-- </path>
-- <taskdef classpathref="cobertura.lib" resource="tasks.properties" />
-+<!-- <property name="cobertura.coverage.dir" value="${BuildDir}/coverage" /> -->
-+<!-- <path id="cobertura.lib"> -->
-+<!-- <fileset dir="${LibDir}/cobertura" includes="*.jar" /> -->
-+<!-- </path> -->
-+<!-- <taskdef classpathref="cobertura.lib" resource="tasks.properties" /> -->
-
<!--*********************************************************************-->
<!-- The readme target shows a brief description of all targets -->
-@@ -175,9 +176,9 @@
- <!-- make build directories -->
- <mkdir dir="${BuildDir}" />
- <mkdir dir="${BuildClassesDir}" />
-- <mkdir dir="${EmmaBuildClassesDir}" />
-- <mkdir dir="${emma.coverage.dir}" />
-- <mkdir dir="${cobertura.coverage.dir}" />
-+<!-- <mkdir dir="${EmmaBuildClassesDir}" /> -->
-+<!-- <mkdir dir="${emma.coverage.dir}" /> -->
-+<!-- <mkdir dir="${cobertura.coverage.dir}" /> -->
+@@ -254,7 +259,8 @@
+ <!-- Dummy target that just includes all individual jars...
+ (OSGi ones from included file)
+ -->
+- <target name="jars" depends="jars.osgi, jar.stax2test, repackage-msv" />
++ <!--<target name="jars" depends="jars.osgi, jar.stax2test, repackage-msv" />-->
++ <target name="jars" depends="jar.stax2test" />
- <!-- make docs directories -->
- <mkdir dir="${DocDir}" />
-@@ -244,6 +245,7 @@
- -->
- <include name="org/codehaus/stax2/**/*.java" />
- <include name="com/ctc/**/*.java" />
-+ <exclude name="com/ctc/**/msv/*.java" />
- <include name="test/**/*.java" />
- <classpath refid="compile-classpath" />
- </javac>
-@@ -635,14 +637,14 @@
- </pathelement>
- </path>
- <mkdir dir="${emma.instr.dir}" />
-- <emma enabled="true"> <!-- verbosity="verbose" -->
-- <instr instrpathref="emma-classpath"
-- destdir="${EmmaBuildClassesDir}"
-- metadatafile="${emma.coverage.dir}/metadata.emma"
-- merge="true"
-- mode="fullcopy"
-- />
-- </emma>
-+<!-- <emma enabled="true"> --><!-- verbosity="verbose" -->
-+<!-- <instr instrpathref="emma-classpath" -->
-+<!-- destdir="${EmmaBuildClassesDir}" -->
-+<!-- metadatafile="${emma.coverage.dir}/metadata.emma" -->
-+<!-- merge="true" -->
-+<!-- mode="fullcopy" -->
-+<!-- /> -->
-+<!-- </emma> -->
- <!-- Ok, so let's just nuke the stupid test classes...
- - ... for which there are 2 possible locations...
- -->
-@@ -765,19 +767,19 @@
- </classpath>
- </junit>
- <!-- and then reporting -->
-- <cobertura-report format="html" destdir="${cobertura.coverage.dir}" >
-- <fileset dir="${JavaSrcDir}">
-- <include name="**/*.java" />
-- </fileset>
-- </cobertura-report>
-+<!-- <cobertura-report format="html" destdir="${cobertura.coverage.dir}" > -->
-+<!-- <fileset dir="${JavaSrcDir}"> -->
-+<!-- <include name="**/*.java" /> -->
-+<!-- </fileset> -->
-+<!-- </cobertura-report> -->
+ <!-- This jar is only needed for testing purposes, to specify
+ - which Stax implementation to use
+@@ -312,18 +318,6 @@
+ </target>
+
+ <target name="dist" depends="compile,jars,javadoc">
+- <!-- First, let's copy the binary jars to dist -->
+- <copy todir="${dir.dist}">
+- <fileset dir="${dir.build}" includes="woodstox*.jar" />
+- <fileset dir="${dir.build}" includes="stax2*.jar" />
+- <fileset dir="${dir.lib}/msv" includes="msv-core*.jar" />
+- <fileset dir="${dir.lib}/msv" includes="xsdlib*.jar" />
+- </copy>
+- <!-- Including MSV jars (note: ones we have repackaged)
+- -->
+- <copy todir="${dir.dist}">
+- <fileset dir="${dir.build}" includes="woodstox-msv-*.jar" />
+- </copy>
- <!-- Let's also report junit results? (at least if they fail) -->
-- <junitreport todir="${TestResultsDir}">
-- <fileset dir="${TestXmlResultsDir}">
-- <include name="TEST-*.xml" />
-- </fileset>
-- <report todir="${TestResultsDir}" />
-- </junitreport>
-+<!-- <junitreport todir="${TestResultsDir}"> -->
-+<!-- <fileset dir="${TestXmlResultsDir}"> -->
-+<!-- <include name="TEST-*.xml" /> -->
-+<!-- </fileset> -->
-+<!-- <report todir="${TestResultsDir}" /> -->
-+<!-- </junitreport> -->
- </target>
+ <!-- Then let's create the source distribution tar packages
+ -->
+@@ -391,6 +385,9 @@
+ includes="org/codehaus/stax2/**/*.java"
+ />
- </project>
++ <jar basedir="${dir.build.classes.stax2}" destfile="${dir.dist}/stax2-api.jar" />
++ <jar basedir="${dir.build.classes.woodstox}" destfile="${dir.dist}/woodstox-core.jar" />
++
+ <!-- Then copy javadocs -->
+ <copy todir="${dir.dist}">
+ <fileset dir="${dir.javadoc}/.." includes="javadoc/**/*" />
More information about the pkg-java-commits
mailing list