cvs commit: jakarta-commons-sandbox/services/src/conf MANIFEST.MF

[cr...@apache.org]

craigmcc    02/02/23 13:19:34

  Modified:    services build.xml
               services/src/conf MANIFEST.MF
  Log:
  Tweak the build process for consistency:
  - Parametric replacements in MANIFEST.MF
  - Include Apache License in META-INF directory of the JAR
  - Avoid JavaDoc warnings by passing the classpath
  - Source is packaged by itself, doesn't need to be in "dist" target
  
  Revision  Changes    Path
  1.4       +21 -9     jakarta-commons-sandbox/services/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/services/build.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- build.xml	30 Jan 2002 09:27:19 -0000	1.3
  +++ build.xml	23 Feb 2002 21:19:33 -0000	1.4
  @@ -3,7 +3,7 @@
   
   <!--
           "Services" component of the Jakarta Commons Subproject
  -        $Id: build.xml,v 1.3 2002/01/30 09:27:19 oalexeev Exp $
  +        $Id: build.xml,v 1.4 2002/02/23 21:19:33 craigmcc Exp $
   -->
   
   
  @@ -35,6 +35,9 @@
     <!-- The name of this component -->
     <property name="component.name"          value="services"/>
   
  +  <!-- The primary package name of this component -->
  +  <property name="component.package"       value="org.apache.commons.services"/>
  +
     <!-- The title of this component -->
     <property name="component.title"         value="Service Manager Library"/>
   
  @@ -70,11 +73,13 @@
   
     <!-- Construct compile classpath -->
     <path id="compile.classpath">
  -    <pathelement location="${commons-collections.jar}"/>
       <pathelement location="${commons-beanutils.jar}"/>
  +    <pathelement location="${commons-collections.jar}"/>
       <pathelement location="${commons-digester.jar}"/>
       <pathelement location="${commons-logging.jar}"/>
       <pathelement location="${commons-pool.jar}"/>
  +    <pathelement location="${crimson.jar}"/>
  +    <pathelement location="${jaxp.jar}"/>
     </path>
   
     <!-- Construct unit test classpath -->
  @@ -103,6 +108,7 @@
     <target name="init" description="Initialize and evaluate conditionals">
       <echo message="-------- ${component.title} ${component.version} --------"/>
       <filter  token="name"                  value="${component.name}"/>
  +    <filter  token="package"               value="${component.package}"/>
       <filter  token="version"               value="${component.version}"/>
     </target>
   
  @@ -114,6 +120,10 @@
       <mkdir dir="${build.home}/docs"/>
       <mkdir dir="${build.home}/docs/api"/>
       <mkdir dir="${build.home}/tests"/>
  +    <tstamp/>
  +    <copy todir="${build.home}/conf" filtering="on">
  +      <fileset dir="${conf.home}" includes="*.MF"/>
  +    </copy>
     </target>
   
    
  @@ -155,7 +165,9 @@
                   version="true"
                  doctitle="&lt;h1&gt;${component.title}&lt;/h1&gt;"
               windowtitle="${component.title} (Version ${component.version})"
  -                 bottom="Copyright (c) 2001 - Apache Software Foundation"/>
  +                 bottom="Copyright (c) 2001 - Apache Software Foundation">
  +      <classpath refid="compile.classpath"/>
  +    </javadoc>
     </target>
   
   
  @@ -165,12 +177,12 @@
       <mkdir      dir="${dist.home}"/>
       <copy      file="../LICENSE"
                 todir="${dist.home}"/>
  +    <mkdir      dir="${build.home}/classes/META-INF"/>
  +    <copy      file="../LICENSE"
  +             tofile="${build.home}/classes/META-INF/LICENSE.txt"/>
       <jar    jarfile="${dist.home}/commons-${component.name}.jar"
  -            basedir="${build.home}/classes"/>
  -    <mkdir      dir="${dist.home}/src"/>
  -    <copy     todir="${dist.home}/src" filtering="on">
  -      <fileset  dir="${source.home}"/>
  -    </copy>
  +            basedir="${build.home}/classes"
  +           manifest="${build.home}/conf/MANIFEST.MF"/>
     </target>
   
   <!-- ========== Testing section ======================================== -->
  @@ -199,4 +211,4 @@
     </target>
   
   
  -</project>
  \ No newline at end of file
  +</project>
  
  
  
  1.2       +2 -7      jakarta-commons-sandbox/services/src/conf/MANIFEST.MF
  
  Index: MANIFEST.MF
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/services/src/conf/MANIFEST.MF,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- MANIFEST.MF	20 Dec 2001 16:20:28 -0000	1.1
  +++ MANIFEST.MF	23 Feb 2002 21:19:34 -0000	1.2
  @@ -1,10 +1,5 @@
  -Manifest-Version: 1.0
  -Extension-Name: ServiceManager
  -Specification-Title: ServiceManager
  +Extension-Name: @package@
   Specification-Vendor: Apache Software Foundation
   Specification-Version: 1.0
  -Implementation-Title: ServiceManager
   Implementation-Vendor: Apache Software Foundation
  -Implementation-Vendor-Id: org.apache
  -Implementation-Version: 0.1
  -
  +Implementation-Version: @version@
  
  
  

--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>