postgresql-jdbc.git / summary / log / commit / refs

commit    9eebbfaceaf8b9e0df80fbc02ed1c983621539f3
Author:   Kris Jurka <books@ejurka.com>
Date:     Tue Feb 12 23:41:42 2008 +0000

    Make the build system aware of the 1.7 JDK (which icedtea reports
    itself as) and add an explicit check and complaint if we find a JDK
    that we don't support.


 build.xml | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/build.xml b/build.xml
index ac2e1312..92aa2c5b 100644
--- a/build.xml
+++ b/build.xml
@@ -8,7 +8,7 @@
 
   This file now requires Ant 1.4.1.  2002-04-18
 
-  $PostgreSQL: pgjdbc/build.xml,v 1.77 2007/10/15 07:49:24 jurka Exp $
+  $PostgreSQL: pgjdbc/build.xml,v 1.78 2008/01/08 06:56:26 jurka Exp $
 
 -->
 
@@ -45,7 +45,10 @@
 	<equals arg1="${java.specification.version}" arg2="1.5"/>
     </condition>
     <condition property="jdbc4">
+      <or>
         <equals arg1="${java.specification.version}" arg2="1.6"/>
+        <equals arg1="${java.specification.version}" arg2="1.7"/>
+      </or>
     </condition>
     <condition property="jdbc3any">
       <or>
@@ -61,6 +64,18 @@
       </or>
     </condition>
 
+    <condition property="unknownjvm">
+      <not>
+        <or>
+          <isset property="jdbc2" />
+          <isset property="jdbc3any" />
+          <isset property="jdbc4" />
+        </or>
+      </not>
+    </condition>
+
+    <fail if="unknownjvm" message="Unknown JDK version." />
+
     <available property="datasourceclass" classname="javax.sql.DataSource"/>
     <available property="ssl" classname="javax.net.ssl.SSLContext"/>
     <available property="junit" classname="junit.framework.Test"/>


[parent: 14870fa08077]