db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fuzzylo...@apache.org
Subject svn commit: r354911 - in /db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests: compatibility/ junitTests/compatibility/build.xml
Date Wed, 07 Dec 2005 23:47:38 GMT
Author: fuzzylogic
Date: Wed Dec  7 15:47:34 2005
New Revision: 354911

URL: http://svn.apache.org/viewcvs?rev=354911&view=rev
Log:
Build fix for gump. Set source property on javac task if using jikes to work
around jikes 1.22 problem. Also remove empty compatibilty directory from
previous move of compatibility tests to the junitTests directory.

Removed:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/compatibility/
Modified:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/junitTests/compatibility/build.xml

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/junitTests/compatibility/build.xml
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/junitTests/compatibility/build.xml?rev=354911&r1=354910&r2=354911&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/junitTests/compatibility/build.xml
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/junitTests/compatibility/build.xml
Wed Dec  7 15:47:34 2005
@@ -40,7 +40,15 @@
  
   <target name="FTOtestsubdir" depends="compilex"/>
 
-  <target name="compilex">
+  <target name="compilex" depends="checkjikessource,compilex_gump,compilex_nosource"/>
+
+  <target name="checkjikessource">
+    <condition property="jikes.source.set">
+      <isset property="jikes.source"/>
+    </condition>
+  </target>
+
+  <target name="compilex_nosource">
     <javac
       bootclasspath="${empty}"
       nowarn="on"
@@ -54,11 +62,34 @@
       destdir="${out.dir}">
       <classpath>
         <pathelement path="${java13compile.classpath}"/>
-		<pathelement path="${junit}"/>
+	<pathelement path="${junit}"/>
       </classpath>
       <include name="${this.dir}/*.java"/>
     </javac>
   </target>
+
+  <!-- add source argument to get around a problem compiling with -->
+  <!-- Jikes 1.22 in the gump nightly build.                      -->
+  <target name="compilex_gump" if="jikes.source.set">
+    <javac
+      bootclasspath="${empty}"
+      nowarn="on"
+      debug="${debug}"
+      depend="${depend}"
+      deprecation="${deprecation}"
+      optimize="${optimize}"
+      proceed="${proceed}"
+      verbose="${verbose}" 
+      source="${jikes.source}"
+      srcdir="${derby.testing.src.dir}"
+      destdir="${out.dir}">
+      <classpath>
+        <pathelement path="${java13compile.classpath}"/>
+	<pathelement path="${junit}"/>
+      </classpath>
+      <include name="${this.dir}/*.java"/>
+    </javac>
+  </target> 
 
 <!--             ============= End Targets ==============                -->
 



Mime
View raw message