libhamcrest-java (1.2-2) 001-build.patch

Summary

 build.xml |   32 ++++++++++++++++++++++++++------
 1 file changed, 26 insertions(+), 6 deletions(-)

    
download this patch

Patch contents

Description: Fixes some classpaths and makes the javadoc link against system
 installed javadocs.
Author: Ludovic Claude <ludovic.claude@laposte.net>

--- libhamcrest-java-1.2.orig/build.xml
+++ libhamcrest-java-1.2/build.xml
@@ -26,17 +26,17 @@
         <java-to-jar srcdir="hamcrest-generator/src/main/java"
                      destjar="build/temp/hamcrest-generator-${version}-nodeps.jar"
                      classpath="
-                       lib/generator/qdox-1.6.1.jar;
+                       /usr/share/java/qdox.jar;
                      "/>
         <taskdef name="jarjar"
                  classname="com.tonicsystems.jarjar.JarJarTask"
-                 classpath="lib/generator/jarjar-1.0rc3.jar"/>
+                 classpath="/usr/share/java/jarjar.jar"/>
         <!-- Bundle QDox classes in hamcrest-generator.jar so user doesn't need to care
              about it's existence. Uses JarJar to place classes under a different package
              to prevent conflict. -->
         <jarjar jarfile="build/hamcrest-generator-${version}.jar">
             <zipfileset src="build/temp/hamcrest-generator-${version}-nodeps.jar"/>
-            <zipfileset src="lib/generator/qdox-1.6.1.jar"/>
+            <zipfileset src="/usr/share/java/qdox.jar"/>
             <rule pattern="com.thoughtworks.qdox.**"
                   result="org.hamcrest.generator.qdox.@1"/>
         </jarjar>
@@ -94,6 +94,18 @@
                      classpath="build/hamcrest-core-${version}.jar"/>
     </target>
 
+<!--
+    <target name="text"
+            depends="core, library"
+            description="Build text pattern matcher">
+        <java-to-jar srcdir="hamcrest-text/src/main/java"
+                     destjar="build/hamcrest-text-${version}.jar"
+                     classpath="
+                        build/hamcrest-core-${version}.jar;
+                        build/hamcrest-library-${version}.jar"/>
+    </target>
+-->
+
     <target name="integration"
             depends="core, library"
             description="Build integration with external tools">
@@ -196,19 +208,27 @@
 
 	<target name="javadoc" depends="library">
 		<mkdir dir="build/javadoc"/>
-		<javadoc destdir="build/javadoc" source="1.5" failonerror="yes"
-			overview="overview.html">
+		<javadoc destdir="build/javadoc" source="1.5" failonerror="no"
+			overview="build/javadoc/overview-summary.html">
 			
             <classpath>
                 <fileset dir="lib/integration">
                     <include name="*.jar"/>
                 </fileset>
+                <fileset dir="/usr/share/java">
+                    <include name="junit.jar"/>
+                    <include name="junit4.jar"/>
+                    <include name="testng.jar"/>
+                    <include name="easymock.jar"/>
+                    <include name="jmock.jar"/>
+                </fileset>
             </classpath>
 
 			<packageset dir="hamcrest-core/src/main/java"/>
 			<packageset dir="hamcrest-library/src/main/java" excludes="org/hamcrest/internal"/>
 			<packageset dir="hamcrest-integration/src/main/java"/>
-			<packageset dir="build/generated-code"/>
+			<packageset dir="build/temp/hamcrest-core/generated-code"/>
+			<packageset dir="build/temp/hamcrest-library/generated-code"/>
 			
 			<group title="Hamcrest API and Utility Classes" packages="org.hamcrest"/>
 			<group title="Matcher Library" packages="org.hamcrest.*"/>