costin 2003/03/12 16:20:32
Modified: . build.xml
Log:
Hopefully the last commit on this topic :-)
Now both deploy and build-all work.
I renamed deploy to deploy-old and used the new "build" model -
I think it is much cleaner and will allow us to simplify the
build a lot when we switch to ant1.6. In addition it may
allow us to do small changes to the layout ( like the "profiles"
we discussed earlier )
Not to mention it is faster.
You should use "build" target if you just want to build - the
default target will build webapps ( very slow ) and a lot of other
stuff.
If anyone has a problem - you can revert or use deploy-old.
Revision Changes Path
1.100 +23 -16 jakarta-tomcat-5/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- build.xml 12 Mar 2003 23:15:17 -0000 1.99
+++ build.xml 13 Mar 2003 00:20:32 -0000 1.100
@@ -227,10 +227,14 @@
<target name="build-admin" unless="admin.build.notrequired"
depends="init" >
+
<echo>========== Building: admin </echo>
<ant dir="${catalina.home}/webapps/admin" target="build-main">
- <!-- property name="flags.hide" value="true" / -->
- <property name="webapps.build" value="${tomcat.build}/server/webapps"/>
+ <property name="webapps.build" value="${tomcat.build}/server/webapps" />
+ <property name="classes.dir" value="${tomcat.build}/classes" />
+ <property name="tomcat-util.jar"
value="${tomcat.build}/server/lib/tomcat-util.jar"/>
+ <property name="catalina.deploy" value="${tomcat.build}" />
+ <property name="flags.hide" value="true" />
</ant>
<touch file="${tomcat.build}/server/webapps/admin/WEB-INF/web.xml" />
@@ -238,11 +242,6 @@
<target name="build-webapps-precompile"
depends="init" description="Builds the admin webapp" >
- <echo>========== Building: admin to ${tomcat.build}/server/webapps </echo>
- <ant dir="${catalina.home}/webapps/admin" target="build-main">
- <property name="flags.hide" value="true" />
- <property name="webapps.build" value="${tomcat.build}/server/webapps"/>
- </ant>
<!-- JSPC -->
<property name="admin.base" location="${tomcat.build}/server/webapps/admin" />
@@ -535,13 +534,8 @@
<property name="flags.hide" value="true" />
</ant>
- <ant dir="${catalina.home}/webapps/admin" target="build-main">
- <property name="webapps.build" value="${tomcat.build}/server/webapps" />
- <property name="classes.dir" value="${tomcat.build}/classes" />
- <property name="tomcat-util.jar"
value="${tomcat.build}/server/lib/tomcat-util.jar"/>
- <property name="catalina.deploy" value="${tomcat.build}" />
- <property name="flags.hide" value="true" />
- </ant>
+ <antcall target="build-admin" />
+
<ant dir="${catalina.home}/webapps/manager" target="build-main">
<property name="webapps.build" value="${tomcat.build}/server/webapps" />
<property name="classes.dir" value="${tomcat.build}/classes" />
@@ -615,6 +609,7 @@
<copy todir="embed/lib">
<fileset dir="build/common/lib">
<include name="servlet-api.jar"/>
+ <include name="jsp-api.jar"/>
<include name="naming-resources.jar"/>
<include name="naming-common.jar"/>
</fileset>
@@ -684,8 +679,11 @@
<!-- ====================== DEPLOY: Deploy Components =================== -->
- <target name="deploy" depends="deploy-static"
- description="Build and deploy all components">
+ <target name="deploy" depends="deploy-static,build-all,build-webapps"
+ description="Build and deploy all components" />
+
+ <target name="deploy.old" depends="deploy-static"
+ description="Old deploy target">
<echo>Target: Servlet API - Dist ...</echo>
<ant dir="${api.home}/jsr154" target="dist"/>
@@ -693,6 +691,12 @@
<echo>Target: JSP API - Dist ...</echo>
<ant dir="${api.home}/jsr152" target="dist"/>
+ <copy file="${api.home}/jsr152/dist/lib/jsp-api.jar"
+ todir="${tomcat.build}/common/lib"/>
+
+ <copy file="${commons-el.jar}"
+ todir="${tomcat.build}/common/lib"/>
+
<echo>Target: Modeler - Dist ...</echo>
<ant dir="${commons-modeler.home}" target="dist"/>
@@ -728,6 +732,9 @@
</copy>
<echo>Target: Webapps precompilation ...</echo>
+
+ <antcall target="build-admin"/>
+
<ant dir="." target="build-webapps-precompile" />
</target>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
