AfflictionNetworks/samskivert
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't build our Ant task unless ant.jar is available, only skip building

Browse Source 
MailUtil if the mail stuff is unavailable the rest of the net package is fine.


git-svn-id: https://samskivert.googlecode.com/svn/trunk@2082 6335cc39-0255-0410-8fd6-9bcaacd3b74c
This commit is contained in:
mdb
2007-04-04 18:31:50 +00:00
parent 3bb6abd2ad
commit c8656f29fb
2 changed files with 24 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build.xml
+2 -1
View File
@@ -63,7 +63,8 @@
<exclude name="com/samskivert/io/**" unless="build.io"/> <exclude name="com/samskivert/io/**" unless="build.io"/>
<exclude name="com/samskivert/jdbc/**" unless="build.jdbc"/> <exclude name="com/samskivert/jdbc/**" unless="build.jdbc"/>
<exclude name="com/samskivert/jdbc/depot/**" unless="build.depot"/> <exclude name="com/samskivert/jdbc/depot/**" unless="build.depot"/>
<exclude name="com/samskivert/net/**" unless="build.net"/> <exclude name="com/samskivert/jdbc/depot/tools/**" unless="build.depot.tools"/>
<exclude name="com/samskivert/net/MailUtil*" unless="build.mail"/>
<exclude name="com/samskivert/servlet/**" unless="build.servlet"/> <exclude name="com/samskivert/servlet/**" unless="build.servlet"/>
<exclude name="com/samskivert/swing/**" unless="build.swing"/> <exclude name="com/samskivert/swing/**" unless="build.swing"/>
<exclude name="com/samskivert/test/**" unless="build.test"/> <exclude name="com/samskivert/test/**" unless="build.test"/>
depends-incl.xml
+22 -10
View File
@@ -16,19 +16,19 @@
<echo level="info">------------------------------------------</echo> <echo level="info">------------------------------------------</echo>
<echo level="info">Standard extensions - http://java.sun.com/</echo> <echo level="info">Standard extensions - http://java.sun.com/</echo>
<echo level="info">------------------------------------------</echo> <echo level="info">------------------------------------------</echo>
<available property="servlet2.3.present" <available property="servlet2.3.present" classpathref="classpath"
classname="javax.servlet.Servlet" classpathref="classpath"/> classname="javax.servlet.Servlet"/>
<echo level="info">Servlet 2.3: ${servlet2.3.present}</echo> <echo level="info">Servlet 2.3: ${servlet2.3.present}</echo>
<available property="mail.present" <available property="mail.present" classpathref="classpath"
classname="javax.mail.Transport" classpathref="classpath"/> classname="javax.mail.Transport"/>
<echo level="info">Java Mail: ${mail.present}</echo> <echo level="info">Java Mail: ${mail.present}</echo>
<available property="sax.present" <available property="sax.present" classpathref="classpath"
classname="org.xml.sax.SAXException" classpathref="classpath"/> classname="org.xml.sax.SAXException"/>
<echo level="info">SAX: ${sax.present}</echo> <echo level="info">SAX: ${sax.present}</echo>
<available property="jaxp.present" <available property="jaxp.present" classpathref="classpath"
classname="javax.xml.parsers.SAXParser" classpathref="classpath"/> classname="javax.xml.parsers.SAXParser"/>
<echo level="info">JAXP: ${jaxp.present}</echo> <echo level="info">JAXP: ${jaxp.present}</echo>
<echo level="info"></echo> <echo level="info"></echo>
@@ -59,6 +59,10 @@
<echo level="info">---------------</echo> <echo level="info">---------------</echo>
<echo level="info">Other libraries</echo> <echo level="info">Other libraries</echo>
<echo level="info">---------------</echo> <echo level="info">---------------</echo>
<available property="ant.present" classpathref="classpath" ignoresystemclasses="true"
classname="org.apache.tools.ant.Task"/>
<echo level="info">Ant: ${ant.present}</echo>
<available property="ehcache.present" classpathref="classpath" <available property="ehcache.present" classpathref="classpath"
classname="net.sf.ehcache.Element"/> classname="net.sf.ehcache.Element"/>
<echo level="info">EH Cache: ${ehcache.present}</echo> <echo level="info">EH Cache: ${ehcache.present}</echo>
@@ -96,13 +100,21 @@
</condition> </condition>
<echo>com.samskivert.jdbc.depot: ${build.depot}</echo> <echo>com.samskivert.jdbc.depot: ${build.depot}</echo>
<condition property="build.net"> <condition property="build.depot.tools">
<and>
<isset property="build.depot"/>
<isset property="ant.present"/>
</and>
</condition>
<echo>com.samskivert.jdbc.depot.tools: ${build.depot.tools}</echo>
<condition property="build.mail">
<and> <and>
<isset property="build.io"/> <isset property="build.io"/>
<isset property="mail.present"/> <isset property="mail.present"/>
</and> </and>
</condition> </condition>
<echo>com.samskivert.net: ${build.net}</echo> <echo>com.samskivert.net.MailUtil: ${build.mail}</echo>
<condition property="build.servlet"> <condition property="build.servlet">
<and> <and>