pkg://ant-contrib-0.6-1jpp.src.rpm:140609/ant-contrib-build_xml.patch  info  downloads

*** build.xml.orig	Wed Mar 17 17:14:12 2004
--- build.xml	Wed Mar 17 17:18:57 2004
***************
*** 350,358 ****
    </target>
  
    <target name="build-ant-testutil" unless="ant.build.testutil.available">
!       <unzip src="${build.ant.dir}/${ant.src.file}"
               dest="${build.ant.dir}" />
  
        <ant antfile="build.xml"
             dir="${build.ant.dir}/${ant.unzip.dir}"
             target="test-jar" />
--- 350,367 ----
    </target>
  
    <target name="build-ant-testutil" unless="ant.build.testutil.available">
!       <bunzip2 src="${build.ant.dir}/${ant.src.file}"
               dest="${build.ant.dir}" />
+ 
+       <delete file="${build.ant.dir}/${ant.src.file}" />
  
+       <untar src="${build.ant.dir}/${ant.src.tar.file}"
+              dest="${build.ant.dir}" />
+ 
+       <delete file="${build.ant.dir}/${ant.src.tar.file}" />
+       <delete file="${build.ant.dir}/${ant.unzip.dir}/lib/xml-apis.jar" />
+       <delete file="${build.ant.dir}/${ant.unzip.dir}/lib/xercesImpl.jar" />
+ 
        <ant antfile="build.xml"
             dir="${build.ant.dir}/${ant.unzip.dir}"
             target="test-jar" />
***************
*** 364,370 ****
        <property name="ant.download.version"
                  value="1.5.4" />
        <property name="ant.src.file"
!                 value="apache-ant-${ant.download.version}-src.zip" />
        <property name="ant.unzip.dir"
                  value="apache-ant-${ant.download.version}" />
  
--- 373,381 ----
        <property name="ant.download.version"
                  value="1.5.4" />
        <property name="ant.src.file"
!                 value="apache-ant-${ant.download.version}-src.tar.bz2" />
!       <property name="ant.src.tar.file"
!                 value="apache-ant-${ant.download.version}-src.tar" />
        <property name="ant.unzip.dir"
                  value="apache-ant-${ant.download.version}" />
  
***************
*** 372,378 ****
  
        <get dest="${build.ant.dir}/${ant.src.file}"
             usetimestamp="true"
!            src="http://www.apache.org/dist/ant/source/${ant.src.file}">
        </get>
  
        <available property="ant.build.testutil.available"
--- 383,389 ----
  
        <get dest="${build.ant.dir}/${ant.src.file}"
             usetimestamp="true"
!            src="file://${basedir}/../../SOURCES/${ant.src.file}">
        </get>
  
        <available property="ant.build.testutil.available"