Author: remm
Date: Tue May 29 06:37:57 2007
New Revision: 542512
URL: http://svn.apache.org/viewvc?view=rev&rev=542512
Log:
- Build updates for svn layout.
- JDK 1.5 build compatibility (JDK 1.4 should still be used to build real
releases, though).
Modified:
tomcat/build/branches/tc5.0.x/build.xml
Modified: tomcat/build/branches/tc5.0.x/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/build/branches/tc5.0.x/build.xml?view=diff&rev=542512&r1=542511&r2=542512
==============================================================================
--- tomcat/build/branches/tc5.0.x/build.xml (original)
+++ tomcat/build/branches/tc5.0.x/build.xml Tue May 29 06:37:57 2007
@@ -12,23 +12,19 @@
<!-- Project Properties -->
<property name="name" value="Apache Tomcat" />
- <property name="year" value="2004" />
+ <property name="year" value="2007" />
<property name="version" value="5.0" />
- <property name="project" value="jakarta-tomcat" />
+ <property name="project" value="apache-tomcat" />
<property name="final.name" value="${project}-${version}" />
<property name="final-src.name" value="${project}-${version}-src" />
<!-- Subprojects -->
- <property name="api.project" value="jakarta-servletapi-5" />
- <property name="tomcat.project" value="jakarta-tomcat-5" />
- <property name="catalina.project" value="jakarta-tomcat-catalina" />
- <property name="jtc.project" value="jakarta-tomcat-connectors" />
- <property name="jasper.project" value="jakarta-tomcat-jasper" />
+ <property name="api.project" value="servletapi" />
+ <property name="catalina.project" value="container" />
+ <property name="jtc.project" value="connectors" />
+ <property name="jasper.project" value="jasper" />
<property name="ant.jar" value="${ant.home}/lib/ant.jar"/>
<property name="ant-launcher.jar"
value="${ant.home}/lib/ant-launcher.jar"/>
- <property name="cvstag" value="" />
- <property name="cvs.base"
- value="${basedir}/.."/>
<!-- Source dependencies -->
<property name="api.home"
@@ -39,8 +35,6 @@
value="${basedir}/../${jasper.project}/jasper2"/>
<property name="jtc.home"
value="${basedir}/../${jtc.project}"/>
- <property name="tomcat.home"
- value="${basedir}/../${tomcat.project}"/>
<!-- Build Defaults -->
<property name="catalina.build" value="${catalina.home}/build"/>
@@ -118,12 +112,6 @@
<srcfiles dir="${catalina.home}/webapps/admin" includes="**" />
</uptodate>
- <!--
- <uptodate property="commons-daemon.build.notrequired"
- targetfile="${commons-daemon.jar}">
- <srcfiles dir="${cvs.base}/jakarta-commons/daemon" includes="**" />
- </uptodate>
- -->
</target>
@@ -461,31 +449,6 @@
<!-- ====================== Build dependent code =================== -->
-<!--
- <target name="build-commons-modeler"
unless="commons-modeler.build.notrequired" description="build commons-modeler">
- <echo>========== Building: commons-modeler </echo>
-
- <ant dir="${cvs.base}/jakarta-commons/modeler" target="dist" >
- <property name="dist.home" location="${commons-modeler.home}" />
- <property name="commons-logging.jar" location="${commons-logging.jar}"
/>
- <property name="jmx.jar" location="${jmx.jar}" />
- <property name="commons-digester.jar"
location="${commons-digester.jar}" />
- <property name="build.home" value="${tomcat.build}" />
- </ant>
- </target>
--->
-
-<!--
- <target name="build-commons-daemon"
unless="commons-daemon.build.notrequired" description="build commons-daemon" >
- <echo>========== Building: commons-daemon </echo>
-
- <ant dir="${cvs.base}/jakarta-commons/daemon" target="dist" >
- <property name="compile.optimize" value="false" />
- <property name="dist.home" value="${commons-daemon.home}" />
- </ant>
- </target>
--->
-
<target name="build-all"
depends="init,deploy-static,build,build-webapps,compat,deployer"
description="build tomcat, webapps, embed, compat, deployer" />
@@ -987,11 +950,12 @@
<target name="dist-watchdog" depends="proxyflags"
description="Build watchdog">
-
+<!--
<cvs cvsRoot="${cvsroot}"
package="${watchdog.loc}"
dest="${base.path}"
/>
+-->
<mkdir dir="${watchdog.home}/tmp"/>
@@ -1680,14 +1644,6 @@
<available file="${destfile}" property="exist"/>
</target>
- <target name="testsrc">
- <echo message="Testing for ${destfile} versus
${cvs.base}/${location}/src"/>
- <uptodate property="exist"
- targetfile="${destfile}">
- <srcfiles dir="${cvs.base}/${location}/src" includes="**" />
- </uptodate>
- </target>
-
<target name="downloadgz" unless="exist" depends="setproxy,testexist">
<!-- Download and extract the package -->
<get src="${sourcefile}" dest="${base.path}/file.tar.gz" />
@@ -1710,63 +1666,6 @@
<mkdir dir="${destdir}" />
<get src="${sourcefile}" dest="${destfile}" />
</target>
-
- <target name="cvsbuild" unless="exist" depends="testsrc">
- <!-- cvs checkout for all source should be done in "update" -->
- <!-- build the distribution -->
- <ant dir="${cvs.base}/${location}" target="dist">
- </ant>
- <mkdir dir="${subdir}" />
- <copy todir="${subdir}" >
- <fileset dir="${cvs.base}/${location}/dist" includes="**" />
- </copy>
- </target>
-
- <target name="cvsbuild.old" unless="exist" depends="testexist">
- <!-- cvs checkout and ant dist + copy of jar file -->
- <echo message="cvs co ${location} ${cvstag} and ant dist in ${subdir}"/>
- <mkdir dir="${base.path}/tmp"/>
- <cvs cvsRoot="${cvsroot}"
- tag="${cvstag}"
- package="${location}"
- dest="${base.path}/tmp"
- />
- <!-- the software is checked out in ${{base.path}/tmp/${location} -->
- <move todir="${subdir}">
- <fileset dir="${base.path}/tmp/${location}/"/>
- </move>
- <!-- now build the distribution -->
- <ant dir="${subdir}" target="dist"/>
- </target>
-
- <target name="update" depends="checkout" />
-
- <target name="checkout"
- description="Update or checkout required sources from CVS">
- <cvs cvsroot="${cvsroot}" quiet="true"
- command="checkout -P ${cvstag} jakarta-tomcat-catalina"
- dest="${cvs.base}"/>
- <cvs cvsroot="${cvsroot}" quiet="true"
- command="checkout -P ${cvstag} jakarta-tomcat-jasper"
- dest="${cvs.base}"/>
- <cvs cvsroot="${cvsroot}" quiet="true"
- command="checkout -P ${cvstag} jakarta-tomcat-connectors"
- dest="${cvs.base}"/>
- <cvs cvsroot="${cvsroot}" quiet="true"
- command="checkout -P ${cvstag} jakarta-servletapi-5"
- dest="${cvs.base}"/>
-<!-- Use released daemon instead
- <cvs cvsroot="${cvsroot}" quiet="true"
- command="checkout -P ${cvstag} ${commons-daemon.cvs.loc}"
- dest="${cvs.base}"/>
--->
-<!--
- <cvs cvsroot="${cvsroot}" quiet="true"
- command="checkout -P ${cvstag} ${commons-modeler.cvs.loc}"
- dest="${cvs.base}"/>
--->
- </target>
-
<!-- ==================== Modeler tricks ====================
-->
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
