db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fuzzylo...@apache.org
Subject svn commit: r153097 - incubator/derby/code/trunk/java/engine/org/apache/derby/jdbc/build.xml
Date Wed, 09 Feb 2005 18:07:05 GMT
Author: fuzzylogic
Date: Wed Feb  9 10:07:04 2005
New Revision: 153097

URL: http://svn.apache.org/viewcvs?view=rev&rev=153097
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/build.xml
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/engine/org/apache/derby/jdbc/build.xml?view=diff&r1=153096&r2=153097
==============================================================================
--- 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>
 
-  <target name="compile_jdbc2" depends="compile_jsr169">
+  <target name="compile_jdbc2" depends="checkjikessource,compile_jdbc2_gump,compile_jdbc2_nosource"/>
 
+  <target name="checkjikessource">
+    <condition property="jikes.source.set">
+      <isset property="jikes.source"/>
+    </condition>
+  </target>
+
+  <target name="compile_jdbc2_gump" depends="compile_jsr169" if="jikes.source.set">
+    <!-- add source argument to get around a problem compiling with -->
+    <!-- Jikes 1.22 in the gump nightly build.                      -->
     <javac
       bootclasspath="${empty}"
       nowarn="on"
@@ -51,6 +60,7 @@
       optimize="${optimize}"
       proceed="${proceed}"
       verbose="${verbose}"
+      source="${jikes.source}"
       srcdir="${derby.engine.src.dir}"
       destdir="${out.dir}">
       <classpath>
@@ -62,9 +72,33 @@
       <include name="${derby.dir}/jdbc/EmbeddedConnectionPoolDataSource.java"/>
       <include name="${derby.dir}/jdbc/EmbedPooledConnection.java"/>
 	  <include name="${derby.dir}/jdbc/Driver20.java"/>
-
     </javac>
+  </target>
 
+  <target name="compile_jdbc2_nosource" depends="compile_jsr169" unless="jikes.source.set">
+    <!-- Do not use source attribute on javac to remain compatible with versions -->
+    <!-- of Jikes that do not have the source option.                            -->
+    <javac
+      bootclasspath="${empty}"
+      nowarn="on"
+      debug="${debug}"
+      depend="${depend}"
+      deprecation="${deprecation}"
+      optimize="${optimize}"
+      proceed="${proceed}"
+      verbose="${verbose}"
+      srcdir="${derby.engine.src.dir}"
+      destdir="${out.dir}">
+      <classpath>
+        <pathelement path="${java13compile.classpath}"/>
+      </classpath>
+      <include name="${derby.dir}/jdbc/EmbeddedDriver.java"/>
+      <include name="${derby.dir}/jdbc/ReferenceableDataSource.java"/>
+      <include name="${derby.dir}/jdbc/EmbeddedDataSource.java"/>
+      <include name="${derby.dir}/jdbc/EmbeddedConnectionPoolDataSource.java"/>
+      <include name="${derby.dir}/jdbc/EmbedPooledConnection.java"/>
+	  <include name="${derby.dir}/jdbc/Driver20.java"/>
+    </javac>
  </target>
 
  <target name="compile_jdbc3">



Mime
View raw message