Return-Path: <fuzzylogic@apache.org>
Mailing-List: contact derby-commits-help@db.apache.org; run by ezmlm
Delivered-To: mailing list derby-commits@db.apache.org
Received: (qmail 9102 invoked by uid 500); 9 Feb 2005 18:07:07 -0000
Delivered-To: apmail-incubator-derby-cvs@incubator.apache.org
Received: (qmail 9099 invoked by uid 99); 9 Feb 2005 18:07:06 -0000
X-ASF-Spam-Status: No, hits=-9.8 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from minotaur.apache.org (HELO minotaur.apache.org)
 (209.237.227.194)
  by apache.org (qpsmtpd/0.28) with SMTP; Wed, 09 Feb 2005 10:07:06 -0800
Received: (qmail 33342 invoked by uid 65534); 9 Feb 2005 18:07:05 -0000
Message-ID: <20050209180705.33341.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
X-Mailer: svnmailer-1.0.0-dev
Date: Wed, 09 Feb 2005 18:07:05 -0000
Subject: svn commit: r153097 -
 incubator/derby/code/trunk/java/engine/org/apache/derby/jdbc/build.xml
To: derby-cvs@incubator.apache.org
From: fuzzylogic@apache.org
X-Virus-Checked: Checked

Author: fuzzylogic
Date: Wed Feb  9 10:07:04 2005
New Revision: 153097

URL: http://svn.apache.org/viewcvs?view=3Drev&rev=3D153097
Log:
Build fix for gump. Use jikes -source option for JDBC 2.0 classes, but only
for gump, to retain compatibility with older versions of Jikes that don't
understand the -source option.

Modified:
    incubator/derby/code/trunk/java/engine/org/apache/derby/jdbc/build.xml

Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/jdbc/buil=
d=2Exml
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/engine/o=
rg/apache/derby/jdbc/build.xml?view=3Ddiff&r1=3D153096&r2=3D153097
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- incubator/derby/code/trunk/java/engine/org/apache/derby/jdbc/build.xml =
(original)
+++ incubator/derby/code/trunk/java/engine/org/apache/derby/jdbc/build.xml =
Wed Feb  9 10:07:04 2005
@@ -40,8 +40,17 @@
     </javac>
   </target>
=20
-  <target name=3D"compile_jdbc2" depends=3D"compile_jsr169">
+  <target name=3D"compile_jdbc2" depends=3D"checkjikessource,compile_jdbc2=
_gump,compile_jdbc2_nosource"/>
=20
+  <target name=3D"checkjikessource">
+    <condition property=3D"jikes.source.set">
+      <isset property=3D"jikes.source"/>
+    </condition>
+  </target>
+
+  <target name=3D"compile_jdbc2_gump" depends=3D"compile_jsr169" if=3D"jik=
es.source.set">
+    <!-- add source argument to get around a problem compiling with -->
+    <!-- Jikes 1.22 in the gump nightly build.                      -->
     <javac
       bootclasspath=3D"${empty}"
       nowarn=3D"on"
@@ -51,6 +60,7 @@
       optimize=3D"${optimize}"
       proceed=3D"${proceed}"
       verbose=3D"${verbose}"
+      source=3D"${jikes.source}"
       srcdir=3D"${derby.engine.src.dir}"
       destdir=3D"${out.dir}">
       <classpath>
@@ -62,9 +72,33 @@
       <include name=3D"${derby.dir}/jdbc/EmbeddedConnectionPoolDataSource.=
java"/>
       <include name=3D"${derby.dir}/jdbc/EmbedPooledConnection.java"/>
 	  <include name=3D"${derby.dir}/jdbc/Driver20.java"/>
-
     </javac>
+  </target>
=20
+  <target name=3D"compile_jdbc2_nosource" depends=3D"compile_jsr169" unles=
s=3D"jikes.source.set">
+    <!-- Do not use source attribute on javac to remain compatible with ve=
rsions -->
+    <!-- of Jikes that do not have the source option.                     =
       -->
+    <javac
+      bootclasspath=3D"${empty}"
+      nowarn=3D"on"
+      debug=3D"${debug}"
+      depend=3D"${depend}"
+      deprecation=3D"${deprecation}"
+      optimize=3D"${optimize}"
+      proceed=3D"${proceed}"
+      verbose=3D"${verbose}"
+      srcdir=3D"${derby.engine.src.dir}"
+      destdir=3D"${out.dir}">
+      <classpath>
+        <pathelement path=3D"${java13compile.classpath}"/>
+      </classpath>
+      <include name=3D"${derby.dir}/jdbc/EmbeddedDriver.java"/>
+      <include name=3D"${derby.dir}/jdbc/ReferenceableDataSource.java"/>
+      <include name=3D"${derby.dir}/jdbc/EmbeddedDataSource.java"/>
+      <include name=3D"${derby.dir}/jdbc/EmbeddedConnectionPoolDataSource.=
java"/>
+      <include name=3D"${derby.dir}/jdbc/EmbedPooledConnection.java"/>
+	  <include name=3D"${derby.dir}/jdbc/Driver20.java"/>
+    </javac>
  </target>
=20
  <target name=3D"compile_jdbc3">