| 1 |
ercpe 14/02/28 17:36:12 |
| 2 |
|
| 3 |
Added: 1.1-remove-targets.patch |
| 4 |
Log: |
| 5 |
Backported ebuild to 1.1 (:0) as a dependency of jmock:2 |
| 6 |
|
| 7 |
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 77C501ED) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 dev-java/hamcrest-library/files/1.1-remove-targets.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/hamcrest-library/files/1.1-remove-targets.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/hamcrest-library/files/1.1-remove-targets.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: 1.1-remove-targets.patch |
| 16 |
=================================================================== |
| 17 |
diff --git a/hamcrest-1.1/build.xml b/hamcrest-1.1/build.xml |
| 18 |
index f819d3d..b24dea0 100644 |
| 19 |
--- a/hamcrest-1.1/build.xml |
| 20 |
+++ b/hamcrest-1.1/build.xml |
| 21 |
@@ -23,48 +23,11 @@ |
| 22 |
|
| 23 |
<target name="generator" |
| 24 |
description="Build code generator tool"> |
| 25 |
- <java-to-jar srcdir="hamcrest-generator/src/main/java" |
| 26 |
- destjar="build/temp/hamcrest-generator-${version}-nodeps.jar" |
| 27 |
- classpath=" |
| 28 |
- lib/generator/qdox-1.6.1.jar; |
| 29 |
- "/> |
| 30 |
- <taskdef name="jarjar" |
| 31 |
- classname="com.tonicsystems.jarjar.JarJarTask" |
| 32 |
- classpath="lib/generator/jarjar-1.0rc3.jar"/> |
| 33 |
- <!-- Bundle QDox classes in hamcrest-generator.jar so user doesn't need to care |
| 34 |
- about it's existence. Uses JarJar to place classes under a different package |
| 35 |
- to prevent conflict. --> |
| 36 |
- <jarjar jarfile="build/hamcrest-generator-${version}.jar"> |
| 37 |
- <zipfileset src="build/temp/hamcrest-generator-${version}-nodeps.jar"/> |
| 38 |
- <zipfileset src="lib/generator/qdox-1.6.1.jar"/> |
| 39 |
- <rule pattern="com.thoughtworks.qdox.**" |
| 40 |
- result="org.hamcrest.generator.qdox.@1"/> |
| 41 |
- </jarjar> |
| 42 |
</target> |
| 43 |
|
| 44 |
<target name="core" |
| 45 |
depends="generator" |
| 46 |
description="Build core Hamcrest library"> |
| 47 |
- <java-to-jar srcdir="hamcrest-core/src/main/java" |
| 48 |
- destjar="build/hamcrest-core-${version}.jar"/> |
| 49 |
- <!-- Generate one class with all static imports --> |
| 50 |
- <mkdir dir="build/temp/hamcrest-core/generated-code"/> |
| 51 |
- <java classname="org.hamcrest.generator.config.XmlConfigurator" |
| 52 |
- fork="yes" |
| 53 |
- failonerror="yes" |
| 54 |
- classpath=" |
| 55 |
- build/hamcrest-core-${version}.jar; |
| 56 |
- build/hamcrest-generator-${version}.jar; |
| 57 |
- "> |
| 58 |
- <arg value="core-matchers.xml"/> |
| 59 |
- <arg value="hamcrest-core/src/main/java"/> |
| 60 |
- <arg value="org.hamcrest.CoreMatchers"/> |
| 61 |
- <arg value="build/temp/hamcrest-core/generated-code"/> |
| 62 |
- </java> |
| 63 |
- <!-- Append to core jar --> |
| 64 |
- <java-to-jar srcdir="build/temp/hamcrest-core/generated-code" |
| 65 |
- destjar="build/hamcrest-core-${version}.jar" |
| 66 |
- classpath="build/hamcrest-core-${version}.jar"/> |
| 67 |
</target> |
| 68 |
|
| 69 |
<target name="library" |
| 70 |
@@ -94,16 +57,16 @@ |
| 71 |
classpath="build/hamcrest-core-${version}.jar"/> |
| 72 |
</target> |
| 73 |
|
| 74 |
- <target name="text" |
| 75 |
- depends="core, library" |
| 76 |
- description="Build text pattern matcher"> |
| 77 |
- <java-to-jar srcdir="hamcrest-text/src/main/java" |
| 78 |
- destjar="build/hamcrest-text-${version}.jar" |
| 79 |
- classpath=" |
| 80 |
- build/hamcrest-core-${version}.jar; |
| 81 |
- build/hamcrest-library-${version}.jar"/> |
| 82 |
- </target> |
| 83 |
- |
| 84 |
+ <target name="text" |
| 85 |
+ depends="core, library" |
| 86 |
+ description="Build text pattern matcher"> |
| 87 |
+ <java-to-jar srcdir="hamcrest-text/src/main/java" |
| 88 |
+ destjar="build/hamcrest-text-${version}.jar" |
| 89 |
+ classpath=" |
| 90 |
+ build/hamcrest-core-${version}.jar; |
| 91 |
+ build/hamcrest-library-${version}.jar"/> |
| 92 |
+ </target> |
| 93 |
+ |
| 94 |
<target name="integration" |
| 95 |
depends="core, library" |
| 96 |
description="Build integration with external tools"> |
| 97 |
@@ -121,7 +84,7 @@ |
| 98 |
destjar="build/hamcrest-unit-test-${version}.jar" |
| 99 |
classpath=" |
| 100 |
build/hamcrest-core-${version}.jar; |
| 101 |
- build/hamcrest-library-${version}.jar; |
| 102 |
+ build/hamcrest-library-${version}.jar; |
| 103 |
build/hamcrest-text-${version}.jar; |
| 104 |
build/hamcrest-integration-${version}.jar; |
| 105 |
build/hamcrest-generator-${version}.jar"/> |
| 106 |
@@ -164,7 +127,7 @@ |
| 107 |
<jar jarfile="build/hamcrest-all-${version}.jar" duplicate="preserve"> |
| 108 |
<zipfileset src="build/hamcrest-core-${version}.jar"/> |
| 109 |
<zipfileset src="build/hamcrest-library-${version}.jar"/> |
| 110 |
- <zipfileset src="build/hamcrest-text-${version}.jar"/> |
| 111 |
+ <zipfileset src="build/hamcrest-text-${version}.jar"/> |
| 112 |
<zipfileset src="build/hamcrest-generator-${version}.jar"/> |
| 113 |
<zipfileset src="build/hamcrest-integration-${version}.jar"/> |
| 114 |
</jar> |
| 115 |
@@ -221,7 +184,7 @@ |
| 116 |
|
| 117 |
<packageset dir="hamcrest-core/src/main/java"/> |
| 118 |
<packageset dir="hamcrest-library/src/main/java" excludes="org/hamcrest/internal"/> |
| 119 |
- <packageset dir="hamcrest-text/src/main/java" excludes="**/internal/**"/> |
| 120 |
+ <packageset dir="hamcrest-text/src/main/java" excludes="**/internal/**"/> |
| 121 |
<packageset dir="hamcrest-integration/src/main/java"/> |
| 122 |
<packageset dir="build/generated-code"/> |
| 123 |
|
| 124 |
@@ -261,4 +224,4 @@ |
| 125 |
</sequential> |
| 126 |
</macrodef> |
| 127 |
|
| 128 |
-</project> |
| 129 |
+</project> |
Archives