xml-commons-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From curc...@apache.org
Subject cvs commit: xml-commons/java/src/org/apache/xml/resolver Version.src
Date Thu, 07 Nov 2002 15:06:31 GMT
curcuru     2002/11/07 07:06:31

  Modified:    java     resolver.xml
               java/src manifest.resolver
  Added:       java/src/org/apache/xml/resolver Version.src
  Log:
  For xml-commons-resolver, add a "dist" target and an
  org.apache.xml.resolver.Version file; use filtered @impl.version@
  
  Revision  Changes    Path
  1.2       +44 -14    xml-commons/java/resolver.xml
  
  Index: resolver.xml
  ===================================================================
  RCS file: /home/cvs/xml-commons/java/resolver.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- resolver.xml	30 Jan 2002 12:25:53 -0000	1.1
  +++ resolver.xml	7 Nov 2002 15:06:30 -0000	1.2
  @@ -8,7 +8,7 @@
     <!-- Name and version information -->
     <property name="name.resolver" value="xml-commons-resolver"/>
     <property name="impl.name" value="XmlResolver"/>
  -  <property name="impl.version" value="${version}"/>
  +  <property name="impl.version" value="1.0"/>
   
     <!-- Allow properties following these statements to be overridden -->
     <!-- Note that all of these don't have to exist.  They've just been defined
  @@ -28,6 +28,7 @@
     <property name="docs.user.dir" value="${docs.dir}/docs"/>
     <property name="docs.java.dir" value="${docs.user.dir}/javadocs"/>
     <property name="docs.printer.dir" value="${docs.user.dir}/printer"/>
  +  <property name="dist.basename" value="${name.resolver}-${impl.version}"/> 
   
     <!-- Source constants and directories -->
     <property name="src.dir" value="src" />
  @@ -47,18 +48,18 @@
     <!-- Document constants -->
     <property name="company.name" value="Apache"/>
   
  -  <property name="copyright.date" value="2001"/>
  +  <property name="copyright.date" value="2001-2002"/>
     <property name="copyright.message"
               value="Copyright &#169; ${copyright.date} ${company.name}. All Rights Reserved."/>
   
     <!-- Public Targets -->
     <target name="main"
  -          depends="all, check"
  +          depends="all,check"
             description="Alias for all, check."/>
   
     <target name="all"
             depends="jar,docs,javadocs"
  -          description="This is the default target.  Compiles the program.">
  +          description="This is the default target.  Compiles the program and docs.">
     </target>
   
     <target name="compile" depends="init"
  @@ -93,6 +94,7 @@
     <target name="clean"
             description="Deletes all files that are generated by the build.">
       <delete dir="${build.dir}"/>
  +    <delete file="${src.dir}/${resolver.subdir}/Version.java"/>
     </target>
   
     <target name="distclean"
  @@ -101,7 +103,7 @@
     </target>
   
     <target name="docs"
  -          depends="javadocs, printerdocs"
  +          depends="javadocs"
             description="Generates all documentation for a project.">
     </target>
   
  @@ -112,7 +114,7 @@
       <mkdir dir="${docs.java.dir}"/>
   	  <javadoc sourcepath="${src.dir}"
   		   destdir="${docs.java.dir}"
  -                   Overview="${src.dir}/org/apache/xml/resolver/overview.html"
  +                   Overview="${src.dir}/${resolver.subdir}/overview.html"
                      author="true"
                      version="true"
                      use="true"
  @@ -127,16 +129,43 @@
   	  </javadoc>
     </target>
   
  -  <target name="printerdocs"
  -          depends="init"
  -          description="Generates a printer friendly version of the documentation.">
  -    <echo message="${name.resolver} currently doesn&apos;t have any user documents
in a printable format."/>
  -  </target>
  -
     <target name="dist"
             depends="all, docs"
             description="Generates all the artifacts used for a distribution.">
  -    <echo message="${name.resolver} currently doesn&apos;t support &apos;dist&apos;."/>
  +    <mkdir dir="${build.dir}/${dist.basename}"/>
  +    <mkdir dir="${build.dir}/${dist.basename}/src"/>
  +        
  +    <!-- Copy all sources and original source manifest -->
  +    <copy todir="${build.dir}/${dist.basename}/src">
  +      <fileset dir="${src.dir}" includes="${resolver.subdir}/"/>
  +      <fileset dir="${src.dir}" includes="manifest.resolver"/>
  +    </copy>  
  +
  +    <!-- Copy docs/javadocs -->
  +    <copy todir="${build.dir}/${dist.basename}/docs">
  +      <fileset dir="${docs.java.dir}"/>
  +    </copy>  
  +
  +    <!-- Copy pertinent top-level files and the .jar -->
  +    <copy todir="${build.dir}/${dist.basename}">
  +      <fileset dir=".." includes="KEYS,README.html,README.txt,LICENSE.txt"/>
  +      <fileset dir="." includes="resolver.xml"/>
  +    </copy>
  +    <copy todir="${build.dir}/${dist.basename}" file="${resolver.jar}"/>
  +
  +    <tar tarfile="${build.dir}/${dist.basename}.tar" >
  +      <tarfileset dir="${build.dir}">
  +        <include name="${dist.basename}/"/>
  +      </tarfileset>
  +    </tar>
  +
  +    <gzip zipfile="${build.dir}/${dist.basename}.tar.gz" src="${build.dir}/${dist.basename}.tar"/>
  +    <delete file="${build.dir}/${dist.basename}.tar" />
  +    <zip zipfile="${build.dir}/${dist.basename}.zip" >
  +      <zipfileset dir="${build.dir}">
  +        <include name="${dist.basename}/"/>
  +      </zipfileset>
  +    </zip>
     </target>
   
     <target name="test"
  @@ -166,6 +195,7 @@
       <filter token="impl.version" value="${impl.version}"/>
       <filter token="impl.name" value="${impl.name}"/>
       <copy todir="${build.dir}" file="${src.dir}/manifest.resolver" filtering="true"/>
  +    <copy tofile="${src.dir}/${resolver.subdir}/Version.java" file="${src.dir}/${resolver.subdir}/Version.src"
