You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commons-cvs@xml.apache.org by cu...@apache.org on 2002/02/06 12:58:46 UTC

cvs commit: xml-commons/java/external build.xml

curcuru     02/02/06 03:58:46

  Modified:    java/external build.xml
  Log:
  Now puts various LICENSE files in our exportsrc tar.gz and in the xml-apis.jar itself
  
  Revision  Changes    Path
  1.6       +45 -7     xml-commons/java/external/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/xml-commons/java/external/build.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- build.xml	9 Jan 2002 20:01:23 -0000	1.5
  +++ build.xml	6 Feb 2002 11:58:46 -0000	1.6
  @@ -7,8 +7,10 @@
   <project name="xml-commons-external" default="jar" >
   
     <!-- Name and version information -->
  -  <property name="name.external" value="xml-commons-external"/>
  +  <property name="name.external" value="xml-apis"/>
     <property name="impl.name" value="XmlCommons"/>
  +  <!-- If no external version is provided, don't use one -->
  +  <property name="version" value=""/>
     <property name="impl.version" value="${version}"/>
   
     <!-- Location of the system's temporary directory; all output sent here -->
  @@ -25,16 +27,31 @@
     <property name="src.dir" value="src" />
     <property name="docs.dir" value="xdocs" />
     <property name="api.jar.location" value="${build.dir}" />
  -  <property name="api.jar.name" value="xml-apis.jar" />
  +  <property name="api.jar.name" value="${name.external}.jar" />
     <property name="api.jar" value="${api.jar.location}/${api.jar.name}" />
   
  -  <target name="all" depends="jar,javadoc"
  -    description="Jar external classes and create javadoc">
  +  <!-- License and readme files of various types -->
  +  <property name="licenses.external.dir" value="."/>
  +  <patternset id="licenses.external">
  +    <include name="LICENSE.dom-documentation.txt" />
  +    <include name="LICENSE.dom-software.txt" />
  +    <include name="README.dom.txt" />
  +    <include name="LICENSE.sax.txt" />
  +    <include name="README.sax.txt" />
  +  </patternset>
  +  <property name="licenses.asf.dir" value="../.."/>
  +  <patternset id="licenses.asf" >
  +    <include name="LICENSE.txt" />
  +    <include name="README.txt" />
  +  </patternset>
  +
  +  <target name="all" depends="jar,javadoc,exportsrc"
  +    description="Jar external classes, create javadoc, create sources.tar.gz">
     </target>
   
     <target name="prepare" 
       description="Create build output directories">
  -    <echo message="Building ${name.external} (version: ${impl.version}) Buildfile: $Revision: 1.5 $"/>
  +    <echo message="Building ${name.external} (version: ${impl.version}) Buildfile: $Revision: 1.6 $"/>
       <mkdir dir="${build.classes.dir}" />
       <mkdir dir="${build.docs.dir}" />
       <mkdir dir="${build.javadocs.dir}" />
  @@ -54,6 +71,19 @@
     <target name="jar" depends="compile"
       description="Jar all classes">
       <echo message="Jarring ${api.jar} from ${build.classes.dir}" />
  +
  +    <!-- Copy various licenses so they appear in the .jar file -->
  +    <property name="jar-licenses" value="${build.classes.dir}/license" />
  +    <mkdir dir="${jar-licenses}" />
  +    <copy todir="${jar-licenses}">
  +      <fileset dir="${licenses.external.dir}">
  +        <patternset refid="licenses.external"/>
  +      </fileset>
  +      <fileset dir="${licenses.asf.dir}">
  +        <patternset refid="licenses.asf"/>
  +      </fileset>
  +    </copy>
  +
       <jar jarfile="${api.jar}" 
           basedir="${build.classes.dir}" 
           manifest="${build.dir}/manifest.commons"  />
  @@ -67,8 +97,9 @@
         version="yes" 
         windowtitle="${external.javadoc.title}" 
         doctitle="${external.javadoc.title}"
  -      bottom="This document is in the PUBLIC DOMAIN and comes with NO WARRANTY of any kind."
       />
  +    <!-- Legal question: what should the bottom= copyright line be
  +         for this mixed set of javadocs? -->
       <!-- Just copy existing .html files over as well -->
       <copy todir="${build.docs.dir}">
         <fileset dir="${docs.dir}"/>
  @@ -77,7 +108,8 @@
   
     <target name="exportsrc" depends="prepare"
       description="Create a simple distribution of sources">
  -    <!-- Note: this not a complete public distro layout yet! -sc -->
  +    <!-- Note: this *only* a copy of the .java sources that 
  +         go into our .jar file, not all our sources! -->
   
       <patternset id="external-srcs" >
       <!-- Relative to external/src, which is ${src.dir}  -->
  @@ -91,6 +123,12 @@
         </tarfileset>
         <tarfileset dir="${build.dir}">
           <include name="manifest.commons"/>
  +      </tarfileset>
  +      <tarfileset dir="${licenses.external.dir}">
  +        <patternset refid="licenses.external"/>
  +      </tarfileset>
  +      <tarfileset dir="${licenses.asf.dir}">
  +        <patternset refid="licenses.asf"/>
         </tarfileset>
       </tar>
       <gzip src="${build.dir}/${name.external}-${impl.version}-src.tar" zipfile="${build.dir}/${name.external}-${impl.version}-src.tar.gz"/>