From 926f193238ef2bb41e34eb1cbe65cd944994606a Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 27 Sep 2012 21:14:12 -0400
Subject: [PATCH] Exclude hamcrest from builds, change output folders
---
.classpath | 4 ++--
build.xml | 3 +++
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/.classpath b/.classpath
index d4bfd91..47505a6 100644
--- a/.classpath
+++ b/.classpath
@@ -2,7 +2,7 @@
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="resources"/>
- <classpathentry kind="src" path="tests"/>
+ <classpathentry kind="src" path="tests" output="bin/test-classes"/>
<classpathentry kind="lib" path="ext/jcommander-1.17.jar" sourcepath="ext/src/jcommander-1.17-sources.jar" />
<classpathentry kind="lib" path="ext/log4j-1.2.17.jar" sourcepath="ext/src/log4j-1.2.17-sources.jar" />
<classpathentry kind="lib" path="ext/slf4j-api-1.6.6.jar" sourcepath="ext/src/slf4j-api-1.6.6-sources.jar" />
@@ -34,6 +34,6 @@
<classpathentry kind="lib" path="ext/ivy-2.2.0.jar" sourcepath="ext/src/ivy-2.2.0-sources.jar" />
<classpathentry kind="lib" path="ext/junit-4.10.jar" sourcepath="ext/src/junit-4.10-sources.jar" />
<classpathentry kind="lib" path="ext/hamcrest-core-1.1.jar" />
- <classpathentry kind="output" path="bin"/>
+ <classpathentry kind="output" path="bin/classes"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
</classpath>
\ No newline at end of file
diff --git a/build.xml b/build.xml
index 5ea612a..6ad0e46 100644
--- a/build.xml
+++ b/build.xml
@@ -195,6 +195,7 @@
<copy todir="${project.deploy.dir}/ext">
<fileset dir="${basedir}/ext">
<exclude name="junit*.jar" />
+ <exclude name="hamcrest*.jar" />
<exclude name="commons-net*.jar" />
<exclude name="*-sources.jar" />
<exclude name="*-javadoc.jar" />
@@ -416,6 +417,7 @@
<exclude name="jcommander*.jar" />
<exclude name="jetty*.jar" />
<exclude name="junit*.jar" />
+ <exclude name="hamcrest*.jar" />
<exclude name="servlet*.jar" />
<exclude name="javax.servlet*.jar" />
</fileset>
@@ -555,6 +557,7 @@
<exclude name="jcommander*.jar" />
<exclude name="jetty*.jar" />
<exclude name="junit*.jar" />
+ <exclude name="hamcrest*.jar" />
<exclude name="servlet*.jar" />
<exclude name="javax.servlet*.jar" />
</fileset>
--
Gitblit v1.9.1