Author: markt
Date: Sun Nov 13 09:28:21 2005
New Revision: 333073
URL: http://svn.apache.org/viewcvs?rev=333073&view=rev
Log:
Use current/tc5.5.x to do the checkout
Remove commons-daemon source checkout as we now use the official release.
Modified:
tomcat/build/tc5.5.x/resources/build.xml
Modified: tomcat/build/tc5.5.x/resources/build.xml
URL:
http://svn.apache.org/viewcvs/tomcat/build/tc5.5.x/resources/build.xml?rev=333073&r1=333072&r2=333073&view=diff
==============================================================================
--- tomcat/build/tc5.5.x/resources/build.xml (original)
+++ tomcat/build/tc5.5.x/resources/build.xml Sun Nov 13 09:28:21 2005
@@ -17,7 +17,7 @@
<property name="final.name" value="${project}-${version}" />
<property name="final-src.name" value="${project}-${version}-src" />
- <!-- CVSROOT -->
+ <!-- SVNROOT -->
<property name="svnroot"
value="http://svn.apache.org/repos/asf/"; />
@@ -28,14 +28,7 @@
<property name="jtc.project" value="connectors" />
<property name="jasper.project" value="jasper" />
- <property name="api.loc"
value="tomcat/servletapi/servlet2.4-jsp2.0-tc5.x/" />
- <property name="tomcat.loc" value="tomcat/build/tc5.5.x/" />
- <property name="catalina.loc" value="tomcat/container/tc5.5.x/" />
- <property name="jtc.loc" value="tomcat/connectors/trunk/" />
- <property name="jasper.loc" value="tomcat/jasper/tc5.5.x/jasper2/" />
-
- <!-- Dependent projects -->
- <property name="commons-daemon.project" value="jakarta-commons/daemon" />
+ <property name="current.loc" value="tomcat/current/tc5.5.x" />
<!-- Source dependencies -->
<property name="api.home"
@@ -49,7 +42,7 @@
<property name="tomcat.home"
value="${basedir}/${tomcat.project}"/>
- <target name="build"
depends="check.source,check.source.depends,get.source,get.source.depends"
+ <target name="build" depends="check.source,get.source"
description="Builds all components">
<ant dir="${tomcat.home}" target="download" />
@@ -75,34 +68,11 @@
message="If the checkout fails, - todo - " />
<exec dir="${basedir}" executable="svn">
- <arg line="checkout ${svnroot}/${tomcat.loc} ${tomcat.project}" />
- </exec>
-
- <exec dir="${basedir}" executable="svn">
- <arg line="checkout ${svnroot}/${catalina.loc} ${catalina.project}" />
- </exec>
-
- <exec dir="${basedir}" executable="svn">
- <arg line="checkout ${svnroot}/${jasper.loc} ${jasper.project}" />
- </exec>
-
- <exec dir="${basedir}" executable="svn">
- <arg line="checkout ${svnroot}/${jtc.loc} ${jtc.project}" />
- </exec>
-
- <exec dir="${basedir}" executable="svn">
- <arg line="checkout ${svnroot}/${api.loc} ${api.project}" />
+ <arg line="checkout ${svnroot}/${current.loc} ${basedir}" />
</exec>
</target>
- <target name="checkout.depends"
- description="Update or checkout dependent sources from CVS">
-
- <!-- Still needed -->
-
- </target>
-
<!-- *************** UTILITY TARGETS *************** -->
<target name="check.source">
@@ -112,22 +82,9 @@
</target>
- <target name="check.source.depends">
-
- <available property="source.depends.exists"
- file="${basedir}/${commons-daemon.project}" type="dir" />
-
- </target>
-
<target name="get.source" unless="source.exists">
<antcall target="checkout" />
-
- </target>
-
- <target name="get.source.depends" unless="source.depends.exists">
-
- <antcall target="checkout.depends" />
</target>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
