You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by ne...@apache.org on 2001/11/26 23:39:21 UTC

cvs commit: xml-xerces/java build.xml

neilg       01/11/26 14:39:21

  Modified:    java     build.xml
  Log:
  checking in changes to split up APIs and implementation into separate JAR files.
  
  Revision  Changes    Path
  1.63      +104 -26   xml-xerces/java/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/xml-xerces/java/build.xml,v
  retrieving revision 1.62
  retrieving revision 1.63
  diff -u -r1.62 -r1.63
  --- build.xml	2001/10/24 05:27:21	1.62
  +++ build.xml	2001/11/26 22:39:21	1.63
  @@ -12,7 +12,7 @@
   Copyright:
     Copyright (c) 2000 The Apache Software Foundation.
   
  -   $Id: build.xml,v 1.62 2001/10/24 05:27:21 andyc Exp $
  +   $Id: build.xml,v 1.63 2001/11/26 22:39:21 neilg Exp $
   
   ==================================================================== -->
   
  @@ -26,7 +26,9 @@
       <property name='parser.version' value='2.0.0.beta3'/>
       <property name='parser_version' value='2_0_0_beta3'/>
   
  -    <property name='jar.parser' value='xerces.jar'/>
  +    <property name='oldjar.parser' value='xerces.jar'/>
  +    <property name='jar.apis' value='xmlParserAPIs.jar'/>
  +    <property name='jar.parser' value='xercesImpl.jar'/>
       <property name='jar.samples' value='xercesSamples.jar'/>
   
       <property name="year" value="1999-2001"/>
  @@ -40,6 +42,7 @@
       <property name="deprecation" value="off"/>
   
       <property name="src.dir" value="./src"/>
  +    <property name="tools.dir" value="./tools"/>
       <property name="docs.dir" value="./docs"/>
       <property name="data.dir" value="./data"/>
       <property name="samples.dir" value="./samples"/>
  @@ -64,6 +67,7 @@
       <property name="build.javadocs" value="${build.dir}/docs/javadocs"/>
   
       <property name="distsrc.dir" value="${build.dir}/${parser.shortname}-${parser_version}"/>
  +    <property name="disttools.dir" value="${build.dir}/tools"/>
       <property name="distbin.dir" value="${build.dir}/${parser.shortname}-${parser_version}"/>
   
       <filter token="year" value="${year}"/>
  @@ -86,16 +90,22 @@
       <echo message=" available targets are:"/>
       <echo message=""/>
       <echo message="   compile  --> compiles the source code"/>
  -    <echo message="   jar      --> generates the xerces.jar file"/>
  +    <echo message="   jar      --> generates the xercesImpl.jar file"/>
  +    <echo message="   oldjar      --> generates the old-style xerces.jar file"/>
       <echo message="   samples  --> compiles the samples source code"/>
       <echo message="   tests    --> compiles the tests source code"/>
       <echo message="   sampjar  --> generates the xercesSamples.jar file"/>
  -    <echo message="   jars     --> generates the xerces and xercesSamples jar files"/>
  +    <echo message="   apijar  --> generates the xmlParserAPIs.jar file"/>
  +    <echo message="   oldjars     --> generates the xerces and xercesSamples jar files"/>
  +    <echo message="   jars     --> generates the xercesImpl, xercesSamples and xmlParserAPIs jar files"/>
       <echo message="   docs     --> generates the HTML documentation"/>
       <echo message="   javadocs --> generates the API documentation (needs Java 1.2 or higher)"/>
  +    <echo message="   pack-tools --> generates the tools distributions of Xerces-Java (zip and tar.gz)"/>
       <echo message="   pack-src --> generates the source distributions of Xerces-Java (zip and tar.gz)"/>
  +    <echo message="   oldpack-bin --> generates the old-style binary distributions of Xerces-Java (zip and tar.gz)"/>
       <echo message="   pack-bin --> generates the binary distributions of Xerces-Java (zip and tar.gz)"/>
  -    <echo message="   all      --> generates the binary and source distributions of Xerces-Java"/>
  +    <echo message="   all      --> generates the binary, source and tools distributions of Xerces-Java"/>
  +    <echo message="   oldall      --> generates the binary, source and tools distributions of Xerces-Java with the old-style xerces.jar"/>
       <echo message="   test     --> runs a sanity test on the sample files"/>
       <echo message="   clean    --> cleans up all generated files and directories"/>
       <echo message="   usage    --> provides help on using the build tool (default)"/>
  @@ -144,7 +154,7 @@
       
       <!-- substitute tokens as needed -->
       <replace file="${build.dir}/src/org/apache/xerces/impl/Version.java" 
  -             token="@@VERSION@@" value="${parser.Version}"/>
  +             token="@@VERSION@@" value="${parser.Name} ${parser.Version}"/>
     </target>
   
     <!-- =================================================================== -->
  @@ -168,13 +178,33 @@
     </target>
   
     <!-- =================================================================== -->
  -  <!-- Creates the class package                                           -->
  +  <!-- Creates the omnibus class package                                           -->
  +  <!-- =================================================================== -->
  +  <target name="oldjar" depends="compile">
  +    <jar jarfile="${build.dir}/${oldjar.parser}"
  +         basedir="${build.dest}"
  +         compress="false"
  +         includes="org/**, javax/**,META-INF/**"/>
  +  </target>
  +
     <!-- =================================================================== -->
  +  <!-- Creates the implementation class package                                           -->
  +  <!-- =================================================================== -->
     <target name="jar" depends="compile">
       <jar jarfile="${build.dir}/${jar.parser}"
            basedir="${build.dest}"
            compress="false"
  -         includes="org/**, javax/**,META-INF/**"/>
  +         includes="org/apache/**"/>
  +  </target>
  +
  +  <!-- =================================================================== -->
  +  <!-- Creates the API class package                                           -->
  +  <!-- =================================================================== -->
  +  <target name="apijar" depends="compile">
  +    <jar jarfile="${build.dir}/${jar.apis}"
  +         basedir="${build.dest}"
  +         compress="false"
  +         includes="org/xml/**, org/w3c/**, javax/**,META-INF/**"/>
     </target>
   
     <!-- =================================================================== -->
  @@ -377,29 +407,40 @@
       <delete file="${build.dir}/${parser.Name}-src.${parser.version}.tar"/>
     </target>
   
  -  <!-- Prepares the tools distribution -->
  -  <target name="tools" depends="init">
  +  <!-- =================================================================== -->
  +  <!-- Prepares the tools distribution                                    -->
  +  <!-- =================================================================== -->
  +  <target name="pack-tools" depends="init">
       <echo message="Building the tools distribution files (zip,tar)"/>
  -    <delete dir="${distbin.dir}"/>
  -    <mkdir dir="${distbin.dir}"/>
  -    <mkdir dir="${distbin.dir}/tools"/>
  -    <copy todir="${distbin.dir}/tools" >
  -        <fileset dir="tools"/>
  +    <mkdir dir="${disttools.dir}"/>
  +
  +    <copy todir="${disttools.dir}" >
  +        <fileset
  +            dir="${tools.dir}"  
  +            includes="ant*, **/*.bat, *.jar"
  +            excludes="**/CVS*, **/.#*, **/*.class"
  +        />
       </copy>
  +
       <zip zipfile="${build.dir}/${parser.Name}-tools.${parser.version}.zip" 
            basedir="${build.dir}"
  -         includes="${parser.shortname}-${parser_version}/**"/>
  +         includes="tools/**"/>
  +
       <tar tarfile="${build.dir}/${parser.Name}-tools.${parser.version}.tar" 
            basedir="${build.dir}"
  -         includes="${parser.shortname}-${parser_version}/**"/>
  +         includes="tools/**"/>
       <gzip zipfile="${build.dir}/${parser.Name}-tools.${parser.version}.tar.gz"
             src="${build.dir}/${parser.Name}-tools.${parser.version}.tar" />
  +    <!-- and why not get rid of the un-gzip'd tarball and save ourselves Mb? -->
  +    <delete file="${build.dir}/${parser.Name}-tools.${parser.version}.tar"/>
  +    <!-- and delete the directory:  -->
  +    <delete dir="${disttools.dir}"/>
     </target>
   
     <!-- =================================================================== -->
  -  <!-- Prepares the binary distribution                                    -->
  +  <!-- Prepares common parts of the binary distributions                                    -->
     <!-- =================================================================== -->
  -  <target name="pack-bin" depends="jars, javadocs, docs">
  +  <target name="pack-bin-common" depends="javadocs, docs">
   
       <echo message="Building the binary distribution files (zip,tar)"/>
       <delete dir="${distbin.dir}"/>
  @@ -433,12 +474,11 @@
           <fileset dir="${build.dir}/docs/javadocs/other" />
       </copy>
   
  -    <copy file="${build.dir}/${jar.parser}" tofile="${distbin.dir}/${jar.parser}"/>
  -    <copy file="${build.dir}/${jar.samples}" tofile="${distbin.dir}/${jar.samples}"/>
  -
       <copy file="LICENSE" tofile="${distbin.dir}/LICENSE"/>
       <copy file="Readme.html" tofile="${distbin.dir}/Readme.html"/>
   
  +    <copy file="${build.dir}/${jar.samples}" tofile="${distbin.dir}/${jar.samples}"/>
  +
       <copy todir="${distsrc.dir}/samples" >
           <fileset
               dir="${samples.dir}"
  @@ -447,7 +487,33 @@
       </copy>
   
       <copydir src="${samples.dir}" dest="${distsrc.dir}/samples" excludes="**/CVS*, **/*.#*"/>
  +  </target>
  +
  +  <!-- =================================================================== -->
  +  <!-- Prepares the binary distribution                                    -->
  +  <!-- =================================================================== -->
  +  <target name="pack-bin" depends="pack-bin-common, jars">
  +    <copy file="${build.dir}/${jar.parser}" tofile="${distbin.dir}/${jar.parser}"/>
  +    <copy file="${build.dir}/${jar.apis}" tofile="${distbin.dir}/${jar.apis}"/>
  +
  +    <zip zipfile="${build.dir}/${parser.Name}-bin.${parser.version}.zip" 
  +         basedir="${build.dir}"
  +         includes="${parser.shortname}-${parser_version}/**" excludes="*.class"/>
  +    <tar tarfile="${build.dir}/${parser.Name}-bin.${parser.version}.tar" 
  +         basedir="${build.dir}"
  +         includes="${parser.shortname}-${parser_version}/**" excludes="*.class"/>
  +    <gzip zipfile="${build.dir}/${parser.Name}-bin.${parser.version}.tar.gz"
  +          src="${build.dir}/${parser.Name}-bin.${parser.version}.tar" />
  +    <!-- as before, let's kill of the ungzip'd tarball! -->
  +    <delete file="${build.dir}/${parser.Name}-bin.${parser.version}.tar"/>
  +
  +  </target>
   
  +  <!-- =================================================================== -->
  +  <!-- Prepares the old binary distribution                                    -->
  +  <!-- =================================================================== -->
  +  <target name="oldpack-bin" depends="pack-bin-common, oldjars">
  +    <copy file="${build.dir}/${oldjar.parser}" tofile="${distbin.dir}/${oldjar.parser}"/>
   
       <zip zipfile="${build.dir}/${parser.Name}-bin.${parser.version}.zip" 
            basedir="${build.dir}"
  @@ -518,16 +584,28 @@
        -->
     </target>
   
  +  <!-- =================================================================== -->
  +  <!-- Builds both old xerces and sample jar files                             -->
  +  <!-- =================================================================== -->
  +  <target name="oldjars" depends="oldjar, sampjar">
  +  </target>
  +
  +  <!-- =================================================================== -->
  +  <!-- Builds xercesImpl, xmlParserAPIs and sample jar files                             -->
  +  <!-- =================================================================== -->
  +  <target name="jars" depends="jar, sampjar, apijar">
  +  </target>
  +
     <!-- =================================================================== -->
  -  <!-- Builds both xerces and sample jar files                             -->
  +  <!-- Builds and packages tools, sources and binary distributions                -->
     <!-- =================================================================== -->
  -  <target name="jars" depends="jar, sampjar">
  +  <target name="all" depends="pack-src, pack-bin, pack-tools">
     </target>
   
     <!-- =================================================================== -->
  -  <!-- Builds and packages sources and binary distributions                -->
  +  <!-- Builds and packages tools, sources and binary distributions                -->
     <!-- =================================================================== -->
  -  <target name="all" depends="pack-src, pack-bin">
  +  <target name="oldall" depends="pack-src, oldpack-bin, pack-tools">
     </target>
   
     <target name="prepare-schema-src">
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: xerces-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xerces-cvs-help@xml.apache.org