You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by cr...@locus.apache.org on 2000/04/27 00:31:53 UTC

cvs commit: jakarta-servletapi README build.xml

craigmcc    00/04/26 15:31:53

  Modified:    .        README build.xml
  Log:
  Get the distribution format right this time.  The contents of the
  "../dist/servletapi" directory are now suitable for packaging as a
  binary download release.
  
  Revision  Changes    Path
  1.2       +14 -5     jakarta-servletapi/README
  
  Index: README
  ===================================================================
  RCS file: /home/cvs/jakarta-servletapi/README,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- README	2000/04/26 22:09:46	1.1
  +++ README	2000/04/26 22:31:53	1.2
  @@ -12,9 +12,11 @@
   * Download and install the JAKARTA-ANT distribution.  If you have downloaded
     the source distribution, you must create the executable version by
     executing the following commands:
  +
   	cd jakarta-ant
   	./bootstrap.sh		<-- Unix
   	bootstrap		<-- Windows
  +
     This should result in the creation of a file "ant.jar" in the "lib"
     subdirectory, which will be used when building the Servlet API distribution.
   
  @@ -22,22 +24,29 @@
     from the CVS repository, into a directory parallel to the jakarta-ant
     directory created above.  That is, if you downloaded both subprojects into
     a directory named $JAKARTA_HOME, you would see the following two entries:
  +
   	jakarta-ant/
   	jakarta-servletapi/
  -  under it.
   
  +  underneath it.
  +
   * Build the servlet API distribution (a "servlet.jar" file containing the
     classes and a ZIP file containing the API documentation) as follows:
  +
   	cd jakarta-servletapi
   	./build.sh dist		<-- Unix
   	build dist		<-- Windows
  +
     This should result in the creation of a new "dist" directory at the same
     level as "jakarta-ant" and "jakarta-servletapi", with a "servletapi"
     directory underneath it.  In this distribution directory, you will find:
  -	servlet.jar		Binary servlet classes suitable
  +
  +	docs/api/		Directory containing the Javadoc API
  +				documentation for the servlet/JSP API classes
  +
  +	lib/servlet.jar		Binary servlet classes suitable
   				for use when compiling servlets
   				(or a servlet container)
  -	servletapi-doc.zip	ZIP file containing the JavaDoc documentation
  -				for the servlet and JSP API classes.
  -
   
  +	src/			Directory containing the source code
  +				for the servlet/JSP API classes
  
  
  
  1.3       +16 -7     jakarta-servletapi/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-servletapi/build.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- build.xml	2000/04/26 22:09:46	1.2
  +++ build.xml	2000/04/26 22:31:53	1.3
  @@ -10,10 +10,18 @@
   
     <!-- ===================== Prepare Directories ========================= -->
     <target name="prepare">
  +    <!-- "Build" Hierarchy -->
       <mkdir dir="${servletapi.build}"/>
  -    <mkdir dir="${servletapi.build}/servletapi-doc"/>
       <mkdir dir="${servletapi.build}/classes"/>
  +    <mkdir dir="${servletapi.build}/docs"/>
  +    <mkdir dir="${servletapi.build}/docs/api"/>
  +    <!-- "Dist" Hierarchy -->
       <mkdir dir="${servletapi.dist}"/>
  +    <mkdir dir="${servletapi.dist}/docs"/>
  +    <mkdir dir="${servletapi.dist}/docs/api"/>
  +    <mkdir dir="${servletapi.dist}/lib"/>
  +    <mkdir dir="${servletapi.dist}/src"/>
  +    <!-- "Library" Hierarchy -->
       <mkdir dir="${servletapi.lib}"/>
     </target>
   
  @@ -30,7 +38,7 @@
     <target name="javadoc" depends="prepare">
       <javadoc packagenames="javax.servlet.*"
                sourcepath="src/share"
  -             destdir="${servletapi.build}/servletapi-doc"
  +             destdir="${servletapi.build}/docs/api"
                use="true"
                windowtitle="Servlet and JavaServer Pages API Documentation"
                doctitle="Servlet and JavaServer Pages API Documentation"
  @@ -40,12 +48,13 @@
   
     <!-- ===================== Distribution Files ========================= -->
     <target name="dist" depends="compile,javadoc">
  -    <jar jarfile="${servletapi.dist}/servlet.jar"
  +    <copydir src="${servletapi.build}/docs/api"
  +            dest="${servletapi.dist}/docs/api"/>
  +    <jar jarfile="${servletapi.dist}/lib/servlet.jar"
            basedir="${servletapi.build}/classes"/>
  -    <zip zipfile="${servletapi.dist}/servletapi-doc.zip"
  -         basedir="${servletapi.build}"
  -         includes="servletapi-doc/**"/>
  -    <copyfile src="${servletapi.dist}/servlet.jar"
  +    <copyfile src="build.xml" dest="${servletapi.dist}/lib/build.xml"/>
  +    <copydir src="src/share" dest="${servletapi.dist}/src"/>
  +    <copyfile src="${servletapi.dist}/lib/servlet.jar"
                 dest="${servletapi.lib}/servlet.jar"/>
     </target>