tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r440189 - in /tomcat/container/branches/tc4.1.x: build.properties.default build.xml
Date Mon, 04 Sep 2006 21:26:04 GMT
Author: markt
Date: Mon Sep  4 14:26:03 2006
New Revision: 440189

URL: http://svn.apache.org/viewvc?view=rev&rev=440189
Log:
Update the TC4 build to smooth the process for people building from svn or source.

Modified:
    tomcat/container/branches/tc4.1.x/build.properties.default
    tomcat/container/branches/tc4.1.x/build.xml

Modified: tomcat/container/branches/tc4.1.x/build.properties.default
URL: http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/build.properties.default?view=diff&rev=440189&r1=440188&r2=440189
==============================================================================
--- tomcat/container/branches/tc4.1.x/build.properties.default (original)
+++ tomcat/container/branches/tc4.1.x/build.properties.default Mon Sep  4 14:26:03 2006
@@ -125,7 +125,6 @@
 servlet.home=${basedir}/../servletapi/dist
 servlet.lib=${servlet.home}/lib
 servlet.jar=${servlet.lib}/servlet.jar
-servlet.loc=jakarta-servletapi-4
 
 
 # ----- Xerces XML Parser, version 1.4.4 to 2.0.0 Beta 4 -----

Modified: tomcat/container/branches/tc4.1.x/build.xml
URL: http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/build.xml?view=diff&rev=440189&r1=440188&r2=440189
==============================================================================
--- tomcat/container/branches/tc4.1.x/build.xml (original)
+++ tomcat/container/branches/tc4.1.x/build.xml Mon Sep  4 14:26:03 2006
@@ -11,7 +11,7 @@
 
   <!-- Project Properties -->
   <property name="name"                  value="Apache Tomcat" />
-  <property name="year"                  value="2005" />
+  <property name="year"                  value="2006" />
   <property name="version"               value="4.1" />
   <property name="project"               value="apache-tomcat" />
   <property name="final.name"            value="${project}-${version}" />
@@ -470,41 +470,31 @@
       <param name="sourcefile" value="${commons-digester.loc}"/>
       <param name="destfile" value="${commons-digester.jar}"/>
     </antcall>
-
-    <!-- Commons Logging    -->
     <antcall target="downloadgz">
       <param name="sourcefile" value="${commons-logging.loc}"/>
       <param name="destfile" value="${commons-logging.jar}"/>
     </antcall>
-
     <antcall target="downloadgz">
       <param name="sourcefile" value="${regexp.loc}"/>
       <param name="destfile" value="${regexp.jar}"/>
     </antcall>
-    <!-- Servlet api needs something different. -->
 
-    <antcall target="cvsbuild">
-      <param name="location" value="${servlet.loc}"/>
-      <param name="subdir" value="${servlet.home}"/>
-      <param name="destfile" value="${servlet.jar}"/>
-    </antcall>
+    <!-- Servlet api needs something different. -->
+    <ant dir="${api.home}" target="dist"/>
 
     <antcall target="downloadgz">
       <!-- xerces2 brings 2 files, test for one of them -->
       <param name="sourcefile" value="${xerces.loc}"/>
       <param name="destfile" value="${xmlParserAPIs.jar}"/>
     </antcall>
-    <!-- commons- daemons/dbcp/pool need something different. -->
     <antcall target="downloadgz">
       <param name="sourcefile" value="${commons-daemon.loc}"/>
       <param name="destfile" value="${commons-daemon.jar}"/>
     </antcall>
-    <!-- Pool 1.0 -->
     <antcall target="downloadgz">
       <param name="sourcefile" value="${commons-pool.loc}"/>
       <param name="destfile" value="${commons-pool.jar}"/>
     </antcall>
-
     <antcall target="downloadgz">
       <param name="sourcefile" value="${commons-dbcp.loc}" />
       <param name="destfile" value="${commons-dbcp.jar}" />
@@ -531,13 +521,6 @@
       <param name="sourcefile" value="${struts.loc}"/>
       <param name="destfile" value="${struts.jar}"/>
     </antcall>
-<!--
-    <antcall target="downloadfile">
-      <param name="sourcefile" value="${tyrex.loc}"/>
-      <param name="destfile" value="${tyrex.jar}"/>
-      <param name="destdir" value="${tyrex.home}"/>
-    </antcall>
--->
   </target>
 
   <target name="proxyflags">
@@ -580,30 +563,6 @@
     <!-- Download extract the file -->
     <mkdir dir="${destdir}" />
     <get src="${sourcefile}" dest="${destfile}" />
-  </target>
-
-  <target name="cvsbuild" unless="exist" depends="testexist">
-    <!-- cvs checkout and ant dist + copy of jar file -->
-    <echo message="cvs co ${location} and ant dist in ${subdir}"/>
-    <mkdir dir="${base.path}/tmp"/>
-    <cvs cvsRoot="${cvsroot}"
-      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="jfc">
-    <antcall target="cvsbuild">
-      <param name="location" value="${commons-daemon.loc}"/>
-      <param name="subdir" value="${commons-daemon.home}"/>
-      <param name="destfile" value="${commons-daemon.jar}"/>
-    </antcall>
   </target>
 
 </project>



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message