jmcnally    02/01/26 14:24:47

  Modified:    jdbc2pool build.xml default.properties
  Log:
  added a dist target.
  did some other small cleanup of properties
  
  Revision  Changes    Path
  1.2       +27 -20    jakarta-commons-sandbox/jdbc2pool/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/jdbc2pool/build.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- build.xml 15 Jan 2002 02:50:44 -0000      1.1
  +++ build.xml 26 Jan 2002 22:24:47 -0000      1.2
  @@ -220,12 +220,10 @@
     <!-- J A R                                                              -->
     <!-- ================================================================== -->
   
  -  <target
  -    name="jar"
  -    depends="compile"
  -    description="==> generates the jdbc2pool.jar">
  +  <target name="jar" depends="compile"
  +    description="Generate the jdbc2pool.jar">
   
  -    <jar jarfile="${build.dir}/${final.name}.jar">
  +    <jar jarfile="${build.dir}/${jar}">
         <fileset dir="${build.dest}">
           <exclude name="**/package.html"/>
         </fileset>
  @@ -236,38 +234,47 @@
     <!-- J A V A D O C S                                                    -->
     <!-- ================================================================== -->
   
  -  <target
  -    name="javadocs"
  -    depends="prepare"
  -    description="==> generates the API documentation">
  -
  -    <mkdir dir="${docs.dest}/api"/>
  +  <target name="javadoc" depends="prepare"
  +    description="Generate the API documentation">
   
  +    <mkdir dir="${dist.home}/docs/api"/>
       <javadoc
         sourcepath="${src.dir}/java"
         packagenames="${package}.*"
  -      destdir="${javadoc.destdir}"
  +      destdir="${dist.home}/docs/api"
         author="true"
         private="true"
         version="true"
         use="true"
  -      windowtitle="${name} ${version} API"
  -      doctitle="${name} ${version} API"
  +      windowtitle="${name} (Version ${version}) API"
  +      doctitle="&lt;h1&gt;${name} ${version} API&lt;/h1&gt;"
         bottom="Copyright &amp;copy; ${year} Apache Software Foundation. All Rights 
Reserved.">
         <classpath refid="classpath"/>
  +<!--
         <classpath path="${ant.home}/lib/ant.jar"/>
  +-->
       </javadoc>
     </target>
   
  +
     <!-- ================================================================== -->
  -  <!-- C L E A N                                                          -->
  +  <!-- D I S T                                                            -->
     <!-- ================================================================== -->
   
  -  <target
  -    name="clean"
  -    description="==> cleans up the build directory">
  +  <target name="dist" depends="jar,javadoc"
  +      description="Create binary distribution">
  +      <copy file="./LICENSE" todir="${dist.home}"/>
  +      <copy file="${build.dir}/${jar}" todir="${dist.home}"/>
  +  </target>
  +
  +  <!-- ================================================================== -->
  +  <!-- C L E A N                                                          -->
  +  <!-- ================================================================== -->
   
  -    <delete dir="${build.dir}"/>
  +  <target name="clean"
  +      description="Clean build and distribution directories">
  +      <delete dir="${build.dir}"/>
  +      <delete dir="${dist.home}"/>
     </target>
   
     <!-- ================================================================== -->
  @@ -281,7 +288,7 @@
   
       <copy todir="${lib.repo}" filtering="no">
         <fileset dir="${build.dir}">
  -        <include name="${final.name}.jar"/>
  +        <include name="${jar}"/>
         </fileset>
       </copy>
     </target>
  
  
  
  1.2       +4 -5      jakarta-commons-sandbox/jdbc2pool/default.properties
  
  Index: default.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/jdbc2pool/default.properties,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- default.properties        15 Jan 2002 02:50:44 -0000      1.1
  +++ default.properties        26 Jan 2002 22:24:47 -0000      1.2
  @@ -9,9 +9,8 @@
   name = Jdbc2Pool
   project = jdbc2pool
   version = 1.0-dev
  -package = org.apache.${project}
  -final.name = ${project}-${version}
  -jdbc2pool.jar = ${final.name}.jar
  +package = org.apache.commons.${project}
  +jar = ${project}-${version}.jar
   
   build.dir = ./bin
   build.dest = ${build.dir}/classes
  @@ -19,9 +18,9 @@
   src.dir = ./src
   test.dir = ${src.dir}/test
   test.libDir = ${build.test}/lib
  -javadoc.destdir = ./docs/api
  +dist.home = ./dist
   
  -year = 1999-2001
  +year = 1999-2002
   debug = on
   optimize = off
   deprecation = on
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

Reply via email to