tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cos...@apache.org
Subject cvs commit: jakarta-tomcat-5 build.properties.default build.xml
Date Fri, 14 Mar 2003 20:21:05 GMT
costin      2003/03/14 12:21:05

  Modified:    .        build.properties.default build.xml
  Log:
  Few more fixes.
  
  Really sorry for the pain - I didn't expect it to take that long.
  
  I changed the build for daemon to use the same path with the other dependents.
  
  Revision  Changes    Path
  1.79      +2 -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.78
  retrieving revision 1.79
  diff -u -r1.78 -r1.79
  --- build.properties.default	14 Mar 2003 18:39:50 -0000	1.78
  +++ build.properties.default	14 Mar 2003 20:21:04 -0000	1.79
  @@ -69,7 +69,7 @@
   
   # ----- Commons Daemon -----
   commons-daemon.home=${base.path}/commons-daemon
  -commons-daemon.lib=${commons-daemon.home}/dist
  +commons-daemon.lib=${commons-daemon.home}
   commons-daemon.jar=${commons-daemon.lib}/commons-daemon.jar
   commons-daemon.procrun.home=${commons-daemon.home}/src/native/nt/procrun/bin
   commons-daemon.procrun.exe=${commons-daemon.procrun.home}/tomcat.exe
  
  
  
  1.110     +47 -22    jakarta-tomcat-5/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
  retrieving revision 1.109
  retrieving revision 1.110
  diff -u -r1.109 -r1.110
  --- build.xml	14 Mar 2003 18:44:03 -0000	1.109
  +++ build.xml	14 Mar 2003 20:21:04 -0000	1.110
  @@ -8,9 +8,6 @@
     <property file="${user.home}/build.properties"/>
     <property file="build.properties"/>
     
  -  <!-- If not set explicitely in one of the user overrides, set it here 
  -    -->
  -
     <property file="build.properties.default"/>
   
     <!-- Project Properties -->
  @@ -137,6 +134,8 @@
             todir="${tomcat.build}/common/lib"/>
   
       <copy todir="${tomcat.build}/common/lib" file="${commons-logging-api.jar}" />
  +    <copy todir="${tomcat.build}/common/lib" file="${jmx.jar}" />
  +    <copy todir="${tomcat.build}/common/lib" file="${jmx-tools.jar}" />
       <copy todir="${tomcat.build}/server/lib" file="${commons-logging.jar}" />
       <copy todir="${tomcat.build}/server/lib" file="${commons-modeler.jar}" />
     </target>
  @@ -144,7 +143,6 @@
     <!-- ====================== Build all components =================== -->
     <target name="build-servletapi" unless="servletapi.build.notrequired" >
       <echo>========== Building: ${servlet-api.jar}</echo>
  -    <mkdir dir="${servlet-api.dist}" />
       <ant dir="${api.home}/jsr154" target="dist" >
           <property name="servlet-api.dist" value="${servlet-api.home}" />
       </ant>
  @@ -397,6 +395,15 @@
             description="Builds catalina">
       <echo>========== Building: catalina </echo>
   
  +    <ant dir="${catalina.home}/catalina" target="build-static">
  +        <property name="catalina.build" value="${tomcat.build}" />
  +        <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>
  +
       <ant dir="${catalina.home}/catalina" target="catalina-jars">
           <!-- in-place building -->
           <property name="catalina.build" value="${tomcat.build}" />
  @@ -473,7 +480,6 @@
   
     <target name="build-depends" depends="init"
             description="Builds various dependent components">
  -
       <antcall target="build-servletapi"/>
       <antcall target="build-jspapi"/>
   
  @@ -571,25 +577,22 @@
   
     <target name="embed" description="Create a set of jars for embeded tomcat" > 
       <!-- Generic libraries ( share ?) -->
  +    <copy todir="embed/lib" file="${commons-logging.jar}"/>
  +    <copy todir="embed/lib" file="${commons-digester.jar}"/>
  +    <copy todir="embed/lib" file="${commons-modeler.jar}"/>
  +    <copy todir="embed/lib" file="${commons-beanutils.jar}"/>
  +    <copy todir="embed/lib" file="${commons-collections.jar}"/>
  +    <copy todir="embed/lib" file="${jmx.jar}"/>
  +    <copy todir="embed/lib" file="${jmx-tools.jar}"/>
  +
       <copy todir="embed/lib">
         <fileset dir="build/server/lib">
  -        <include name="commons-logging.jar"/>
  -        <include name="commons-modeler.jar"/>
  -        <include name="commons-digester.jar"/>
  -        <include name="commons-beanutils.jar"/>
           <include name="tomcat-util.jar"/>
         </fileset>
  -      <fileset dir="build/common/lib">
  -        <include name="commons-collections.jar"/>
  -      </fileset>
         <fileset dir="${ant.home}/lib">
           <include name="ant.jar"/>
         </fileset>
       </copy>
  -    <copy todir="embed/lib" file="${commons-beanutils.jar}" />
  -    
  -    <!-- JMX -->
  -    <copy todir="embed/lib" file="${jmx.jar}" />
       
       <!-- Connector -->
       <copy todir="embed/lib">
  @@ -1363,6 +1366,14 @@
       <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" />
  @@ -1386,7 +1397,18 @@
       <get src="${sourcefile}" dest="${destfile}" />
     </target>
   
  -  <target name="cvsbuild" unless="exist" depends="testexist">
  +  <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"/>
  @@ -1409,19 +1431,22 @@
             description="Update or checkout required sources from CVS">
       <cvs cvsroot="${cvsroot}" quiet="true"
            command="checkout -P ${cvstag} jakarta-tomcat-catalina" 
  -         dest=".."/>
  +         dest="${cvs.base}"/>
       <cvs cvsroot="${cvsroot}" quiet="true"
            command="checkout -P ${cvstag} jakarta-tomcat-jasper" 
  -         dest=".."/>
  +         dest="${cvs.base}"/>
       <cvs cvsroot="${cvsroot}" quiet="true"
            command="checkout -P ${cvstag} jakarta-tomcat-connectors" 
  -         dest=".."/>
  +         dest="${cvs.base}"/>
       <cvs cvsroot="${cvsroot}" quiet="true"
            command="checkout -P ${cvstag} jakarta-servletapi-5" 
  -         dest=".."/>
  +         dest="${cvs.base}"/>
  +    <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} jakarta-commons" 
  -         dest=".."/>
  +         dest="${cvs.base}"/>
     </target>
   
   
  
  
  

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


Mime
View raw message