[Ant-contrib-cvs] CVS: ant-contrib build.xml,1.28,1.29

[peter r. <pet...@us...>]

Update of /cvsroot/ant-contrib/ant-contrib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2407

Modified Files:
	build.xml 
Log Message:
allow ant-contrib to be built with javac 1.5

Index: build.xml
===================================================================
RCS file: /cvsroot/ant-contrib/ant-contrib/build.xml,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** build.xml	23 Aug 2004 14:34:30 -0000	1.28
--- build.xml	1 Sep 2004 17:57:18 -0000	1.29
***************
*** 112,120 ****
    <target name="check-version">
      <available property="jdk1.4+" classname="java.lang.CharSequence"/>
    </target>
  
!     <target name="check-ant-version">
!       <available property="ant-1.6+" classname="org.apache.tools.ant.taskdefs.MacroDef"/>
!     </target>
  
    <!--
--- 112,138 ----
    <target name="check-version">
      <available property="jdk1.4+" classname="java.lang.CharSequence"/>
+     <available property="jdk1.5+" classname="java.lang.Readable"/>
    </target>
  
!   
!   <target name="check-ant-version">
!     <available property="ant-1.6+" classname="org.apache.tools.ant.taskdefs.MacroDef"/>
!   </target>
! 
!   <target name="javac.preset" depends="javac.preset.1.5+,javac.preset.1.5-"/>
!   
!   <target name="javac.preset.1.5+" depends="check-version" if="jdk1.5+">
!     <presetdef name="javac.preset">
!       <javac source="1.3"/>
!     </presetdef>
!   </target>
!   
!   <target name="javac.preset.1.5-" depends="check-version" unless="jdk1.5+">
!     <presetdef name="javac.preset">
!       <javac/>
!     </presetdef>
!   </target>
!   
!   
  
    <!--
***************
*** 123,127 ****
    ######################################################
    -->
!   <target name="build_contrib_jar" depends="build_dirs,check-version,check-ant-version,get-jar-deps">
      <!-- if this is not an official release, any other developer that builds will build a jar
           with version=Developer-build -->
--- 141,146 ----
    ######################################################
    -->
!   <target name="build_contrib_jar"
!           depends="build_dirs,check-version,check-ant-version,javac.preset,get-jar-deps">
      <!-- if this is not an official release, any other developer that builds will build a jar
           with version=Developer-build -->
***************
*** 129,133 ****
  
      <fail unless="ant-1.6+" message="Ant-Contrib requires Ant 1.6+ to build" />
!     <javac srcdir="${src}"
             debug="${javac.debug}"
             target="${javac.target}"
--- 148,152 ----
  
      <fail unless="ant-1.6+" message="Ant-Contrib requires Ant 1.6+ to build" />
!     <javac.preset srcdir="${src}"
             debug="${javac.debug}"
             target="${javac.target}"
***************
*** 136,140 ****
              <fileset refid="run.libs" />
          </classpath>
!     </javac>
  
      <copy todir="${classes}">
--- 155,159 ----
              <fileset refid="run.libs" />
          </classpath>
!     </javac.preset>
  
      <copy todir="${classes}">
***************
*** 314,320 ****
    ######################################################
    -->
!   <target name="compile-tests" depends="build_contrib_jar,get-test-deps">
      <mkdir dir="${testclasses}"/>
!     <javac srcdir="${testsrc}" destdir="${testclasses}"
             debug="${javac.debug}" target="${javac.target}">
        <classpath>
--- 333,339 ----
    ######################################################
    -->
!   <target name="compile-tests" depends="build_contrib_jar,get-test-deps,javac.preset">
      <mkdir dir="${testclasses}"/>
!     <javac.preset srcdir="${testsrc}" destdir="${testclasses}"
             debug="${javac.debug}" target="${javac.target}">
        <classpath>
***************
*** 323,327 ****
          <fileset refid="run.libs" />
        </classpath>
!     </javac>
    </target>
  
--- 342,346 ----
          <fileset refid="run.libs" />
        </classpath>
!     </javac.preset>
    </target>
  
***************
*** 360,364 ****
    </target>
  
!   <target name="build-ant-testutil" unless="ant.build.testutil.available">
      <unzip src="${build.ant.dir}/${ant.src.file}"
               dest="${build.ant.dir}">
--- 379,383 ----
    </target>
  
!   <target name="build-ant-testutil" unless="ant.build.testutil.available,java.preset">
      <unzip src="${build.ant.dir}/${ant.src.file}"
               dest="${build.ant.dir}">
***************
*** 369,373 ****
  
      <mkdir dir="${testclasses}" />
!     <javac srcdir="${build.ant.dir}/${ant.unzip.dir}/src/testcases"
             includes="org/apache/tools/ant/BuildFileTest.java"
             destdir="${testclasses}"
--- 388,392 ----
  
      <mkdir dir="${testclasses}" />
!     <javac.preset srcdir="${build.ant.dir}/${ant.unzip.dir}/src/testcases"
             includes="org/apache/tools/ant/BuildFileTest.java"
             destdir="${testclasses}"
***************
*** 378,382 ****
          <fileset refid="run.libs" />
        </classpath>
!     </javac>
    </target>
  
--- 397,401 ----
          <fileset refid="run.libs" />
        </classpath>
!     </javac.preset>
    </target>