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-Tag: REL7_3~1283
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=23e5da8a4835d7b5c5c376e3f4d1e77bf07a5b81;p=postgresql

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 81cc1bd2d0..c8b541d6a6 100644
--- a/src/interfaces/jdbc/build.xml
+++ b/src/interfaces/jdbc/build.xml
@@ -6,7 +6,7 @@
 
   This file now requires Ant 1.4.1.  2002-04-18
 
-  $Header: /cvsroot/pgsql/src/interfaces/jdbc/Attic/build.xml,v 1.23 2002/04/18 04:58:13 momjian Exp $
+  $Header: /cvsroot/pgsql/src/interfaces/jdbc/Attic/build.xml,v 1.24 2002/06/27 04:38:01 barry Exp $
 
 -->
 
@@ -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" />