commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From craig...@apache.org
Subject cvs commit: jakarta-commons/dbcp/src/conf MANIFEST.MF
Date Sat, 20 Jul 2002 18:02:27 GMT
craigmcc    2002/07/20 11:02:27

  Modified:    dbcp     build.xml
  Added:       dbcp/src/conf MANIFEST.MF
  Log:
  Add a version-stamped manifest to commons-dbcp.jar.
  
  PR: Bugzilla #10688
  Submitted by:	Arnaud Heritier <aheritier at sopragroup.com>
  
  Revision  Changes    Path
  1.10      +28 -12    jakarta-commons/dbcp/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/dbcp/build.xml,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- build.xml	29 Jun 2002 17:53:28 -0000	1.9
  +++ build.xml	20 Jul 2002 18:02:27 -0000	1.10
  @@ -48,25 +48,34 @@
         <property name="Name" value="Commons-DBCP"/>
         <property name="Name-Long" value="Jakarta Commons Database Connection Pool"/>
   
  +      <!-- The current version number of this component -->
  +      <property name="component.package" value="org.apache.commons.dbcp"/>
  +      <property name="component.version" value="1.0-dev"/>
  +      <filter  token="package"           value="${component.package}"/>
  +      <filter  token="version"           value="${component.version}"/>
  +
         <property name="test.entry" value="org.apache.commons.dbcp.TestAll"/>
         <property name="test.failonerror" value="true" />
         <property name="test.runner" value="junit.textui.TestRunner" />
   
         <property name="workdir" value="${java.io.tmpdir}/buildtemp_${DSTAMP}${TSTAMP}"/>
  -      <property name="source" value="${basedir}"/>
  -      <property name="source.src" value="${basedir}/src"/>
  +      <property name="source"          value="${basedir}"/>
  +      <property name="source.src"      value="${basedir}/src"/>
  +      <property name="source.src.conf" value="${source.src}/conf"/>
         <property name="source.src.java" value="${source.src}/java"/>
         <property name="source.src.test" value="${source.src}/test"/>
  -      <property name="source.doc" value="${basedir}/doc"/>
  -      <property name="dest" value="${basedir}/dist"/>
  -      <property name="dest.src" value="${dest}/src"/>
  +      <property name="source.doc"      value="${basedir}/doc"/>
  +      <property name="dest"         value="${basedir}/dist"/>
  +      <property name="dest.src"     value="${dest}/src"/>
         <property name="dest.classes" value="${dest}/classes"/>
  -      <property name="dest.doc" value="${dest}/docs"/>
  +      <property name="dest.conf"    value="${dest}/conf"/>
  +      <property name="dest.doc"     value="${dest}/docs"/>
         <property name="dest.doc.api" value="${dest.doc}/api"/>
  -      <property name="dest.jardir" value="${dest}"/>
  +      <property name="dest.jardir"  value="${dest}"/>
         <property name="dest.jardir.jar" value="${dest.jardir}/${name}.jar"/>
  -
  -      <available property="available-doc" file="${source.doc}"/> <!-- does this
module have docs? -->
  +      <available property="available-doc" file="${source.doc}"/> <!-- does this
  + module have docs? -->
  +      <available property="available-src-conf" file="${source.src.conf}"/> <!--
does this module have conf src? -->
         <available property="available-src-java" file="${source.src.java}"/> <!--
does this module have java src? -->
         <available property="available-src-test" file="${source.src.test}"/> <!--
does this module have test src? -->
         <available property="jndi.present" classname="javax.naming.Context"/>
  @@ -85,6 +94,13 @@
         </copy>
      </target>
   
  +   <target name="copy-conf" depends="init" if="available-src-conf">
  +      <mkdir  dir="${dest.conf}"/>
  +      <copy todir="${dest.conf}" filtering="yes">
  +         <fileset dir="${source.src.conf}"/>
  +      </copy>
  +   </target>
  +
      <target name="copy-doc" depends="init" if="available-doc">
         <mkdir dir="${doc-source-dir}/${name}"/>
         <copy todir="${doc-source-dir}/${name}" filtering="no">
  @@ -248,7 +264,7 @@
   
      <!-- ######################################################### -->
   
  -   <target name="dist" depends="dist-jar,doc" description="builds binary distribution"/>
  +   <target name="dist" depends="copy-conf,dist-jar,doc" description="builds binary distribution"/>
   
      <target name="dist-jar" depends="build">
         <mkdir dir="${dest.jardir}"/>
  @@ -258,7 +274,7 @@
               <patternset refid="patternset-non-test-classes"/>
            </fileset>
         </copy>
  -      <jar jarfile="${dest.jardir.jar}">
  +      <jar jarfile="${dest.jardir.jar}" manifest="${dest.conf}/MANIFEST.MF">
            <fileset dir="${workdir}"/>
         </jar>
         <delete dir="${workdir}"/>
  
  
  
  1.1                  jakarta-commons/dbcp/src/conf/MANIFEST.MF
  
  Index: MANIFEST.MF
  ===================================================================
  Extension-Name: @package@
  Specification-Vendor: Apache Software Foundation
  Specification-Version: 1.0
  Implementation-Vendor: Apache Software Foundation
  Implementation-Version: @version@
  
  
  

--
To unsubscribe, e-mail:   <mailto:commons-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:commons-dev-help@jakarta.apache.org>


Mime
View raw message