[gentoo-commits] gentoo-x86 commit in dev-java/hamcrest-integration/files: 1.3-remove-targets.patch 1.2-remove-targets.patch 1.1-remove-targets.patch

[Johann Schmitz (ercpe)]

ercpe       14/03/02 16:26:05

  Added:                1.3-remove-targets.patch 1.2-remove-targets.patch
                        1.1-remove-targets.patch
  Log:
  New ebuild for hamcrest-integration in all slots (:0, :1.2 and :1.3) wrt bug #287777.
  
  This commit also solves bug #205489.
  
  (Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 77C501ED)

Revision  Changes    Path
1.1                  dev-java/hamcrest-integration/files/1.3-remove-targets.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/hamcrest-integration/files/1.3-remove-targets.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/hamcrest-integration/files/1.3-remove-targets.patch?rev=1.1&content-type=text/plain

Index: 1.3-remove-targets.patch
===================================================================
diff --git a/hamcrest-1.3/build.xml b/hamcrest-1.3/build.xml
index 1cfd4fb..396ebc5 100644
--- a/hamcrest-1.3/build.xml
+++ b/hamcrest-1.3/build.xml
@@ -12,69 +12,14 @@
     </target>
 
     <target name="generator" description="Build code generator tool">
-        <java-to-jar srcdir="hamcrest-generator/src/main/java"
-                     modulename="hamcrest-generator-nodeps"
-                     classpath="lib/generator/qdox-1.12.jar"/>
-
-        <!-- Bundle QDox classes in hamcrest-generator.jar using JarJar to place classes under a different package -->
-        <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpath="lib/generator/jarjar-1.3.jar"/>
-        <jarjar jarfile="build/hamcrest-generator-${version}.jar">
-            <zipfileset src="build/hamcrest-generator-nodeps-${version}.jar"/>
-            <zipfileset src="lib/generator/qdox-1.12.jar"/>
-            <rule pattern="com.thoughtworks.qdox.**" result="org.hamcrest.generator.qdox.@1"/>
-        </jarjar>
-        <copy file="build/hamcrest-generator-nodeps-${version}-sources.jar" tofile="build/hamcrest-generator-${version}-sources.jar"/>
     </target>
 
     <target name="core" depends="generator" description="Build core Hamcrest library">
-        <java-to-jar srcdir="hamcrest-core/src/main/java" modulename="hamcrest-core"/>
-
-        <!-- Generate one class with all static imports -->
-        <mkdir dir="build/temp/hamcrest-core/generated-code"/>
-
-        <java classname="org.hamcrest.generator.config.XmlConfigurator"
-              fork="yes"
-              failonerror="yes"
-              classpath="
-                build/hamcrest-core-${version}.jar;
-                build/hamcrest-generator-${version}.jar;
-              ">
-            <arg value="core-matchers.xml"/>
-            <arg value="hamcrest-core/src/main/java"/>
-            <arg value="org.hamcrest.CoreMatchers"/>
-            <arg value="build/temp/hamcrest-core/generated-code"/>
-        </java>
-        <!-- Append to core jar -->
-        <java-to-jar srcdir="build/temp/hamcrest-core/generated-code"
-                     modulename="hamcrest-core"
-                     classpath="build/hamcrest-core-${version}.jar"/>
     </target>
 
     <target name="library"
             depends="core,generator"
             description="Build library of matchers">
-        <mkdir dir="build/temp/hamcrest-library/generated-code"/>
-        <java-to-jar srcdir="hamcrest-library/src/main/java"
-                     modulename="hamcrest-library"
-                     classpath="build/hamcrest-core-${version}.jar"/>
-        <!-- Generate one class with all static imports -->
-        <java classname="org.hamcrest.generator.config.XmlConfigurator"
-              fork="yes"
-              failonerror="yes"
-              classpath="
-                build/hamcrest-core-${version}.jar;
-                build/hamcrest-generator-${version}.jar;
-                build/hamcrest-library-${version}.jar;
-              ">
-            <arg value="matchers.xml"/>
-            <arg value="hamcrest-core/src/main/java,hamcrest-library/src/main/java"/>
-            <arg value="org.hamcrest.Matchers"/>
-            <arg value="build/temp/hamcrest-library/generated-code"/>
-        </java>
-        <!-- Append to library jar -->
-        <java-to-jar srcdir="build/temp/hamcrest-library/generated-code"
-                     modulename="hamcrest-library"
-                     classpath="build/hamcrest-core-${version}.jar"/>
     </target>
 
     <target name="integration" depends="core, library" description="Build integration with external tools">



