← Back to branch summary

~brian-thomason/+junk/hamcrest

« back to all changes in this revision

Viewing changes to debian/patches/001-build.patch

  • Committer: Brian Thomason
  • Date: 2011-12-20 17:40:16 UTC
  • Revision ID: brian.thomason@canonical.com-20111220174016-g67bgjybqqhzuuxt
Initial import

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/001-build.patch
 
1
Description: Fixes some classpaths and makes the javadoc link against system
 
2
 installed javadocs.
 
3
Author: Ludovic Claude <ludovic.claude@laposte.net>
 
4
 
 
5
--- libhamcrest-java-1.2.orig/build.xml
 
6
+++ libhamcrest-java-1.2/build.xml
 
7
@@ -26,17 +26,17 @@
 
8
         <java-to-jar srcdir="hamcrest-generator/src/main/java"
 
9
                      destjar="build/temp/hamcrest-generator-${version}-nodeps.jar"
 
10
                      classpath="
 
11
-                       lib/generator/qdox-1.6.1.jar;
 
12
+                       /usr/share/java/qdox.jar;
 
13
                      "/>
 
14
         <taskdef name="jarjar"
 
15
                  classname="com.tonicsystems.jarjar.JarJarTask"
 
16
-                 classpath="lib/generator/jarjar-1.0rc3.jar"/>
 
17
+                 classpath="/usr/share/java/jarjar.jar"/>
 
18
         <!-- Bundle QDox classes in hamcrest-generator.jar so user doesn't need to care
 
19
              about it's existence. Uses JarJar to place classes under a different package
 
20
              to prevent conflict. -->
 
21
         <jarjar jarfile="build/hamcrest-generator-${version}.jar">
 
22
             <zipfileset src="build/temp/hamcrest-generator-${version}-nodeps.jar"/>
 
23
-            <zipfileset src="lib/generator/qdox-1.6.1.jar"/>
 
24
+            <zipfileset src="/usr/share/java/qdox.jar"/>
 
25
             <rule pattern="com.thoughtworks.qdox.**"
 
26
                   result="org.hamcrest.generator.qdox.@1"/>
 
27
         </jarjar>
 
28
@@ -94,6 +94,18 @@
 
29
                      classpath="build/hamcrest-core-${version}.jar"/>
 
30
     </target>
 
31
 
 
32
+<!--
 
33
+    <target name="text"
 
34
+            depends="core, library"
 
35
+            description="Build text pattern matcher">
 
36
+        <java-to-jar srcdir="hamcrest-text/src/main/java"
 
37
+                     destjar="build/hamcrest-text-${version}.jar"
 
38
+                     classpath="
 
39
+                        build/hamcrest-core-${version}.jar;
 
40
+                        build/hamcrest-library-${version}.jar"/>
 
41
+    </target>
 
42
+-->
 
43
+
 
44
     <target name="integration"
 
45
             depends="core, library"
 
46
             description="Build integration with external tools">
 
47
@@ -196,19 +208,27 @@
 
48
 
 
49
        <target name="javadoc" depends="library">
 
50
                <mkdir dir="build/javadoc"/>
 
51
-               <javadoc destdir="build/javadoc" source="1.5" failonerror="yes"
 
52
-                       overview="overview.html">
 
53
+               <javadoc destdir="build/javadoc" source="1.5" failonerror="no"
 
54
+                       overview="build/javadoc/overview-summary.html">
 
55
                        
 
56
             <classpath>
 
57
                 <fileset dir="lib/integration">
 
58
                     <include name="*.jar"/>
 
59
                 </fileset>
 
60
+                <fileset dir="/usr/share/java">
 
61
+                    <include name="junit.jar"/>
 
62
+                    <include name="junit4.jar"/>
 
63
+                    <include name="testng.jar"/>
 
64
+                    <include name="easymock.jar"/>
 
65
+                    <include name="jmock.jar"/>
 
66
+                </fileset>
 
67
             </classpath>
 
68
 
 
69
                        <packageset dir="hamcrest-core/src/main/java"/>
 
70
                        <packageset dir="hamcrest-library/src/main/java" excludes="org/hamcrest/internal"/>
 
71
                        <packageset dir="hamcrest-integration/src/main/java"/>
 
72
-                       <packageset dir="build/generated-code"/>
 
73
+                       <packageset dir="build/temp/hamcrest-core/generated-code"/>
 
74
+                       <packageset dir="build/temp/hamcrest-library/generated-code"/>
 
75
                        
 
76
                        <group title="Hamcrest API and Utility Classes" packages="org.hamcrest"/>
 
77
                        <group title="Matcher Library" packages="org.hamcrest.*"/>