You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ant.apache.org by ru...@locus.apache.org on 2000/02/03 04:29:13 UTC

cvs commit: jakarta-ant build.xml

rubys       00/02/02 19:29:13

  Modified:    .        build.xml
  Log:
  Place dist in the same place as the other jakarta projects.
  
  Restore original name of ant.jar as it is used in the ant batch and
  shell scripts, as well as in numerous other build.* files.
  
  Revision  Changes    Path
  1.6       +3 -3      jakarta-ant/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/build.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- build.xml	2000/01/30 17:15:32	1.5
  +++ build.xml	2000/02/03 03:29:13	1.6
  @@ -19,7 +19,7 @@
       <property name="build.dir" value="build"/>
       <property name="build.classes" value="build/classes"/>
       <property name="build.javadocs" value="build/javadocs"/>
  -    <property name="dist.dir" value="dist"/>
  +    <property name="dist.dir" value="../dist/ant"/>
      
       <property name="classpath" value="lib/xml.jar"/>
       <property name="packages" value="org.apache.tools.ant.*"/>
  @@ -112,7 +112,7 @@
        <copyfile src="TODO" dest="${dist.dir}/TODO"/>
        <copyfile src="LICENSE" dest="${dist.dir}/LICENSE"/>
   
  -     <jar jarfile="${name}-${version}.jar" basedir="${dist.dir}" items="."/>     
  +     <jar jarfile="${name}.jar" basedir="${dist.dir}" items="."/>     
     </target>
   
     <!-- =================================================================== -->
  @@ -129,7 +129,7 @@
     <target name="total-clean" depends="clean">
       <deltree dir="${bin.dir}"/>
       <delete file="${lib.dir}/${name}.jar"/>
  -    <delete file="${name}-${version}.jar"/>
  +    <delete file="${name}.jar"/>
     </target>
   
     <!-- in progress ! (may not work) -->
  
  
  

RE: cvs commit: jakarta-ant build.xml

Posted by Conor MacNeill <co...@m64.com>.
I must admit I actually liked the dist directory where it was. It seems
strange to me to have the dist directory going "out" of the project's
directory structure (via ../). Seems like a violation of scoping principles
:-) The same really applies to the tomcat and watchdog builds. I would like
to see those built in their own areas too. If required a top level jakarta
build.xml file used to build all three and hoist the build/dist stuff into
the common directory would be good IMHO. What do you think?

Anyway, either approach is better then ${home}/opt or whatever it was :-)

Cheers
Conor


> -----Original Message-----
> From: rubys@locus.apache.org [mailto:rubys@locus.apache.org]
> Sent: Thursday, 3 February 2000 14:29
> To: jakarta-ant-cvs@apache.org
> Subject: cvs commit: jakarta-ant build.xml
>
>
> rubys       00/02/02 19:29:13
>
>   Modified:    .        build.xml
>   Log:
>   Place dist in the same place as the other jakarta projects.
>
>   Restore original name of ant.jar as it is used in the ant batch and
>   shell scripts, as well as in numerous other build.* files.
>
>   Revision  Changes    Path
>   1.6       +3 -3      jakarta-ant/build.xml
>
>   Index: build.xml
>   ===================================================================
>   RCS file: /home/cvs/jakarta-ant/build.xml,v
>   retrieving revision 1.5
>   retrieving revision 1.6
>   diff -u -r1.5 -r1.6
>   --- build.xml	2000/01/30 17:15:32	1.5
>   +++ build.xml	2000/02/03 03:29:13	1.6
>   @@ -19,7 +19,7 @@
>        <property name="build.dir" value="build"/>
>        <property name="build.classes" value="build/classes"/>
>        <property name="build.javadocs" value="build/javadocs"/>
>   -    <property name="dist.dir" value="dist"/>
>   +    <property name="dist.dir" value="../dist/ant"/>
>
>        <property name="classpath" value="lib/xml.jar"/>
>        <property name="packages" value="org.apache.tools.ant.*"/>
>   @@ -112,7 +112,7 @@
>         <copyfile src="TODO" dest="${dist.dir}/TODO"/>
>         <copyfile src="LICENSE" dest="${dist.dir}/LICENSE"/>
>
>   -     <jar jarfile="${name}-${version}.jar"
> basedir="${dist.dir}" items="."/>
>   +     <jar jarfile="${name}.jar" basedir="${dist.dir}" items="."/>
>      </target>
>
>      <!--
> =================================================================== -->
>   @@ -129,7 +129,7 @@
>      <target name="total-clean" depends="clean">
>        <deltree dir="${bin.dir}"/>
>        <delete file="${lib.dir}/${name}.jar"/>
>   -    <delete file="${name}-${version}.jar"/>
>   +    <delete file="${name}.jar"/>
>      </target>
>
>      <!-- in progress ! (may not work) -->
>
>
>
>