[libpostgresql-jdbc-java] 01/09: 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.

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to tag REL8_1_413
in repository libpostgresql-jdbc-java.

commit 2be43cb335bf753379ee3c559e8118cdfd529cff
Author: Kris Jurka <books at ejurka.com>
Date:   Tue Feb 12 23:42:02 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 | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/build.xml b/build.xml
index 4135ddb..e26885e 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.64.2.2 2007/04/24 18:19:11 jurka Exp $
+  $PostgreSQL: pgjdbc/build.xml,v 1.64.2.3 2007/10/15 07:49:41 jurka Exp $
 
 -->
 
@@ -51,10 +51,24 @@
       </or>
     </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="unknownjvm">
+      <not>
+        <or>
+          <isset property="jdbc2" />
+          <isset property="jdbc3any" />
+          <isset property="jdbc4" />
+        </or>
+      </not>
     </condition>
 
-    <fail if="jdbc4" message="Building with JDK 1.6 not supported." />
+    <fail if="jdbc4" message="Building with JDK 1.6+ not supported." />
+    <fail if="unknownjvm" message="Unknown JDK version." />
 
     <available property="datasource" classname="javax.sql.DataSource"/>
     <available property="ssl" classname="javax.net.ssl.SSLContext"/>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libpostgresql-jdbc-java.git