| 1 |
ercpe 14/02/28 17:34:39 |
| 2 |
|
| 3 |
Added: 1.1-build.xml.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-generator/files/1.1-build.xml.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/hamcrest-generator/files/1.1-build.xml.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/hamcrest-generator/files/1.1-build.xml.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: 1.1-build.xml.patch |
| 16 |
=================================================================== |
| 17 |
diff --git a/hamcrest-1.1/build.xml b/hamcrest-1.1/build.xml |
| 18 |
index f819d3d..18fba83 100644 |
| 19 |
--- a/hamcrest-1.1/build.xml |
| 20 |
+++ b/hamcrest-1.1/build.xml |
| 21 |
@@ -28,18 +28,6 @@ |
| 22 |
classpath=" |
| 23 |
lib/generator/qdox-1.6.1.jar; |
| 24 |
"/> |
| 25 |
- <taskdef name="jarjar" |
| 26 |
- classname="com.tonicsystems.jarjar.JarJarTask" |
| 27 |
- classpath="lib/generator/jarjar-1.0rc3.jar"/> |
| 28 |
- <!-- Bundle QDox classes in hamcrest-generator.jar so user doesn't need to care |
| 29 |
- about it's existence. Uses JarJar to place classes under a different package |
| 30 |
- to prevent conflict. --> |
| 31 |
- <jarjar jarfile="build/hamcrest-generator-${version}.jar"> |
| 32 |
- <zipfileset src="build/temp/hamcrest-generator-${version}-nodeps.jar"/> |
| 33 |
- <zipfileset src="lib/generator/qdox-1.6.1.jar"/> |
| 34 |
- <rule pattern="com.thoughtworks.qdox.**" |
| 35 |
- result="org.hamcrest.generator.qdox.@1"/> |
| 36 |
- </jarjar> |
| 37 |
</target> |
| 38 |
|
| 39 |
<target name="core" |
| 40 |
@@ -94,16 +82,16 @@ |
| 41 |
classpath="build/hamcrest-core-${version}.jar"/> |
| 42 |
</target> |
| 43 |
|
| 44 |
- <target name="text" |
| 45 |
- depends="core, library" |
| 46 |
- description="Build text pattern matcher"> |
| 47 |
- <java-to-jar srcdir="hamcrest-text/src/main/java" |
| 48 |
- destjar="build/hamcrest-text-${version}.jar" |
| 49 |
- classpath=" |
| 50 |
- build/hamcrest-core-${version}.jar; |
| 51 |
- build/hamcrest-library-${version}.jar"/> |
| 52 |
- </target> |
| 53 |
- |
| 54 |
+ <target name="text" |
| 55 |
+ depends="core, library" |
| 56 |
+ description="Build text pattern matcher"> |
| 57 |
+ <java-to-jar srcdir="hamcrest-text/src/main/java" |
| 58 |
+ destjar="build/hamcrest-text-${version}.jar" |
| 59 |
+ classpath=" |
| 60 |
+ build/hamcrest-core-${version}.jar; |
| 61 |
+ build/hamcrest-library-${version}.jar"/> |
| 62 |
+ </target> |
| 63 |
+ |
| 64 |
<target name="integration" |
| 65 |
depends="core, library" |
| 66 |
description="Build integration with external tools"> |
| 67 |
@@ -121,7 +109,7 @@ |
| 68 |
destjar="build/hamcrest-unit-test-${version}.jar" |
| 69 |
classpath=" |
| 70 |
build/hamcrest-core-${version}.jar; |
| 71 |
- build/hamcrest-library-${version}.jar; |
| 72 |
+ build/hamcrest-library-${version}.jar; |
| 73 |
build/hamcrest-text-${version}.jar; |
| 74 |
build/hamcrest-integration-${version}.jar; |
| 75 |
build/hamcrest-generator-${version}.jar"/> |
| 76 |
@@ -164,7 +152,7 @@ |
| 77 |
<jar jarfile="build/hamcrest-all-${version}.jar" duplicate="preserve"> |
| 78 |
<zipfileset src="build/hamcrest-core-${version}.jar"/> |
| 79 |
<zipfileset src="build/hamcrest-library-${version}.jar"/> |
| 80 |
- <zipfileset src="build/hamcrest-text-${version}.jar"/> |
| 81 |
+ <zipfileset src="build/hamcrest-text-${version}.jar"/> |
| 82 |
<zipfileset src="build/hamcrest-generator-${version}.jar"/> |
| 83 |
<zipfileset src="build/hamcrest-integration-${version}.jar"/> |
| 84 |
</jar> |
| 85 |
@@ -221,7 +209,7 @@ |
| 86 |
|
| 87 |
<packageset dir="hamcrest-core/src/main/java"/> |
| 88 |
<packageset dir="hamcrest-library/src/main/java" excludes="org/hamcrest/internal"/> |
| 89 |
- <packageset dir="hamcrest-text/src/main/java" excludes="**/internal/**"/> |
| 90 |
+ <packageset dir="hamcrest-text/src/main/java" excludes="**/internal/**"/> |
| 91 |
<packageset dir="hamcrest-integration/src/main/java"/> |
| 92 |
<packageset dir="build/generated-code"/> |
| 93 |
|
| 94 |
@@ -251,14 +239,10 @@ |
| 95 |
</classpath> |
| 96 |
</javac> |
| 97 |
<copy file="LICENSE.txt" todir="build/temp/@{destjar}.contents"/> |
| 98 |
- <!-- Put Java source in Jars for user's convenience. --> |
| 99 |
- <copy todir="build/temp/@{destjar}.contents"> |
| 100 |
- <fileset dir="@{srcdir}"/> |
| 101 |
- </copy> |
| 102 |
<jar jarfile="@{destjar}"> |
| 103 |
<fileset dir="build/temp/@{destjar}.contents"/> |
| 104 |
</jar> |
| 105 |
</sequential> |
| 106 |
</macrodef> |
| 107 |
|
| 108 |
-</project> |
| 109 |
+</project> |
Archives