summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiroslav Šulc <fordfrog@gentoo.org>2020-10-19 09:10:01 +0200
committerMiroslav Šulc <fordfrog@gentoo.org>2020-10-19 09:10:10 +0200
commitbddc05cdddf8f7619988be67b1c762aeb60522f0 (patch)
tree4669131546b0bb421cb2e873305402166af156bc /dev-java/hamcrest-generator/files
parentdev-java/hamcrest-generator: increased min java version to 1.8 (diff)
downloadgentoo-bddc05cdddf8f7619988be67b1c762aeb60522f0.tar.gz
gentoo-bddc05cdddf8f7619988be67b1c762aeb60522f0.tar.bz2
gentoo-bddc05cdddf8f7619988be67b1c762aeb60522f0.zip
dev-java/hamcrest-generator: removed old 1.1
Package-Manager: Portage-3.0.8, Repoman-3.0.2 Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
Diffstat (limited to 'dev-java/hamcrest-generator/files')
-rw-r--r--dev-java/hamcrest-generator/files/1.1-build.xml.patch93
1 files changed, 0 insertions, 93 deletions
diff --git a/dev-java/hamcrest-generator/files/1.1-build.xml.patch b/dev-java/hamcrest-generator/files/1.1-build.xml.patch
deleted file mode 100644
index c8f087ba8f12..000000000000
--- a/dev-java/hamcrest-generator/files/1.1-build.xml.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-diff --git a/hamcrest-1.1/build.xml b/hamcrest-1.1/build.xml
-index f819d3d..18fba83 100644
---- a/hamcrest-1.1/build.xml
-+++ b/hamcrest-1.1/build.xml
-@@ -28,18 +28,6 @@
- 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"
-@@ -94,16 +82,16 @@
- 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 +109,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 +152,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 +209,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"/>
-
-@@ -251,14 +239,10 @@
- </classpath>
- </javac>
- <copy file="LICENSE.txt" todir="build/temp/@{destjar}.contents"/>
-- <!-- Put Java source in Jars for user's convenience. -->
-- <copy todir="build/temp/@{destjar}.contents">
-- <fileset dir="@{srcdir}"/>
-- </copy>
- <jar jarfile="@{destjar}">
- <fileset dir="build/temp/@{destjar}.contents"/>
- </jar>
- </sequential>
- </macrodef>
-
--</project>
-+</project>