← Back to branch summary

~hudson-ubuntu/+junk/hudson-dom4j

« back to all changes in this revision

Viewing changes to debian/patches/build.patch

  • Committer: James Page
  • Date: 2011-06-08 10:11:55 UTC
  • Revision ID: james.page@canonical.com-20110608101155-zroi9fi02ma3c8uf
Major polish ready for upload

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/build.patch
 
1
Description: Debianisation of build.xml to use system libraries
 
2
Author: Marcus Better <marcus@better.se>
 
3
Forwarded: not-needed
 
4
 
 
5
Index: hudson-dom4j/build.xml
 
6
===================================================================
 
7
--- hudson-dom4j.orig/build.xml 2011-05-31 10:00:42.550297000 +0100
 
8
+++ hudson-dom4j/build.xml      2011-06-08 10:21:21.763014994 +0100
 
9
@@ -16,13 +16,13 @@
 
10
     </path>
 
11
 
 
12
     <path id="test.classpath">
 
13
-        <path refid="compile.classpath" />
 
14
-        <fileset dir="./lib/test">
 
15
-            <include name="**/*.jar" />
 
16
-        </fileset>
 
17
-        <fileset dir="./lib/tools">
 
18
-            <include name="xalan*.jar" />
 
19
-            <include name="xerces*.jar" />
 
20
+        <fileset dir="/usr/share/java">
 
21
+            <include name="backport-util-concurrent.jar" />
 
22
+            <include name="jaxen.jar" />
 
23
+            <include name="junitperf.jar" />
 
24
+            <include name="xalan2.jar" />
 
25
+            <include name="xercesImpl.jar" />
 
26
+            <include name="xpp3.jar" />
 
27
         </fileset>
 
28
     </path>
 
29
 
 
30
@@ -146,8 +146,9 @@
 
31
            source="1.3"
 
32
            deprecation="${deprecation}"
 
33
            classpathref="compile.classpath">
 
34
-      <exclude name="**/jaxb/*" />
 
35
-      <exclude name="**/dom/*" />
 
36
+      <exclude name="org/dom4j/datatype/**"/>
 
37
+      <exclude name="org/dom4j/io/STAXEventReader.java"/>
 
38
+      <exclude name="org/dom4j/io/STAXEventWriter.java"/>
 
39
     </javac>
 
40
   </target>
 
41
 
 
42
@@ -161,6 +162,8 @@
 
43
            optimize="${optimize}"
 
44
            deprecation="${deprecation}"
 
45
            classpathref="test.classpath">
 
46
+        <exclude name="org/dom4j/datatype/**"/>
 
47
+        <exclude name="org/dom4j/io/StaxTest.java"/>
 
48
     </javac>
 
49
   </target>
 
50
 
 
51
@@ -223,8 +226,7 @@
 
52
              doctitle="${Name}"
 
53
              bottom="Copyright &#169; ${year} MetaStuff Ltd. All Rights Reserved. Hosted by &lt;p&gt; &lt;img src='http://sourceforge.net/sflogo.php?group_id=16035' width='88' height='31' border='0' alt='SourceForge Logo' /&gt;"
 
54
              stylesheetfile="${doc.dir}/style/javadoc.css">
 
55
-      <link href="http://java.sun.com/j2se/1.4.2/docs/api"/>
 
56
-      <link href="http://java.sun.com/xml/jaxp-docs-1.1/docs/api"/>
 
57
+      <link href="file:///usr/share/doc/default-jdk/api"/>
 
58
     </javadoc>
 
59
 
 
60
     <mkdir dir="${build.apidocs}"/>
 
61
@@ -240,8 +242,7 @@
 
62
              doctitle="${Name}"
 
63
              bottom="Copyright &#169; ${year} MetaStuff Ltd. All Rights Reserved. Hosted by &lt;p&gt; &lt;img src='http://sourceforge.net/sflogo.php?group_id=16035' width='88' height='31' border='0' alt='SourceForge Logo' /&gt;"
 
64
              stylesheetfile="${doc.dir}/style/javadoc.css">
 
65
-      <link href="http://java.sun.com/j2se/1.4.2/docs/api"/>
 
66
-      <link href="http://java.sun.com/xml/jaxp-docs-1.1/docs/api"/>
 
67
+      <link href="file:///usr/share/doc/default-jdk/api"/>
 
68
       <link href="${build.javadocs}"/>
 
69
     </javadoc>
 
70
   </target>
 
71
@@ -274,7 +275,7 @@
 
72
   <!-- =================================================================== -->
 
73
   <target name="test" depends="compile-test">
 
74
     <mkdir dir="${build.dir}/test-results/xml"/>
 
75
-    <junit printsummary="yes" haltonfailure="yes">
 
76
+    <junit printsummary="yes" haltonfailure="no">
 
77
       <formatter type="xml"/>
 
78
 
 
79
       <classpath>
 
80
@@ -282,10 +283,17 @@
 
81
         <path refid="test.classpath" />
 
82
       </classpath>
 
83
 
 
84
+      <sysproperty key="org.xml.sax.driver"
 
85
+                   value="org.apache.xerces.parsers.SAXParser"/>
 
86
+
 
87
       <batchtest fork="yes" todir="${build.dir}/test-results/xml">
 
88
         <fileset dir="${test.dir}">
 
89
           <include name="**/*Test.java" />
 
90
-          <exclude name="**/AllTests.java,**/Abstract*.java,**/TestCase.java" />
 
91
+          <exclude name="**/AllTests.java" />
 
92
+          <exclude name="**/Abstract*.java" />
 
93
+          <exclude name="**/TestCase.java" />
 
94
+          <exclude name="**/StaxTest.java" />
 
95
+          <exclude name="**/datatype/*Test.java" />
 
96
         </fileset>
 
97
       </batchtest>
 
98
     </junit>
 
99
Index: hudson-dom4j/xml/bean/gui.xml
 
100
===================================================================
 
101
--- hudson-dom4j.orig/xml/bean/gui.xml  2011-05-31 10:00:42.550297000 +0100
 
102
+++ hudson-dom4j/xml/bean/gui.xml       2011-06-08 10:20:38.983014964 +0100
 
103
@@ -1,5 +1,5 @@
 
104
 <?xml version="1.0" encoding="UTF-8"?>
 
105
 <widgets>
 
106
-  <window class="javax.swing.JFrame" title="Frame #1"/>
 
107
-  <window class="javax.swing.JFrame" title="Frame #2"/>
 
108
+  <window class="java.awt.Canvas" title="Frame #1"/>
 
109
+  <window class="java.awt.Canvas" title="Frame #2"/>
 
110
 </widgets>