tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From patri...@apache.org
Subject cvs commit: jakarta-tomcat-5 BUILDING.txt build.properties.default build.xml
Date Sun, 25 Aug 2002 19:34:55 GMT
patrickl    2002/08/25 12:34:55

  Modified:    .        BUILDING.txt build.properties.default build.xml
  Log:
  Move the depencies in the "watchdog" target to the "download" target to make the "watchdog"
more consistent with the other build targets
  
  Revision  Changes    Path
  1.24      +44 -19    jakarta-tomcat-5/BUILDING.txt
  
  Index: BUILDING.txt
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-5/BUILDING.txt,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- BUILDING.txt	20 Aug 2002 16:14:32 -0000	1.23
  +++ BUILDING.txt	25 Aug 2002 19:34:55 -0000	1.24
  @@ -134,7 +134,7 @@
     "jakarta-tomcat-catalina").  By default, the build system will try to find
     this repository in the "${tomcat.source}/../jakarta-tomcat-catalina"
     directory.  Set the "catalina.home" property in the build.properties file 
  -  described below (see 28) if it resides in a different directory.
  +  described below (see 30) if it resides in a different directory.
   
   * Use Anonymous CVS (as described on the Jakarta web site at
     <http://jakarta.apache.org/site/cvsindex.html>, or
  @@ -145,7 +145,7 @@
     "jakarta-tomcat-connectors").  By default, the build system will try to find
     this repository in the "${tomcat.source}/../jakarta-tomcat-connectors"
     directory.  Set the "jtc.home" property in the build.properties file 
  -  described below (see 28) if it resides in a different directory.
  +  described below (see 30) if it resides in a different directory.
   
   * Use Anonymous CVS (as described on the Jakarta web site at
     <http://jakarta.apache.org/site/cvsindex.html>, or
  @@ -157,7 +157,7 @@
     "jakarta-tomcat-jasper/jasper2").  By default, the build system will try to
     find this repository in the
     "${tomcat.source}/../jakarta-tomcat-jasper/jasper2" directory.  Set the
  -  "jasper.home" property in the build.properties file described below (see 28)
  +  "jasper.home" property in the build.properties file described below (see 30)
     if it resides in a different directory.
   
   * Use Anonymous CVS (as described on the Jakarta web site at
  @@ -169,18 +169,7 @@
     "jakarta-servletapi-5").  By default, the build system will try to find
     this repository in the "${tomcat.source}/../jakarta-servletapi-5"
     directory.  Set the "api.home" property in the build.properties
  -  file described below (see 28) if it resides in a different directory.
  -
  -* Use Anonymous CVS (as described on the Jakarta web site at
  -  <http://jakarta.apache.org/site/cvsindex.html>, or
  -  download a source distribution of the "jakarta-watchdog-4.0" repository.
  -
  -* Unpack the source distribution into a convenient location so that the
  -  distribution resides in its own directory (conventionally named
  -  "jakarta-watchdog-4.0").  By default, the build system will try to find
  -  this repository in the "${tomcat.source}/../jakarta-watchdog-4.0"
  -  directory.  Set the "watchdog.home" property in the build.properties
  -  file described below (see 28) if it resides in a different directory.
  +  file described below (see 30) if it resides in a different directory.
   
   
   (6) Download and Install the Commons Beanutils Binary Distribution
  @@ -280,7 +269,7 @@
   
   (12) Steps (13)-(27) are optional, but are necessary to build a complete binary
        distribution of Tomcat 5. Set the "full.dist" property to "on" in the
  -     build.properties file (see 28) to build a complete distribution.
  +     build.properties file (see 30) to build a complete distribution.
        Regular contributors to Tomcat are encouraged to use the complete build 
        option.
   
  @@ -508,7 +497,43 @@
     installation directory.
   
   
  -(28) Customize Build Properties For This Subproject
  +(28) Download and Install the Servlet 2.3 Binary Distribution (OPTIONAL)
  +
  +NOTE:  This step is only required if you wish to build and execute the
  +Watchdog compliance tests.
  +
  +* Download a binary distribution (version 20020801 or later) from:
  +    http://jakarta.apache.org/builds/jakarta-servletapi-4/nightly
  +
  +  On a Windows platform, you will need:
  +    jakarta-servletapi-4-YYYYMMDD.zip
  +
  +  On a Unix platform, you will need:
  +    jakarta-servletapi-4-YYYYMMDD.tar.gz
  +
  +* Unpack the binary distribution into a convenient location so that the
  +  distribution resides in its own directory.
  +
  +
  +(29) Download and Install the Watchdog Binary Distribution (OPTIONAL)
  +
  +NOTE:  This step is only required if you wish to build and execute the
  +Watchdog compliance tests.
  +
  +* Download a binary distribution (version 20020801 or later) from:
  +    http://jakarta.apache.org/builds/jakarta-watchdog-4.0/nightly
  +
  +  On a Windows platform, you will need:
  +    jakarta-watchdog-4.0-YYYYMMDD.zip
  +
  +  On a Unix platform, you will need:
  +    jakarta-watchdog-4.0-YYYYMMDD.tar.gz
  +
  +* Unpack the binary distribution into a convenient location so that the
  +  distribution resides in its own directory.
  +
  +
  +(30) Customize Build Properties For This Subproject
   
   Most Jakarta subprojects allow you to customize Ant properties (with default
   values defined in the "build.xml" file.  This is done by creating a text file
  @@ -532,7 +557,7 @@
   each developer will have their own version.
   
   
  -(29) Build A Binary Distribution
  +(31) Build A Binary Distribution
   
   Open a command line shell, and issue the following commands:
   
  
  
  
  1.32      +15 -1     jakarta-tomcat-5/build.properties.default
  
  Index: build.properties.default
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-5/build.properties.default,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- build.properties.default	20 Aug 2002 14:50:02 -0000	1.31
  +++ build.properties.default	25 Aug 2002 19:34:55 -0000	1.32
  @@ -238,3 +238,17 @@
   tyrex.loc=http://telia.dl.sourceforge.net/sourceforge/tyrex/tyrex-1.0.jar
   
   
  +# ----- Servlet 2.3, version 20020801 or later -----
  +servlet23api.home=${base.path}/servletapi-4
  +servlet23api.lib=${servlet23api.home}/lib
  +servlet23api.jar=${servlet23api.lib}/servlet23api.jar
  +servlet23api.loc=jakarta-servletapi-4
  +
  +
  +# ----- Watchdog, version 20020801 or later -----
  +watchdog.home=${base.path}/watchdog-4.0
  +watchdog.webapps=${watchdog.home}/dist/webapps
  +watchdog.war=${watchdog.webapps}/servlet-tests.war
  +watchdog.loc=jakarta-watchdog-4.0
  +
  +
  
  
  
  1.31      +12 -7     jakarta-tomcat-5/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-5/build.xml,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- build.xml	16 Aug 2002 02:04:14 -0000	1.30
  +++ build.xml	25 Aug 2002 19:34:55 -0000	1.31
  @@ -29,8 +29,6 @@
              value="${basedir}/../jakarta-tomcat-jasper/jasper2"/>
     <property name="jtc.home"
              value="${basedir}/../jakarta-tomcat-connectors"/>
  -  <property name="watchdog.home"
  -           value="${basedir}/../jakarta-watchdog-4.0"/>
   
     <!-- Build Defaults -->
     <property name="catalina.build"   value="${catalina.home}/build"/>
  @@ -53,7 +51,6 @@
       <echo message="catalina.home=${catalina.home}"/>
       <echo message="jasper.home=${jasper.home}"/>
       <echo message="jtc.home=${jtc.home}"/>
  -    <echo message="watchdog.home=${watchdog.home}"/>
   
       <ant dir="${catalina.home}" target="flags.display"/>
   
  @@ -157,10 +154,6 @@
     <!-- ======================= WATCHDOG: Run Watchdog Tests================ -->
     <target name="watchdog"
      description="Watchdog Servlet Container Tests">
  -    <ant dir="${watchdog.home}" target="dist">
  -      <property name="servlet23api.home" value="${api.home}"/>
  -      <property name="servlet22api.home" value="${api.home}"/>
  -    </ant>
       <property name="catalina.base" location="${tomcat.build}/tmp/tomcat"/>
       <delete dir="${catalina.base}"/>
       <mkdir dir="${catalina.base}"/>
  @@ -662,6 +655,18 @@
         <param name="destfile" value="${tyrex.jar}"/>
         <param name="destdir" value="${tyrex.home}"/>
       </antcall>
  +    <antcall target="cvsbuild">
  +      <param name="location" value="${servlet23api.loc}"/>
  +      <param name="subdir" value="${servlet23api.home}"/>
  +      <param name="destfile" value="${servlet23api.jar}"/>
  +    </antcall>
  +    <antcall target="cvsbuild">
  +      <param name="servlet22api.home" value="${servlet23api.home}"/>
  +      <param name="location" value="${watchdog.loc}"/>
  +      <param name="subdir" value="${watchdog.home}"/>
  +      <param name="destfile" value="${watchdog.war}"/>
  +    </antcall>
  +
     </target>
   
     <target name="proxyflags">
  
  
  

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


Mime
View raw message