mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-10-28 15:47:15 -07:00
Robin H. Johnson
56bd759df1
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
81 lines
3.7 KiB
Diff
81 lines
3.7 KiB
Diff
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"
|