[Proxool-cvs] proxool build.xml,1.24,1.25

[<bil...@us...>]

Update of /cvsroot/proxool/proxool
In directory sc8-pr-cvs1:/tmp/cvs-serv28851

Modified Files:
	build.xml 
Log Message:
autodetect jdk

Index: build.xml
===================================================================
RCS file: /cvsroot/proxool/proxool/build.xml,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** build.xml	28 Jan 2003 11:57:52 -0000	1.24
--- build.xml	7 Feb 2003 09:37:31 -0000	1.25
***************
*** 13,19 ****
      <property file="proxool-ant.properties"/>
  
-     <!-- The target JDK (dictates which source files we use) -->
-     <property name="jdk" value="1.3"/>
- 
      <!-- Whether to include the test classes -->
      <property name="test" value="false"/>
--- 13,16 ----
***************
*** 80,84 ****
             -->
          <condition property="build-jdk1.2">
!             <equals arg1="${jdk}" arg2="1.2"/>
          </condition>
  
--- 77,105 ----
             -->
          <condition property="build-jdk1.2">
!             <equals arg1="${java.specification.version}" arg2="1.2"/>
!         </condition>
! 
!         <!--
!             Evaluate whether we should build the source code
!             for JDK1.3
!            -->
!         <condition property="build-jdk1.3">
!             <equals arg1="${java.specification.version}" arg2="1.3"/>
!         </condition>
! 
!         <!--
!             Evaluate whether we should build the source code
!             for JDK1.4
!            -->
!         <condition property="build-jdk1.4">
!             <equals arg1="${java.specification.version}" arg2="1.4"/>
!         </condition>
! 
!         <!--
!             Evaluate whether we should build the source code
!             for JDK1.5
!            -->
!         <condition property="build-jdk1.5">
!             <equals arg1="${java.specification.version}" arg2="1.5"/>
          </condition>
  
***************
*** 151,156 ****
          depends="init,evaluate-properties"
          >
-         <antcall target="build-src-core"/>
          <antcall target="build-src-jdk1.2"/>
          <antcall target="build-src-test"/>
  
--- 172,179 ----
          depends="init,evaluate-properties"
          >
          <antcall target="build-src-jdk1.2"/>
+         <antcall target="build-src-jdk1.3"/>
+         <antcall target="build-src-jdk1.4"/>
+         <antcall target="build-src-jdk1.5"/>
          <antcall target="build-src-test"/>
  
***************
*** 188,208 ****
  
      <target
!         name="build-src-core"
          depends="init"
          >
          <copy todir="${build-dir}/src/java" preservelastmodified="yes">
              <fileset dir="src/java" includes="**/*.java"/>
-             <fileset dir="src/java-sandbox" includes="**/PropertyConfigurator.java"/>
          </copy>
      </target>
  
!         <target
!         name="build-src-jdk1.2"
          depends="init"
!         if="build-jdk1.2"
          >
!         <echo level="verbose" message="Collecting JDK1.2 classes"/>
!         <copy todir="${build-dir}/src/java" overwrite="yes">
!             <fileset dir="src/java-jdk1.2" includes="**/*.java"/>
          </copy>
      </target>
--- 211,257 ----
  
      <target
!         name="build-src-jdk1.2"
          depends="init"
+         if="build-jdk1.2"
          >
+         <echo level="verbose" message="Using JDK1.2"/>
+         <copy todir="${build-dir}/src/java" preservelastmodified="yes">
+             <fileset dir="src/java" includes="**/*.java" excludes="**/Jdk14Logger.java"/>
+         </copy>
+         <copy todir="${build-dir}/src/java" overwrite="yes">
+             <fileset dir="src/java-jdk1.2" includes="**/*.java"/>
+         </copy>
+     </target>
+ 
+     <target
+         name="build-src-jdk1.3"
+         depends="init"
+         if="build-jdk1.3"
+         >
+         <echo level="info" message="Using JDK1.3"/>
+         <copy todir="${build-dir}/src/java" preservelastmodified="yes">
+             <fileset dir="src/java" includes="**/*.java" excludes="**/Jdk14Logger.java"/>
+         </copy>
+     </target>
+ 
+     <target
+         name="build-src-jdk1.4"
+         depends="init"
+         if="build-jdk1.4"
+         >
+         <echo level="info" message="Using JDK1.4"/>
          <copy todir="${build-dir}/src/java" preservelastmodified="yes">
              <fileset dir="src/java" includes="**/*.java"/>
          </copy>
      </target>
  
!     <target
!         name="build-src-jdk1.5"
          depends="init"
!         if="build-jdk1.5"
          >
!         <echo level="verbose" message="Using JDK1.4"/>
!         <copy todir="${build-dir}/src/java" preservelastmodified="yes">
!             <fileset dir="src/java" includes="**/*.java"/>
          </copy>
      </target>