diff options
Diffstat (limited to 'dev-java/hamcrest-integration/files/1.2-remove-targets.patch')
| -rw-r--r-- | dev-java/hamcrest-integration/files/1.2-remove-targets.patch | 80 |
1 files changed, 80 insertions, 0 deletions
diff --git a/dev-java/hamcrest-integration/files/1.2-remove-targets.patch b/dev-java/hamcrest-integration/files/1.2-remove-targets.patch new file mode 100644 index 000000000000..794fe7463251 --- /dev/null +++ b/dev-java/hamcrest-integration/files/1.2-remove-targets.patch @@ -0,0 +1,80 @@ +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" |