summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /dev-java/hamcrest-integration/files
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'dev-java/hamcrest-integration/files')
-rw-r--r--dev-java/hamcrest-integration/files/1.1-remove-targets.patch135
-rw-r--r--dev-java/hamcrest-integration/files/1.2-remove-targets.patch80
-rw-r--r--dev-java/hamcrest-integration/files/1.3-remove-targets.patch74
3 files changed, 289 insertions, 0 deletions
diff --git a/dev-java/hamcrest-integration/files/1.1-remove-targets.patch b/dev-java/hamcrest-integration/files/1.1-remove-targets.patch
new file mode 100644
index 000000000000..384709aec667
--- /dev/null
+++ b/dev-java/hamcrest-integration/files/1.1-remove-targets.patch
@@ -0,0 +1,135 @@
+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>
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"
diff --git a/dev-java/hamcrest-integration/files/1.3-remove-targets.patch b/dev-java/hamcrest-integration/files/1.3-remove-targets.patch
new file mode 100644
index 000000000000..e534eddfb750
--- /dev/null
+++ b/dev-java/hamcrest-integration/files/1.3-remove-targets.patch
@@ -0,0 +1,74 @@
+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">