Author: fhanik
Date: Thu May 4 11:53:28 2006
New Revision: 399819
URL: http://svn.apache.org/viewcvs?rev=399819&view=rev
Log:
downloading dependencies on build, more appropriate and more flexible
Added:
tomcat/container/tc5.5.x/modules/groupcom/build/build.properties.default
Removed:
tomcat/container/tc5.5.x/modules/groupcom/build/commons-logging-api.jar
Modified:
tomcat/container/tc5.5.x/modules/groupcom/build/build.xml
Added: tomcat/container/tc5.5.x/modules/groupcom/build/build.properties.default
URL:
http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/build/build.properties.default?rev=399819&view=auto
==============================================================================
--- tomcat/container/tc5.5.x/modules/groupcom/build/build.properties.default
(added)
+++ tomcat/container/tc5.5.x/modules/groupcom/build/build.properties.default
Thu May 4 11:53:28 2006
@@ -0,0 +1,19 @@
+base.path=build/temp
+lib.path=build/lib
+
+base-sf.loc=http://switch.dl.sourceforge.net/sourceforge
+base-jakarta.loc=http://archive.apache.org/dist/jakarta
+base-logging.loc=http://archive.apache.org/dist/logging
+
+# ----- Commons Logging, version 1.0.1 or later -----
+commons-logging.home=${lib.path}/commons-logging-1.0.4
+commons-logging.lib=${commons-logging.home}
+commons-logging-api.jar=${commons-logging.lib}/commons-logging-api.jar
+commons-logging.jar=${commons-logging.lib}/commons-logging.jar
+commons-logging.loc=${base-jakarta.loc}/commons/logging/binaries/commons-logging-1.0.4.tar.gz
+
+# ----- JUnit Unit Test Suite, version 3.7 or later -----
+junit.home=${lib.path}/junit3.8.1
+junit.lib=${junit.home}
+junit.jar=${junit.lib}/junit.jar
+junit.loc=${base-sf.loc}/junit/junit3.8.1.zip
Modified: tomcat/container/tc5.5.x/modules/groupcom/build/build.xml
URL:
http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/modules/groupcom/build/build.xml?rev=399819&r1=399818&r2=399819&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/modules/groupcom/build/build.xml (original)
+++ tomcat/container/tc5.5.x/modules/groupcom/build/build.xml Thu May 4
11:53:28 2006
@@ -1,12 +1,12 @@
<project name="Tribes" default="dist" basedir="..">
- <!--Independent build script for Tribes, to not require the entire Tomcat
tree to build
+ <property file="${user.home}/build.properties"/>
+ <property file="build/build.properties"/>
+ <property file="build/build.properties.default"/>
+
+ <!--Independent build script for Tribes, to not require the entire Tomcat
tree to build
this module-->
- <path id="tribes.classpath">
- <pathelement location="${basedir}/build/commons-logging-api.jar"/>
- </path>
-
<path id="java.sourcepath">
<pathelement location="${basedir}/src/share"/>
<pathelement location="${basedir}/test"/>
@@ -23,28 +23,68 @@
<property name="compile.path" value="${temp.path}/classes"/>
<property name="docs.path" value="${temp.path}/docs"/>
<property name="javadoc.path" value="${temp.path}/javadoc"/>
+ <property name="download.path" value="${base.path}"/>
<path id="tribes.classpath">
- <pathelement location="${basedir}/build/commons-logging-api.jar"/>
<!--
+ <pathelement location="${basedir}/build/commons-logging-api.jar"/>
<pathelement location="${basedir}/build/commons-logging.jar"/>
-->
+ <pathelement location="${junit.jar}"/>
+ <pathelement location="${commons-logging.jar}"/>
+ <pathelement location="${commons-logging-api.jar}"/>
+
</path>
+
+ <!--Borrowed from the tomcat build script to download dependencies-->
+ <target name="testexist">
+ <echo message="Testing for ${destfile}"/>
+ <available file="${destfile}" property="exist"/>
+ </target>
+ <target name="downloadzip" unless="exist" depends="testexist">
+ <!-- Download and extract the package -->
+ <get src="${sourcefile}" dest="${download.path}/file.zip" />
+ <mkdir dir="${download.path}" />
+ <unzip src="${download.path}/file.zip" dest="${lib.path}"/>
+ <delete file="${download.path}/file.zip"/>
+ </target>
+
+ <target name="downloadgz" unless="exist" depends="testexist">
+ <!-- Download and extract the package -->
+ <get src="${sourcefile}" dest="${download.path}/file.tar.gz" />
+ <gunzip src="${download.path}/file.tar.gz"
dest="${download.path}/file.tar"/>
+ <untar src="${download.path}/file.tar" dest="${lib.path}"/>
+ <delete file="${download.path}/file.tar"/>
+ <delete file="${download.path}/file.tar.gz"/>
+ </target>
<target name="clean">
<delete dir="${dist.path}"/>
<delete dir="${temp.path}"/>
</target>
+ <target name="dependencies" depends="clean">
+ <antcall target="downloadzip">
+ <param name="sourcefile" value="${junit.loc}"/>
+ <param name="destfile" value="${junit.jar}"/>
+ </antcall>
+ <antcall target="downloadgz">
+ <param name="sourcefile" value="${commons-logging.loc}"/>
+ <param name="destfile" value="${commons-logging.jar}"/>
+ </antcall>
+ </target>
+
<target name="init" depends="clean">
<mkdir dir="${dist.path}"/>
<mkdir dir="${compile.path}"/>
<mkdir dir="${docs.path}"/>
<mkdir dir="${javadoc.path}"/>
+ <mkdir dir="${download.path}"/>
+ <mkdir dir="${lib.path}"/>
</target>
- <target name="compile" depends="init">
+ <target name="compile" depends="init,dependencies">
<javac debug="true"
deprecation="true"
destdir="${compile.path}"
@@ -74,7 +114,6 @@
<target name="javadoc">
<javadoc packagenames="org.apache.catalina.*"
- classpathref="tribes.classpath"
sourcepathref="java.sourcepath"
destdir="${javadoc.path}"
author="true"
@@ -82,8 +121,9 @@
windowtitle="Tribes API Documentation"
doctitle="Tribes API"
bottom="Copyright © 2000-2006 Apache Software Foundation. All
Rights Reserved."
- verbose="false"
- />
+ verbose="false">
+ <classpath refid="tribes.classpath"/>
+ </javadoc>
</target>
<target name="dist" depends="compile,docs,javadoc">
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
