bobh 2002/09/10 10:26:17
Modified: . build.xml gump.xml
Log:
- Larry Isaacs suggests that using an additional target is more
typical way to handle this situation (different build paths for gump
vs other build.xml)
Revision Changes Path
1.7 +10 -3 jakarta-tomcat-catalina/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/build.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- build.xml 10 Sep 2002 15:53:38 -0000 1.6
+++ build.xml 10 Sep 2002 17:26:17 -0000 1.7
@@ -11,9 +11,6 @@
<!-- Build Defaults -->
<!--property name="catalina.build" value="${basedir}/catalina/build"/-->
- <!-- used by gump to keep from building more that just catalina -->
- <property name="catalina.target" value="deploy" />
-
<!-- Source dependencies -->
<property name="api.home"
value="${basedir}/../jakarta-servletapi-5"/>
@@ -46,6 +43,16 @@
description="Build and deploy all components">
<echo>Target: Catalina - Deploy ...</echo>
<ant dir="${basedir}/catalina" target="${catalina.target}"/>
+ <echo>Target: Webapps - Deploy ...</echo>
+ <ant dir="${basedir}/webapps" target="deploy"/>
+ </target>
+
+ <!-- ====================== DEPLOY: Deploy Core Components =================== -->
+ <!-- used by gump to build just catalina and not the j-t-connectors -->
+ <target name="deploy-catalina" depends="deploy-static"
+ description="Build and deploy all components">
+ <echo>Target: Catalina - Deploy ...</echo>
+ <ant dir="${basedir}/catalina" target="deploy-catalina"/>
<echo>Target: Webapps - Deploy ...</echo>
<ant dir="${basedir}/webapps" target="deploy"/>
</target>
1.8 +1 -2 jakarta-tomcat-catalina/gump.xml
Index: gump.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/gump.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gump.xml 10 Sep 2002 16:16:54 -0000 1.7
+++ gump.xml 10 Sep 2002 17:26:17 -0000 1.8
@@ -10,8 +10,7 @@
<project name="jakarta-tomcat-catalina">
<package>org.apache.catalina</package>
- <ant target="deploy">
- <property name="catalina.target" value="deploy-catalina" />
+ <ant target="deploy-catalina">
<property name="jtc.home" project="jakarta-tomcat-connectors"
reference="home"/>
<property name="catalina.home" project="jakarta-tomcat-catalina"
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
