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

No more JAVA_LIBS; added requirement for commons-logging which is now

Browse Source 
needed by commons-digester.


git-svn-id: https://samskivert.googlecode.com/svn/trunk@1528 6335cc39-0255-0410-8fd6-9bcaacd3b74c
This commit is contained in:
mdb
2004-11-17 23:11:21 +00:00
parent b2de8370a1
commit 2618f83f52
1 changed files with 8 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/samskivert/build.xml
+8 -18
View File
@@ -9,9 +9,6 @@
<property name="doc.overview" value="com/samskivert/overview.html"/> <property name="doc.overview" value="com/samskivert/overview.html"/>
<property name="copyright.holder" value="Michael Bayne"/> <property name="copyright.holder" value="Michael Bayne"/>
<!-- we want to access the environment -->
<property environment="env"/>
<!-- things you probably don't want to change --> <!-- things you probably don't want to change -->
<property name="src.dir" value="src/java"/> <property name="src.dir" value="src/java"/>
<property name="deploy.dir" value="dist"/> <property name="deploy.dir" value="dist"/>
@@ -20,26 +17,13 @@
<property name="savedoc.dir" value="docs"/> <property name="savedoc.dir" value="docs"/>
<!-- declare our classpath business --> <!-- declare our classpath business -->
<path id="base.classpath"> <path id="classpath">
<pathelement location="${deploy.dir}/classes"/> <pathelement location="${deploy.dir}/classes"/>
<fileset dir="lib" includes="**/*.jar"/> <fileset dir="lib" includes="**/*.jar"/>
</path> </path>
<path id="classpath">
<path refid="base.classpath"/>
</path>
<!-- include JAVA_LIBS jars in our classpath if it exists -->
<target name="check-java-libs" if="env.JAVA_LIBS">
<!-- overwrite the classpath with one that contains JAVA_LIBS jars -->
<echo message="Building using libraries from ${env.JAVA_LIBS}."/>
<path id="classpath">
<path refid="base.classpath"/>
<fileset dir="${env.JAVA_LIBS}" includes="**/*.jar"/>
</path>
</target>
<!-- checks to see which packages are available --> <!-- checks to see which packages are available -->
<target name="check-available" depends="check-java-libs"> <target name="check-available">
<echo message="The packages required for building are listed below."/> <echo message="The packages required for building are listed below."/>
<echo message="A package followed by 'true' indicates that the package"/> <echo message="A package followed by 'true' indicates that the package"/>
<echo message="is present. One followed by '${package.present}' indicates"/> <echo message="is present. One followed by '${package.present}' indicates"/>
@@ -75,6 +59,11 @@
classpathref="classpath"/> classpathref="classpath"/>
<echo message="Commons Collections: ${jakarta.commons-collections.present}"/> <echo message="Commons Collections: ${jakarta.commons-collections.present}"/>
<available property="jakarta.commons-logging.present"
classname="org.apache.commons.logging.Log"
classpathref="classpath"/>
<echo message="Commons Logging: ${jakarta.commons-logging.present}"/>
<available property="jakarta.commons-digester.present" <available property="jakarta.commons-digester.present"
classname="org.apache.commons.digester.Digester" classname="org.apache.commons.digester.Digester"
classpathref="classpath"/> classpathref="classpath"/>
@@ -149,6 +138,7 @@
<and> <and>
<isset property="build.io"/> <isset property="build.io"/>
<isset property="build.util"/> <isset property="build.util"/>
<isset property="jakarta.commons-logging.present"/>
<isset property="jakarta.commons-digester.present"/> <isset property="jakarta.commons-digester.present"/>
<isset property="jaxp.present"/> <isset property="jaxp.present"/>
<isset property="sax.present"/> <isset property="sax.present"/>