costin 2003/03/13 14:48:00
Modified: . build.xml build.properties.default
Log:
More consistency.
If it's a dependency package, it should be located in base.dir ( our repository ) -
it doesn't matter if we build it or do a real download.
Probably it would make sense to treat our own packages in the same way,
but next time.
Revision Changes Path
1.106 +27 -40 jakarta-tomcat-5/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- build.xml 13 Mar 2003 22:08:21 -0000 1.105
+++ build.xml 13 Mar 2003 22:48:00 -0000 1.106
@@ -46,12 +46,9 @@
<!-- Build Defaults -->
<property name="catalina.build" value="${catalina.home}/build"/>
<property name="jasper.build" value="${jasper.home}/build"/>
- <property name="servlet.home" value="../jakarta-servletapi-5/jsr154/dist"/>
- <property name="jsp.home" value="../jakarta-servletapi-5/jsr152/dist"/>
<property name="tomcat.build" value="${basedir}/build"/>
<property name="build.home" value="${tomcat.build}"/>
- <property name="servletapi.jar"
value="${tomcat.build}/common/lib/servlet-api.jar"/>
- <property name="jspapi.jar" value="${tomcat.build}/common/lib/jsp-api.jar"/>
+
<property name="tomcat.dist" value="${basedir}/dist"/>
<property name="tomcat.release" value="${basedir}/release"/>
<property name="webapps.build" value="${catalina.home}/webapps/build"/>
@@ -85,12 +82,12 @@
<mkdir dir="${tomcat.build}/common/lib" />
<uptodate property="servletapi.build.notrequired"
- targetfile="${servletapi.jar}">
+ targetfile="${servlet-api.jar}">
<srcfiles dir="${api.home}/jsr154/src" includes="**" />
</uptodate>
<uptodate property="jspapi.build.notrequired"
- targetfile="${jspapi.jar}">
+ targetfile="${jsp-api.jar}">
<srcfiles dir="${api.home}/jsr152/src" includes="**" />
</uptodate>
@@ -119,11 +116,26 @@
<srcfiles dir="${catalina.home}/webapps/admin" includes="**" />
</uptodate>
+ <uptodate property="commons-modeler.build.notrequired"
+ targetfile="${tomcat.build}/server/lib/commons-modeler.jar">
+ <srcfiles dir="${cvs.base}/jakarta-commons/modeler/src/java" includes="**" />
+ </uptodate>
+
+ <uptodate property="commons-el.build.notrequired"
+ targetfile="${commons-el.jar}">
+ <srcfiles dir="${cvs.base}/jakarta-commons/el/src/java" includes="**" />
+ </uptodate>
</target>
<!-- ====================== DEPLOY: Copy Static Files =================== -->
<target name="deploy-static" depends="init">
+ <copy file="${jsp-api.jar}" todir="${tomcat.build}/common/lib"/>
+ <copy file="${servlet-api.jar}" todir="${tomcat.build}/common/lib"/>
+
+ <copy file="${commons-el.jar}"
+ todir="${tomcat.build}/common/lib"/>
+
<copy todir="${tomcat.build}/common/lib" file="${commons-logging-api.jar}" />
<copy todir="${tomcat.build}/server/lib" file="${commons-logging.jar}" />
<copy todir="${tomcat.build}/server/lib" file="${commons-modeler.jar}" />
@@ -133,20 +145,16 @@
<target name="build-servletapi" unless="servletapi.build.notrequired" >
<echo>========== Building: ${servlet-api.jar}</echo>
- <ant dir="${api.home}/jsr154" target="jar" >
- <property name="servlet-api.build" value="${tomcat.build}" />
- <property name="servlet-api.jar" value="${servletapi.jar}"/>
+ <ant dir="${api.home}/jsr154" target="dist" >
+ <property name="servlet-api.dist" value="${servlet-api.home}" />
</ant>
</target>
<target name="build-jspapi" unless="jspapi.build.notrequired" >
<echo>========== Building: ${jsp-api.jar}</echo>
- <ant dir="${api.home}/jsr152" target="jar">
- <property name="jsp-api.build" value="${tomcat.build}" />
- <property name="jsp-api.jar" value="${jspapi.jar}"/>
+ <ant dir="${api.home}/jsr152" target="dist">
+ <property name="jsp-api.dist" value="${jsp-api.home}" />
</ant>
- <!-- clean up -->
- <delete file="${tomcat.build}/manifest" />
</target>
<target name="build-tomcatutil" unless="tomcatutil.build.notrequired" >
@@ -196,7 +204,7 @@
<property name="tomcat-coyote.jar"
value="${tomcat.build}/server/lib/tomcat-coyote.jar" />
<property name="tomcat-util.jar"
value="${tomcat.build}/server/lib/tomcat-util.jar"/>
- <property name="servlet.jar" value="${servletapi.jar}"/>
+ <property name="servlet.jar" value="${servlet-api.jar}"/>
</ant>
</target>
@@ -456,11 +464,9 @@
<ant dir="${cvs.base}/jakarta-commons/el" target="dist" >
<property name="servlet-api.jar" location="${servlet-api.jar}" />
- <property name="commons-el.jar"
location="${tomcat.build}/common/lib/commons-el.jar" />
- <property name="jsp-api.jar" value="${jspapi.jar}"/>
+ <property name="jsp-api.jar" value="${jsp-api.jar}"/>
<property name="compile.optimize" value="false" />
- <property name="dist.home" value="commons-el.home" />
- <property name="build.home" value="${tomcat.build}" />
+ <property name="dist.home" value="${commons-el.home}" />
</ant>
</target>
@@ -469,14 +475,6 @@
<target name="build-depends" depends="init"
description="Builds various dependent components">
- <uptodate property="commons-modeler.build.notrequired"
- targetfile="${tomcat.build}/server/lib/commons-modeler.jar">
- <srcfiles dir="${cvs.base}/jakarta-commons/modeler/src/java" includes="**" />
- </uptodate>
- <uptodate property="commons-el.build.notrequired"
- targetfile="${tomcat.build}/common/lib/commons-el.jar">
- <srcfiles dir="${cvs.base}/jakarta-commons/el/src/java" includes="**" />
- </uptodate>
<antcall target="build-servletapi"/>
<antcall target="build-jspapi"/>
@@ -682,17 +680,6 @@
<target name="deploy.old" depends="deploy-static"
description="Old deploy target">
- <echo>Target: Servlet API - Dist ...</echo>
- <ant dir="${api.home}/jsr154" target="dist"/>
-
- <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"/>
@@ -804,8 +791,8 @@
<mkdir dir="${watchdog.home}/tmp"/>
- <unjar dest="${watchdog.home}/tmp" src="${servlet.home}/lib/servlet-api.jar"/>
- <unjar dest="${watchdog.home}/tmp" src="${jsp.home}/lib/jsp-api.jar"/>
+ <unjar dest="${watchdog.home}/tmp"
src="${servlet-api.home}/lib/servlet-api.jar"/>
+ <unjar dest="${watchdog.home}/tmp" src="${jsp-api.home}/lib/jsp-api.jar"/>
<jar destfile="${watchdog.home}/servlet.jar"
basedir="${watchdog.home}/tmp"
1.76 +10 -2 jakarta-tomcat-5/build.properties.default
Index: build.properties.default
===================================================================
RCS file: /home/cvs/jakarta-tomcat-5/build.properties.default,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- build.properties.default 12 Mar 2003 23:15:17 -0000 1.75
+++ build.properties.default 13 Mar 2003 22:48:00 -0000 1.76
@@ -87,7 +87,7 @@
# ----- Commons Expression Language (EL) -----
commons-el.home=${base.path}/commons-el
-commons-el.lib=${commons-el.home}/dist
+commons-el.lib=${commons-el.home}
commons-el.jar=${commons-el.lib}/commons-el.jar
commons-el.loc=jakarta-commons/el
commons-el.cvs.loc=jakarta-commons/el
@@ -268,6 +268,14 @@
servlet23api.lib=${servlet23api.home}/lib
servlet23api.jar=${servlet23api.lib}/servlet23api.jar
servlet23api.loc=jakarta-servletapi-4
+
+servlet-api.home=${base.path}/servlet-api-2.4
+servlet-api.lib=${servlet-api.home}/lib
+servlet-api.jar=${servlet-api.lib}/servlet-api.jar
+
+jsp-api.home=${base.path}/jsp-api-2.0
+jsp-api.lib=${jsp-api.home}/lib
+jsp-api.jar=${jsp-api.lib}/jsp-api.jar
# ----- Watchdog, version 20020801 or later -----
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
