adammurdoch 2003/06/28 05:02:20 Modified: vfs build.xml gump.xml Log: - Changed build.xml to exclude any providers whose dependencies aren't available. - Changed gump.xml to make provider dependencies optional. Revision Changes Path 1.16 +35 -22 jakarta-commons-sandbox/vfs/build.xml Index: build.xml =================================================================== RCS file: /home/cvs/jakarta-commons-sandbox/vfs/build.xml,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- build.xml 17 Mar 2003 09:06:20 -0000 1.15 +++ build.xml 28 Jun 2003 12:02:20 -0000 1.16 @@ -31,6 +31,30 @@ </condition> </target> <target name="compile" description="o Compile the code" depends="get-deps"> + + <path id="classpath"> + <fileset dir="${libdir}"> + <include name="*.jar"> + </include> + </fileset> + </path> + + <condition property="commons-httpclient.avail"> + <available classname="org.apache.commons.httpclient.HttpClient" classpathref="classpath" /> + </condition> + <condition property="commons-net.avail"> + <available classname="org.apache.commons.net.ftp.FTPClient" classpathref="classpath"/> + </condition> + <condition property="slide.avail"> + <available classname="org.apache.webdav.lib.WebdavResource" classpathref="classpath"/> + </condition> + <condition property="jcifs.avail"> + <available classname="jcifs.smb.SmbFile" classpathref="classpath"/> + </condition> + <condition property="jsch.avail"> + <available classname="com.jcraft.jsch.ChannelSftp" classpathref="classpath"/> + </condition> + <mkdir dir="${classesdir}"> </mkdir> <javac destdir="${classesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html"> @@ -38,12 +62,13 @@ <pathelement location="src/java"> </pathelement> </src> - <classpath> - <fileset dir="${libdir}"> - <include name="*.jar"> - </include> - </fileset> - </classpath> + <exclude name="**/provider/ftp/**" unless="commons-net.avail" /> + <exclude name="**/provider/http/**" unless="commons-httpclient.avail" /> + <exclude name="**/provider/webdav/**" unless="commons-httpclient.avail" /> + <exclude name="**/provider/webdav/**" unless="slide.avail" /> + <exclude name="**/provider/smb/**" unless="jcifs.avail" /> + <exclude name="**/provider/sftp/**" unless="jsch.avail" /> + <classpath refid="classpath"/> </javac> <copy todir="${classesdir}"> <fileset dir="src/java"> @@ -159,27 +184,15 @@ </get> <get dest="${libdir}/commons-logging-1.0.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-logging/jars/commons-logging-1.0.jar"> </get> - <get dest="${libdir}/jcifs-0.7.0b5.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/jcifs/jars/jcifs-0.7.0b5.jar"> + <get dest="${libdir}/jcifs-0.7.8.jar" usetimestamp="true" ignoreerrors="true" src="file://${basedir}/lib/jcifs/jars/jcifs-0.7.8.jar"> </get> <get dest="${libdir}/webdavlib-20030224.jar" usetimestamp="true" ignoreerrors="true" src="file://${basedir}/lib/slide/jars/webdavlib-20030224.jar"> </get> - <get dest="${libdir}/commons-httpclient-2.0-alpha2.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-httpclient/jars/commons-httpclient-2.0-alpha2.jar"> - </get> - <get dest="${libdir}/jsch-0.1.2.jar" usetimestamp="true" ignoreerrors="true" src="file://${basedir}/lib/jsch/jars/jsch-0.1.2.jar"> - </get> - <get dest="${libdir}/xml-apis-2.0.0.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/xml-apis/jars/xml-apis-2.0.0.jar"> - </get> - <get dest="${libdir}/junit-3.8.1.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/junit/jars/junit-3.8.1.jar"> - </get> - <get dest="${libdir}/ant-1.5.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/ant/jars/ant-1.5.jar"> + <get dest="${libdir}/commons-httpclient-2.0-beta1.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-httpclient/jars/commons-httpclient-2.0-beta1.jar"> </get> - <get dest="${libdir}/ant-optional-1.5.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/ant/jars/ant-optional-1.5.jar"> + <get dest="${libdir}/jsch-0.1.5.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/jsch/jars/jsch-0.1.5.jar"> </get> - </target> - <target name="install-maven"> - <get dest="${user.home}/maven-install-latest.jar" usetimestamp="true" src="${maven.repo.remote}/maven/maven-install-latest.jar"> + <get dest="${libdir}/xml-apis-1.0.b2.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/xml-apis/jars/xml-apis-1.0.b2.jar"> </get> - <unjar dest="${maven.home}" src="${user.home}/maven-install-latest.jar"> - </unjar> </target> </project> 1.8 +25 -40 jakarta-commons-sandbox/vfs/gump.xml Index: gump.xml =================================================================== RCS file: /home/cvs/jakarta-commons-sandbox/vfs/gump.xml,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- gump.xml 20 Feb 2003 07:32:02 -0000 1.7 +++ gump.xml 28 Jun 2003 12:02:20 -0000 1.8 @@ -1,44 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> <module name="commons-vfs"> - <description>Commons VFS</description> - <url href="http://jakarta.apache.org/commons/sandbox/vfs/"> - </url> - <cvs module="jakarta-commons-sandbox/vfs" repository="jakarta"> - </cvs> - <project name="commons-vfs"> - <ant buildfile="build.xml" target="dist"> - <property name="final.name" value="commons-vfs-@@DATE@@"> - </property> - </ant> - <package>org.apache.commons.vfs</package> - <depend project="ant"> - </depend> - <depend project="commons-httpclient"> - </depend> - <depend project="commons-logging"> - </depend> - <depend project="commons-net"> - </depend> - <depend project="jakarta-slide" ids="client-webdavlib"> - </depend> - <depend project="jcifs"> - </depend> - <depend project="jsch"> - </depend> - <depend project="junit"> - </depend> - <depend project="xml-xerces"> - </depend> - <work nested="target/classes"> - </work> - <home nested="target"> - </home> - <jar name="commons-vfs-@@DATE@@.jar"> - </jar> - <javadoc module="jakarta-commons-sandbox" nested="target/docs/apidocs"> - </javadoc> - <nag to="[EMAIL PROTECTED]" from="commons-vfs development <[EMAIL PROTECTED]>"> - </nag> - </project> + <description>Commons VFS</description> + <url href="http://jakarta.apache.org/commons/sandbox/vfs/"/> + <cvs module="jakarta-commons-sandbox/vfs" repository="jakarta"/> + <project name="commons-vfs"> + <ant buildfile="build.xml" target="dist"> + <property name="final.name" value="commons-vfs-@@DATE@@"/> + </ant> + <package>org.apache.commons.vfs</package> + <depend project="ant"/> + <depend project="junit"/> + <depend project="xml-xerces"/> + <depend project="commons-logging"/> + + <option project="commons-httpclient"/> + <option project="commons-net"/> + <option project="jakarta-slide" ids="client-webdavlib"/> + <option project="jcifs"/> + <option project="jsch"/> + + <work nested="target/classes"/> + <home nested="target"/> + <jar name="commons-vfs-@@DATE@@.jar"/> + <javadoc module="jakarta-commons-sandbox" nested="target/docs/apidocs"/> + <nag to="[EMAIL PROTECTED]" from="commons-vfs development <[EMAIL PROTECTED]>"/> + </project> </module>
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]