vmassol     02/04/22 15:18:51

  Modified:    anttasks build.xml
  Removed:     anttasks/conf manifest
  Log:
  removed need for manifest file defined externally
  
  Revision  Changes    Path
  1.17      +17 -12    jakarta-cactus/anttasks/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-cactus/anttasks/build.xml,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- build.xml 21 Apr 2002 22:41:14 -0000      1.16
  +++ build.xml 22 Apr 2002 22:18:51 -0000      1.17
  @@ -77,7 +77,6 @@
       <property name="target.dir" value="${base.dir}/target"/>
       <property name="target.classes.dir" value="${target.dir}/classes"/>
       <property name="target.classes.java.dir" value="${target.classes.dir}/java"/>
  -    <property name="target.conf.dir" value="${target.dir}/conf"/>
       <property name="target.doc.dir" value="${target.dir}/doc"/>
       <property name="target.doc.api.dir" value="${target.doc.dir}/api"/>
   
  @@ -124,11 +123,6 @@
   
           <tstamp/>
   
  -        <!-- Filters -->
  -        <filter token="version" value="${project.version}"/>
  -        <filter token="project.name.text" value="${project.name.text}"/>
  -        <filter token="project.name.file" value="${project.name.file}"/>
  -
       </target>
   
       <!--
  @@ -152,14 +146,25 @@
       -->
       <target name="jar" depends="compile" description="Generate the library jar">
   
  -        <mkdir dir="${target.conf.dir}"/>
  +        <jar jarfile="${target.dir}/${anttasks.jar.name}.jar">
   
  -        <!-- Copy the manifest in order to replace the version token filter -->
  -        <copy todir="${target.conf.dir}" file="${conf.dir}/manifest"
  -            filtering="on"/>
  +            <manifest>
  +                <section name="org/apache/cactus/ant/">
  +                    <attribute name="Specification-Title"
  +                        value="${project.name.text}"/>
  +                    <attribute name="Specification-Version"
  +                        value="${project.version}"/>
  +                    <attribute name="Specification-Vendor"
  +                        value="Apache Software Foundation"/>
  +                    <attribute name="Implementation-Title"
  +                        value="${project.name.file}"/>
  +                    <attribute name="Implementation-Version"
  +                        value="${project.version} ${TODAY}"/>
  +                    <attribute name="Implementation-Vendor"
  +                        value="Apache Software Foundation"/>
  +                </section>
  +            </manifest>
   
  -        <jar jarfile="${target.dir}/${anttasks.jar.name}.jar"
  -          manifest="${target.conf.dir}/manifest">
               <metainf dir=".">
                   <include name="LICENSE.cactus"/>
               </metainf>
  
  
  

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

Reply via email to