1.1                  dev-java/hamcrest-integration/files/1.2-remove-targets.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/hamcrest-integration/files/1.2-remove-targets.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/hamcrest-integration/files/1.2-remove-targets.patch?rev=1.1&content-type=text/plain

Index: 1.2-remove-targets.patch
===================================================================
diff --git a/hamcrest-1.2/build.xml b/hamcrest-1.2/build.xml
index bf7e50c..f552ae1 100644
--- a/hamcrest-1.2/build.xml
+++ b/hamcrest-1.2/build.xml
@@ -23,75 +23,16 @@
 
     <target name="generator"
             description="Build code generator tool">
-        <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;
-                     "/>
-        <taskdef name="jarjar"
-                 classname="com.tonicsystems.jarjar.JarJarTask"
-                 classpath="lib/generator/jarjar-1.0rc3.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"/>
-            <rule pattern="com.thoughtworks.qdox.**"
-                  result="org.hamcrest.generator.qdox.@1"/>
-        </jarjar>
     </target>
 
     <target name="core"
             depends="generator"
             description="Build core Hamcrest library">
-        <java-to-jar srcdir="hamcrest-core/src/main/java"
-                     destjar="build/hamcrest-core-${version}.jar"/>
-        <!-- Generate one class with all static imports -->
-        <mkdir dir="build/temp/hamcrest-core/generated-code"/>
-        <java classname="org.hamcrest.generator.config.XmlConfigurator"
-              fork="yes"
-              failonerror="yes"
-              classpath="
-                build/hamcrest-core-${version}.jar;
-                build/hamcrest-generator-${version}.jar;
-              ">
-            <arg value="core-matchers.xml"/>
-            <arg value="hamcrest-core/src/main/java"/>
-            <arg value="org.hamcrest.CoreMatchers"/>
-            <arg value="build/temp/hamcrest-core/generated-code"/>
-        </java>
-        <!-- Append to core jar -->
-        <java-to-jar srcdir="build/temp/hamcrest-core/generated-code"
-                     destjar="build/hamcrest-core-${version}.jar"
-                     classpath="build/hamcrest-core-${version}.jar"/>
     </target>
 
     <target name="library"
             depends="core,generator"
             description="Build library of matchers">
-        <mkdir dir="build/temp/hamcrest-library/generated-code"/>
-        <java-to-jar srcdir="hamcrest-library/src/main/java"
-                     destjar="build/hamcrest-library-${version}.jar"
-                     classpath="build/hamcrest-core-${version}.jar"/>
-        <!-- Generate one class with all static imports -->
-        <java classname="org.hamcrest.generator.config.XmlConfigurator"
-              fork="yes"
-              failonerror="yes"
-              classpath="
-                build/hamcrest-core-${version}.jar;
-                build/hamcrest-generator-${version}.jar;
-                build/hamcrest-library-${version}.jar;
-              ">
-            <arg value="matchers.xml"/>
-            <arg value="hamcrest-core/src/main/java,hamcrest-library/src/main/java"/>
-            <arg value="org.hamcrest.Matchers"/>
-            <arg value="build/temp/hamcrest-library/generated-code"/>
-        </java>
-        <!-- Append to library jar -->
-        <java-to-jar srcdir="build/temp/hamcrest-library/generated-code"
-                     destjar="build/hamcrest-library-${version}.jar"
-                     classpath="build/hamcrest-core-${version}.jar"/>
     </target>
 
     <target name="integration"



1.1                  dev-java/hamcrest-integration/files/1.1-remove-targets.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/hamcrest-integration/files/1.1-remove-targets.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/hamcrest-integration/files/1.1-remove-targets.patch?rev=1.1&content-type=text/plain

Index: 1.1-remove-targets.patch
===================================================================
diff --git a/hamcrest-1.1/build.xml b/hamcrest-1.1/build.xml
index f819d3d..6d4ea63 100644
--- a/hamcrest-1.1/build.xml
+++ b/hamcrest-1.1/build.xml
@@ -23,87 +23,28 @@
 
     <target name="generator"
             description="Build code generator tool">
