[dom4j] 08/20: Fixes to build on Debian.

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to annotated tag debian/1.6.1+dfsg-1
in repository dom4j.

commit af9cbea789e1cb3867eaef5b8817f6d9b3b56865
Author: Marcus Better <marcus at better.se>
Date:   Tue Oct 10 10:21:00 2006 +0000

    Fixes to build on Debian.
---
 build.xml | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/build.xml b/build.xml
index 0f87f2d..b089033 100644
--- a/build.xml
+++ b/build.xml
@@ -16,13 +16,11 @@
     </path>
 
     <path id="test.classpath">
-        <path refid="compile.classpath" />
-        <fileset dir="./lib/test">
-            <include name="**/*.jar" />
-        </fileset>
-        <fileset dir="./lib/tools">
-            <include name="xalan*.jar" />
+        <fileset dir="/usr/share/java">
+            <include name="xalan2.jar" />
             <include name="xerces*.jar" />
+            <include name="jaxen.jar" />
+            <include name="xpp3.jar" />
         </fileset>
     </path>
 
@@ -146,6 +144,9 @@
            source="1.3"
            deprecation="${deprecation}"
            classpathref="compile.classpath">
+	<exclude name="org/dom4j/datatype/**"/>
+        <exclude name="org/dom4j/io/STAXEventReader.java"/>
+        <exclude name="org/dom4j/io/STAXEventWriter.java"/>
     </javac>
   </target>
 
@@ -159,6 +160,8 @@
            optimize="${optimize}"
            deprecation="${deprecation}"
            classpathref="test.classpath">
+        <exclude name="org/dom4j/datatype/**"/>
+        <exclude name="org/dom4j/io/StaxTest.java"/>
     </javac>
   </target>
 
@@ -281,7 +284,7 @@
       <batchtest fork="yes" todir="${build.dir}/test-results/xml">
         <fileset dir="${test.dir}">
           <include name="**/*Test.java" />
-          <exclude name="**/AllTests.java,**/Abstract*.java,**/TestCase.java" />
+          <exclude name="**/AllTests.java,**/Abstract*.java,**/TestCase.java,**/StaxTest.java,**/datatype/*Test.java" />
         </fileset>
       </batchtest>
     </junit>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/dom4j.git