]> granicus.if.org Git - postgresql/commitdiff
compiles correctly but still doesn't work with jdk 1.4
authorDave Cramer <davec@fastcrypt.com>
Sun, 24 Feb 2002 16:12:51 +0000 (16:12 +0000)
committerDave Cramer <davec@fastcrypt.com>
Sun, 24 Feb 2002 16:12:51 +0000 (16:12 +0000)
src/interfaces/jdbc/build.xml

index ed86f7d5afdb4f1682bf469624c7593401f45f45..c378d8df19b7e932ebeec4d640966dba91ebe1f5 100644 (file)
@@ -4,7 +4,7 @@
   build file to allow ant (http://jakarta.apache.org/ant/) to be used\r
   to build the PostgreSQL JDBC Driver\r
 \r
-  $Header: /cvsroot/pgsql/src/interfaces/jdbc/Attic/build.xml,v 1.19 2002/02/22 02:07:30 davec Exp $\r
+  $Header: /cvsroot/pgsql/src/interfaces/jdbc/Attic/build.xml,v 1.20 2002/02/24 16:12:51 davec Exp $\r
 \r
 -->\r
 \r
       <or>\r
         <equals arg1="${ant.java.version}" arg2="1.2"/>\r
         <equals arg1="${ant.java.version}" arg2="1.3"/>\r
+        <equals arg1="${ant.java.version}" arg2="1.4"/>\r
       </or>\r
     </condition> \r
-    <condition property="jdbc3">\r
-      <equals arg1="${ant.java.version}" arg2="1.4"/>\r
-    </condition>\r
     <condition property="datasource">\r
       <and>\r
-        <equals arg1="${jdbc2}" arg2="true" />        \r
+      <or>\r
+        <equals arg1="${ant.java.version}" arg2="1.2"/>\r
+        <equals arg1="${ant.java.version}" arg2="1.3"/>\r
+      </or>     \r
         <available classname="javax.sql.DataSource"/>\r
       </and>\r
     </condition>\r
@@ -90,7 +91,7 @@
 \r
       <exclude name="${package}/jdbc1/**" unless="jdbc1"/>\r
       <exclude name="${package}/jdbc2/**" unless="jdbc2"/>\r
-\r
\r
       <exclude name="${package}/largeobject/PGblob.java" unless="jdbc2" />\r
       <exclude name="${package}/largeobject/PGclob.java" unless="jdbc2" />\r
 \r