From: Barry Lind <barry@xythos.com>
Date: Thu, 27 Jun 2002 04:38:01 +0000 (+0000)
Subject: fixed build.xml to echo correct jdbc version under ant1.6
X-Git-Url: http://git.postgresql.org/gitweb/static/gitweb.js?a=commitdiff_plain;h=7858e2529c8df2e1968cec160d51be29fef10418;p=users%2Fbernd%2Fpostgres.git

fixed build.xml to echo correct jdbc version under ant1.6
---

diff --git a/src/interfaces/jdbc/build.xml b/src/interfaces/jdbc/build.xml
index 0b9b757c0d..5cad561da2 100644
--- a/src/interfaces/jdbc/build.xml
+++ b/src/interfaces/jdbc/build.xml
@@ -42,11 +42,15 @@
         <equals arg1="${ant.java.version}" arg2="1.4"/>
       </or>
     </condition> 
+    <condition property="jdbc3">
+        <equals arg1="${ant.java.version}" arg2="1.4"/>
+    </condition> 
     <condition property="datasource">
       <and>
       <or>
         <equals arg1="${ant.java.version}" arg2="1.2"/>
         <equals arg1="${ant.java.version}" arg2="1.3"/>
+        <equals arg1="${ant.java.version}" arg2="1.4"/>
       </or>     
         <available classname="javax.sql.DataSource"/>
       </and>
@@ -113,15 +117,15 @@
   -->
   <target name="driver" depends="prepare,check_versions">
     <!-- determine the edition text -->
-    <property name="edition" value="JDBC1" />
+    <condition property="edition" value="JDBC1">
+        <equals arg1="${jdbc1}" arg2="true"/>
+    </condition>
     <condition property="edition" value="JDBC2">
       <or>
         <equals arg1="${jdbc2}" arg2="true"/>
         <equals arg1="${jdbc3}" arg2="true"/> <!-- fake it for now -->
-        
       </or>
     </condition>
-    
     <condition property="edition" value="JDBC2 Enterprise">
       <and>
         <available classname="javax.sql.DataSource" />