filtering="true"/>
     </target>
   
     <!-- Project specific Targets -->
  
  
  
  1.2       +1 -1      xml-commons/java/src/manifest.resolver
  
  Index: manifest.resolver
  ===================================================================
  RCS file: /home/cvs/xml-commons/java/src/manifest.resolver,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- manifest.resolver	30 Jan 2002 12:24:59 -0000	1.1
  +++ manifest.resolver	7 Nov 2002 15:06:31 -0000	1.2
  @@ -5,7 +5,7 @@
   Name: org/apache/xml/resolver
   Comment: xml-commons Resolver code
   Implementation-Title: org.apache.xml.resolver.Catalog
  -Implementation-Version: 1.0
  +Implementation-Version: @impl.version@
   Implementation-Vendor: Apache Software Foundation
   Implementation-URL: http://xml.apache.org/commons/
   
  
  
  
  1.1                  xml-commons/java/src/org/apache/xml/resolver/Version.src
  
  Index: Version.src
  ===================================================================
  /*
   * The Apache Software License, Version 1.1
   *
   *
   * Copyright (c) 2002 The Apache Software Foundation.  All rights 
   * reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, are permitted provided that the following conditions
   * are met:
   *
   * 1. Redistributions of source code must retain the above copyright
   *    notice, this list of conditions and the following disclaimer. 
   *
   * 2. Redistributions in binary form must reproduce the above copyright
   *    notice, this list of conditions and the following disclaimer in
   *    the documentation and/or other materials provided with the
   *    distribution.
   *
   * 3. The end-user documentation included with the redistribution,
   *    if any, must include the following acknowledgment:  
   *       "This product includes software developed by the
   *        Apache Software Foundation (http://www.apache.org/)."
   *    Alternately, this acknowledgment may appear in the software itself,
   *    if and wherever such third-party acknowledgments normally appear.
   *
   * 4. The names "Xalan" and "Apache Software Foundation" must
   *    not be used to endorse or promote products derived from this
   *    software without prior written permission. For written 
   *    permission, please contact apache@apache.org.
   *
   * 5. Products derived from this software may not be called "Apache",
   *    nor may "Apache" appear in their name, without prior written
   *    permission of the Apache Software Foundation.
   *
   * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
   * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
   * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
   * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
   * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
   * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
   * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
   * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
   * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
   * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
   * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
   * SUCH DAMAGE.
   * ====================================================================
   *
   * This software consists of voluntary contributions made by many
   * individuals on behalf of the Apache Software Foundation and was
   * originally based on software copyright (c) 1999, Lotus
   * Development Corporation., http://www.lotus.com.  For more
   * information on the Apache Software Foundation, please see
   * <http://www.apache.org/>.
   */
  package org.apache.xmlcommons;
  
  /**
   * <meta name="usage" content="general"/>
   * Administrative class to keep track of the version number of
   * xml-commons external sources releases.
   * See xml-commons/java/resolver.xml for filtering on 1.0, etc.
   */
  public class Version
  {
  
    /**
     * Get the version string for xml-commons-resolver.  
     * Version String formatted like: 
     * <CODE>"@impl.name@ v.r"</CODE>.
     *
     * @return String denoting our current version
     */
    public static String getVersion()
    {
      return getProduct()+" "+getVersionNum();
    }
  
    /**
     * Get just the product name.
     *
     * @return String denoting our product name
     */
    public static String getProduct()
    {
      return "@impl.name@";
    }
  
    /**
     * Get just the version number v.r.
     * @return String denoting our current version number
     */
    public static String getVersionNum()
    {
      return "@impl.version@";
    }
  
    /**
     * Print the release version to the command line.
     * @param argv command line arguments, unused.
     */
    public static void main(String argv[])
    {
      System.out.println(getVersion());
    }
  }
  
  
  

Mime
View raw message