+++ /dev/null
-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 @@
- \r
- <target name="generator"\r
- description="Build code generator tool">\r
-- <java-to-jar srcdir="hamcrest-generator/src/main/java"\r
-- destjar="build/temp/hamcrest-generator-${version}-nodeps.jar"\r
-- classpath="\r
-- lib/generator/qdox-1.6.1.jar;\r
-- "/>\r
-- <taskdef name="jarjar"\r
-- classname="com.tonicsystems.jarjar.JarJarTask"\r
-- classpath="lib/generator/jarjar-1.0rc3.jar"/>\r
-- <!-- Bundle QDox classes in hamcrest-generator.jar so user doesn't need to care\r
-- about it's existence. Uses JarJar to place classes under a different package\r
-- to prevent conflict. -->\r
-- <jarjar jarfile="build/hamcrest-generator-${version}.jar">\r
-- <zipfileset src="build/temp/hamcrest-generator-${version}-nodeps.jar"/>\r
-- <zipfileset src="lib/generator/qdox-1.6.1.jar"/>\r
-- <rule pattern="com.thoughtworks.qdox.**"\r
-- result="org.hamcrest.generator.qdox.@1"/>\r
-- </jarjar>\r
- </target>\r
- \r
- <target name="core"\r
- depends="generator"\r
- description="Build core Hamcrest library">\r
-- <java-to-jar srcdir="hamcrest-core/src/main/java"\r
-- destjar="build/hamcrest-core-${version}.jar"/>\r
-- <!-- Generate one class with all static imports -->\r
-- <mkdir dir="build/temp/hamcrest-core/generated-code"/>\r
-- <java classname="org.hamcrest.generator.config.XmlConfigurator"\r
-- fork="yes"\r
-- failonerror="yes"\r
-- classpath="\r
-- build/hamcrest-core-${version}.jar;\r
-- build/hamcrest-generator-${version}.jar;\r
-- ">\r
-- <arg value="core-matchers.xml"/>\r
-- <arg value="hamcrest-core/src/main/java"/>\r
-- <arg value="org.hamcrest.CoreMatchers"/>\r
-- <arg value="build/temp/hamcrest-core/generated-code"/>\r
-- </java>\r
-- <!-- Append to core jar -->\r
-- <java-to-jar srcdir="build/temp/hamcrest-core/generated-code"\r
-- destjar="build/hamcrest-core-${version}.jar"\r
-- classpath="build/hamcrest-core-${version}.jar"/>\r
- </target>\r
- \r
- <target name="library"\r
- depends="core,generator"\r
- description="Build library of matchers">\r
-- <java-to-jar srcdir="hamcrest-library/src/main/java"\r
-- destjar="build/hamcrest-library-${version}.jar"\r
-- classpath="build/hamcrest-core-${version}.jar"/>\r
-- <!-- Generate one class with all static imports -->\r
-- <mkdir dir="build/temp/hamcrest-library/generated-code"/>\r
-- <java classname="org.hamcrest.generator.config.XmlConfigurator"\r
-- fork="yes"\r
-- failonerror="yes"\r
-- classpath="\r
-- build/hamcrest-core-${version}.jar;\r
-- build/hamcrest-generator-${version}.jar;\r
-- build/hamcrest-library-${version}.jar;\r
-- ">\r
-- <arg value="matchers.xml"/>\r
-- <arg value="hamcrest-core/src/main/java,hamcrest-library/src/main/java"/>\r
-- <arg value="org.hamcrest.Matchers"/>\r
-- <arg value="build/temp/hamcrest-library/generated-code"/>\r
-- </java>\r
-- <!-- Append to library jar -->\r
-- <java-to-jar srcdir="build/temp/hamcrest-library/generated-code"\r
-- destjar="build/hamcrest-library-${version}.jar"\r
-- classpath="build/hamcrest-core-${version}.jar"/>\r
- </target>\r
- \r
-- <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"\r
-+ depends="core, library"\r
-+ description="Build text pattern matcher">\r
-+ <java-to-jar srcdir="hamcrest-text/src/main/java"\r
-+ destjar="build/hamcrest-text-${version}.jar"\r
-+ classpath="\r
-+ build/hamcrest-core-${version}.jar;\r
-+ build/hamcrest-library-${version}.jar"/>\r
-+ </target>\r
-+ \r
- <target name="integration"\r
- depends="core, library"\r
- description="Build integration with external tools">\r
-@@ -121,7 +62,7 @@
- destjar="build/hamcrest-unit-test-${version}.jar"\r
- classpath="\r
- build/hamcrest-core-${version}.jar;\r
-- build/hamcrest-library-${version}.jar;
-+ build/hamcrest-library-${version}.jar;\r
- build/hamcrest-text-${version}.jar;\r
- build/hamcrest-integration-${version}.jar;\r
- build/hamcrest-generator-${version}.jar"/>\r
-@@ -164,7 +105,7 @@
- <jar jarfile="build/hamcrest-all-${version}.jar" duplicate="preserve">\r
- <zipfileset src="build/hamcrest-core-${version}.jar"/>\r
- <zipfileset src="build/hamcrest-library-${version}.jar"/>\r
-- <zipfileset src="build/hamcrest-text-${version}.jar"/>
-+ <zipfileset src="build/hamcrest-text-${version}.jar"/>\r
- <zipfileset src="build/hamcrest-generator-${version}.jar"/>\r
- <zipfileset src="build/hamcrest-integration-${version}.jar"/>\r
- </jar>\r
-@@ -221,7 +162,7 @@
- \r
- <packageset dir="hamcrest-core/src/main/java"/>\r
- <packageset dir="hamcrest-library/src/main/java" excludes="org/hamcrest/internal"/>\r
-- <packageset dir="hamcrest-text/src/main/java" excludes="**/internal/**"/>
-+ <packageset dir="hamcrest-text/src/main/java" excludes="**/internal/**"/>\r
- <packageset dir="hamcrest-integration/src/main/java"/>\r
- <packageset dir="build/generated-code"/>\r
- \r
-@@ -261,4 +202,4 @@
- </sequential>\r
- </macrodef>\r
- \r
--</project>
-+</project>\r
+++ /dev/null
-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"