Don't build tests unless we have JUnit, don't build FileUtil unless we have

commons-io (I should probably move that into com.samskivert.io but there are
various dependers that I don't feel like breaking).


git-svn-id: https://samskivert.googlecode.com/svn/trunk@2301 6335cc39-0255-0410-8fd6-9bcaacd3b74c
This commit is contained in:
mdb
2008-05-07 06:39:09 +00:00
parent 77378ac880
commit 8f7d134526
2 changed files with 30 additions and 8 deletions
+4
View File
@@ -68,8 +68,10 @@
<exclude name="com/samskivert/swing/**" unless="build.swing"/>
<exclude name="com/samskivert/test/**" unless="build.test"/>
<exclude name="com/samskivert/util/**" unless="build.util"/>
<exclude name="com/samskivert/util/FileUtil*" unless="build.fileutil"/>
<exclude name="com/samskivert/velocity/**" unless="build.velocity"/>
<exclude name="com/samskivert/xml/**" unless="build.xml"/>
<exclude name="com/samskivert/**/tests/**" unless="build.tests"/>
<compilerarg value="-Xlint"/>
<compilerarg value="-Xlint:-serial"/>
</javac>
@@ -92,8 +94,10 @@
<exclude name="com/samskivert/swing/**" unless="build.swing"/>
<exclude name="com/samskivert/test/**" unless="build.test"/>
<exclude name="com/samskivert/util/**" unless="build.util"/>
<exclude name="com/samskivert/util/FileUtil*" unless="build.fileutil"/>
<exclude name="com/samskivert/velocity/**" unless="build.velocity"/>
<exclude name="com/samskivert/xml/**" unless="build.xml"/>
<exclude name="com/samskivert/**/tests/**" unless="build.tests"/>
</packageset>
<bottom>Copyright &#169; 2000-${year} ${copyright.holder}.
All Rights Reserved.</bottom>
+26 -8
View File
@@ -66,6 +66,10 @@
<available property="ehcache.present" classpathref="classpath"
classname="net.sf.ehcache.Element"/>
<echo level="info">EH Cache: ${ehcache.present}</echo>
<available property="junit.present" classpathref="classpath"
classname="junit.framework.Test"/>
<echo level="info">JUnit: ${junit.present}</echo>
</target>
<!-- combines package availability into build controls -->
@@ -108,14 +112,6 @@
</condition>
<echo level="info">com.samskivert.jdbc.depot.tools: ${build.depot.tools}</echo>
<condition property="build.mail">
<and>
<isset property="build.io"/>
<isset property="mail.present"/>
</and>
</condition>
<echo level="info">com.samskivert.net.MailUtil: ${build.mail}</echo>
<condition property="build.servlet">
<and>
<isset property="build.io"/>
@@ -156,6 +152,28 @@
</and>
</condition>
<echo level="info">com.samskivert.xml: ${build.xml}</echo>
<condition property="build.tests">
<and>
<isset property="junit.present"/>
</and>
</condition>
<echo level="info">com.samskivert.*.tests: ${build.tests}</echo>
<condition property="build.fileutil">
<and>
<isset property="jakarta.commons-io.present"/>
</and>
</condition>
<echo level="info">com.samskivert.util.FileUtil: ${build.fileutil}</echo>
<condition property="build.mail">
<and>
<isset property="build.io"/>
<isset property="mail.present"/>
</and>
</condition>
<echo level="info">com.samskivert.net.MailUtil: ${build.mail}</echo>
</target>
</project>