LogoopenSUSE Build Service > Projects
Sign Up | Log In

View File hamcrest-1.3-no-integration.patch of Package hamcrest (Project Java:packages)

---
 build.xml |   12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

Index: hamcrest-1.3/build.xml
===================================================================
--- hamcrest-1.3.orig/build.xml
+++ hamcrest-1.3/build.xml
@@ -110,7 +110,7 @@
                                 build/hamcrest-integration-${version}.jar"/>
     </target>
 
-    <target name="bigjar" depends="core, library, integration, generator"
+    <target name="bigjar" depends="core, library, generator"
             description="Build a single Jar (hamcrest-all.jar) that contains core, library, generator and integration.">
         <mkdir dir="build/temp/hamcrest-all-${version}.jar.manifest"/>
         <manifest file="build/temp/hamcrest-all-${version}.jar.manifest/MANIFEST.MF">
@@ -124,13 +124,11 @@
             <zipfileset src="build/hamcrest-core-${version}.jar"/>
             <zipfileset src="build/hamcrest-library-${version}.jar"/>
             <zipfileset src="build/hamcrest-generator-${version}.jar"/>
-            <zipfileset src="build/hamcrest-integration-${version}.jar"/>
         </jar>
         <jar jarfile="build/hamcrest-all-${version}-sources.jar" duplicate="preserve" manifest="build/temp/hamcrest-all-${version}.jar.manifest/MANIFEST.MF">
             <zipfileset src="build/hamcrest-core-${version}-sources.jar"/>
             <zipfileset src="build/hamcrest-library-${version}-sources.jar"/>
             <zipfileset src="build/hamcrest-generator-${version}-sources.jar"/>
-            <zipfileset src="build/hamcrest-integration-${version}-sources.jar"/>
         </jar>
     </target>
 
@@ -138,24 +136,16 @@
         <java-to-javadoc-jar modulename="hamcrest-generator-nodeps"/>
         <java-to-javadoc-jar modulename="hamcrest-core"/>
         <java-to-javadoc-jar modulename="hamcrest-library"/>
-        <java-to-javadoc-jar modulename="hamcrest-integration"/>
         <copy file="build/hamcrest-generator-nodeps-${version}-javadoc.jar" tofile="build/hamcrest-generator-${version}-javadoc.jar"/>
 
         <javadoc packagenames="org.hamcrest.*" defaultexcludes="yes"
                  destdir="build/temp/hamcrest-all-${version}-javadoc.jar.contents" author="true" version="true" use="true"
                  windowtitle="Hamcrest" source="1.6" failonerror="yes">
-            <classpath>
-                <fileset dir="lib/integration">
-                    <include name="*.jar"/>
-                </fileset>
-            </classpath>
             <packageset dir="build/temp/hamcrest-core-${version}-sources.jar.contents"/>
             <packageset dir="build/temp/hamcrest-library-${version}-sources.jar.contents" excludes="org/hamcrest/internal"/>
-            <packageset dir="build/temp/hamcrest-integration-${version}-sources.jar.contents"/>
             
             <group title="Hamcrest API and Utility Classes" packages="org.hamcrest"/>
             <group title="Matcher Library" packages="org.hamcrest.*"/>
-            <group title="Integration" packages="org.hamcrest.integration, org.hamcrest.integration.*"/>
             
             <link offline="false" href="http://www.junit.org/junit/javadoc/3.8.1/"/>
             <link offline="false" href="http://kentbeck.github.com/junit/javadoc/latest/"/>