cvs commit: jakarta-tomcat-catalina build.xml gump.xml
bobh2002/09/10 08:50:49
Modified:.build.xml gump.xml
Log:
- Changes to get gump working. Namely build.xml, make catalina deploy
target configurable so that catalina builds without building coyote
(gump hates this.) Namely gump.xml, added values for otherwise
undefined properties (as build.xml was designed to be used when these
properties were set from another build.xml)
Revision ChangesPath
1.5 +4 -1 jakarta-tomcat-catalina/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-tomcat-catalina/build.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- build.xml 11 Aug 2002 11:54:48 - 1.4
+++ build.xml 10 Sep 2002 15:50:49 - 1.5
@@ -11,6 +11,9 @@
!-- 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/
@@ -42,7 +45,7 @@
target name=deploy depends=deploy-static
description=Build and deploy all components
echoTarget: Catalina - Deploy .../echo
-ant dir=${basedir}/catalina target=deploy/
+ant dir=${basedir}/catalina target=${catalina.target}/
echoTarget: Webapps - Deploy .../echo
ant dir=${basedir}/webapps target=deploy/
/target
1.6 +4 -0 jakarta-tomcat-catalina/gump.xml
Index: gump.xml
===
RCS file: /home/cvs/jakarta-tomcat-catalina/gump.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gump.xml 9 Sep 2002 04:16:16 - 1.5
+++ gump.xml 10 Sep 2002 15:50:49 - 1.6
@@ -11,6 +11,10 @@
packageorg.apache.catalina/package
ant target=deploy
+ property name=catalina.target value=deploy-catalina /
+ property name=jtc.home value=/home/bob/jk/jakarta-tomcat-connectors /
+ property name=catalina.home value=/home/bob/jk/jakarta-tomcat-catalina /
+ property name=tomcat.build path=build/
property name=ant.home reference=home project=jakarta-ant/
property name=jsse.home reference=home project=jsse/
property name=jmx.home reference=home project=jmx/
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-catalina build.xml gump.xml
On 10 Sep 2002, [EMAIL PROTECTED] wrote: + property name=jtc.home value=/home/bob/jk/jakarta-tomcat-connectors / I don't think this is going to work on my machine (no user bob here 8-). You probably want to do something like property name=jtc.home project=jakarta-tomcat-connectors reference=home/ Same for catalina-home. Stefan -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-catalina build.xml gump.xml
Picky picky. On Tue, 2002-09-10 at 12:07, Stefan Bodewig wrote: On 10 Sep 2002, [EMAIL PROTECTED] wrote: + property name=jtc.home value=/home/bob/jk/jakarta-tomcat-connectors / I don't think this is going to work on my machine (no user bob here 8-). You probably want to do something like property name=jtc.home project=jakarta-tomcat-connectors reference=home/ Same for catalina-home. Stefan -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED] -- Cheers, -bob -- To unsubscribe, e-mail: mailto:[EMAIL PROTECTED] For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina build.xml gump.xml
bobh2002/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 ChangesPath
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 - 1.6
+++ build.xml 10 Sep 2002 17:26:17 - 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
echoTarget: Catalina - Deploy .../echo
ant dir=${basedir}/catalina target=${catalina.target}/
+echoTarget: 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
+echoTarget: Catalina - Deploy .../echo
+ant dir=${basedir}/catalina target=deploy-catalina/
echoTarget: 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 - 1.7
+++ gump.xml 10 Sep 2002 17:26:17 - 1.8
@@ -10,8 +10,7 @@
project name=jakarta-tomcat-catalina
packageorg.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]
Re: cvs commit: jakarta-tomcat-catalina build.xml gump.xml
Perhaps you could also change
ant dir=${basedir}/catalina target=${catalina.target}/
back to target=deploy, since you deleted the catalina.target property?
On Tuesday 10 September 2002 01:26 pm, [EMAIL PROTECTED] wrote:
bobh2002/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 ChangesPath
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 - 1.6
+++ build.xml 10 Sep 2002 17:26:17 - 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
echoTarget: Catalina - Deploy .../echo
ant dir=${basedir}/catalina target=${catalina.target}/
+echoTarget: 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
+echoTarget: Catalina - Deploy .../echo
+ant dir=${basedir}/catalina target=deploy-catalina/
echoTarget: 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.xml10 Sep 2002 16:16:54 - 1.7
+++ gump.xml10 Sep 2002 17:26:17 - 1.8
@@ -10,8 +10,7 @@
project name=jakarta-tomcat-catalina
packageorg.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]