-        <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;
-                     "/>
-        <taskdef name="jarjar"
-                 classname="com.tonicsystems.jarjar.JarJarTask"
-                 classpath="lib/generator/jarjar-1.0rc3.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"/>
-            <rule pattern="com.thoughtworks.qdox.**"
-                  result="org.hamcrest.generator.qdox.@1"/>
-        </jarjar>
     </target>
 
     <target name="core"
             depends="generator"
             description="Build core Hamcrest library">
-        <java-to-jar srcdir="hamcrest-core/src/main/java"
-                     destjar="build/hamcrest-core-${version}.jar"/>
-        <!-- Generate one class with all static imports -->
-        <mkdir dir="build/temp/hamcrest-core/generated-code"/>
-        <java classname="org.hamcrest.generator.config.XmlConfigurator"
-              fork="yes"
-              failonerror="yes"
-              classpath="
-                build/hamcrest-core-${version}.jar;
-                build/hamcrest-generator-${version}.jar;
-              ">
-            <arg value="core-matchers.xml"/>
-            <arg value="hamcrest-core/src/main/java"/>
-            <arg value="org.hamcrest.CoreMatchers"/>
-            <arg value="build/temp/hamcrest-core/generated-code"/>
-        </java>
-        <!-- Append to core jar -->
-        <java-to-jar srcdir="build/temp/hamcrest-core/generated-code"
-                     destjar="build/hamcrest-core-${version}.jar"
-                     classpath="build/hamcrest-core-${version}.jar"/>
     </target>
 
     <target name="library"
             depends="core,generator"
             description="Build library of matchers">
-        <java-to-jar srcdir="hamcrest-library/src/main/java"
-                     destjar="build/hamcrest-library-${version}.jar"
-                     classpath="build/hamcrest-core-${version}.jar"/>
-        <!-- Generate one class with all static imports -->
-        <mkdir dir="build/temp/hamcrest-library/generated-code"/>
-        <java classname="org.hamcrest.generator.config.XmlConfigurator"
-              fork="yes"
-              failonerror="yes"
-              classpath="
-                build/hamcrest-core-${version}.jar;
-                build/hamcrest-generator-${version}.jar;
-                build/hamcrest-library-${version}.jar;
-              ">
-            <arg value="matchers.xml"/>
-            <arg value="hamcrest-core/src/main/java,hamcrest-library/src/main/java"/>
-            <arg value="org.hamcrest.Matchers"/>
-            <arg value="build/temp/hamcrest-library/generated-code"/>
-        </java>
-        <!-- Append to library jar -->
-        <java-to-jar srcdir="build/temp/hamcrest-library/generated-code"
-                     destjar="build/hamcrest-library-${version}.jar"
-                     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="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">
@@ -121,7 +62,7 @@
                      destjar="build/hamcrest-unit-test-${version}.jar"
                      classpath="
                         build/hamcrest-core-${version}.jar;
-                        build/hamcrest-library-${version}.jar;
+                        build/hamcrest-library-${version}.jar;
         				build/hamcrest-text-${version}.jar;
                         build/hamcrest-integration-${version}.jar;
                         build/hamcrest-generator-${version}.jar"/>
@@ -164,7 +105,7 @@
         <jar jarfile="build/hamcrest-all-${version}.jar" duplicate="preserve">
             <zipfileset src="build/hamcrest-core-${version}.jar"/>
             <zipfileset src="build/hamcrest-library-${version}.jar"/>
-            <zipfileset src="build/hamcrest-text-${version}.jar"/>
+            <zipfileset src="build/hamcrest-text-${version}.jar"/>
             <zipfileset src="build/hamcrest-generator-${version}.jar"/>
             <zipfileset src="build/hamcrest-integration-${version}.jar"/>
         </jar>
@@ -221,7 +162,7 @@
 
 			<packageset dir="hamcrest-core/src/main/java"/>
 			<packageset dir="hamcrest-library/src/main/java" excludes="org/hamcrest/internal"/>
-			<packageset dir="hamcrest-text/src/main/java" excludes="**/internal/**"/>
+			<packageset dir="hamcrest-text/src/main/java" excludes="**/internal/**"/>
 			<packageset dir="hamcrest-integration/src/main/java"/>
 			<packageset dir="build/generated-code"/>
 			
@@ -261,4 +202,4 @@
         </sequential>
     </macrodef>
 
-</project>
+</project>