You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by kr...@apache.org on 2008/01/09 13:10:40 UTC

svn commit: r610358 - in /db/derby/code/trunk: build.xml java/testing/org/apache/derby/build.xml

Author: kristwaa
Date: Wed Jan  9 04:10:24 2008
New Revision: 610358

URL: http://svn.apache.org/viewvc?rev=610358&view=rev
Log:
DERBY-3149: Add ant targets for building and running the package private tests against the classes directories. Made the targets compile against Java SE 5.0 libraries.
Patch file: derby-3149-4a-compile_against_15_libraries.diff

Modified:
    db/derby/code/trunk/build.xml
    db/derby/code/trunk/java/testing/org/apache/derby/build.xml

Modified: db/derby/code/trunk/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/build.xml?rev=610358&r1=610357&r2=610358&view=diff
==============================================================================
--- db/derby/code/trunk/build.xml (original)
+++ db/derby/code/trunk/build.xml Wed Jan  9 04:10:24 2008
@@ -443,7 +443,7 @@
   </target>
 	
   <!-- Build the package private tests -->
-  <target name="pptesting" if="jdk16" depends="testing">
+  <target name="pptesting" depends="testing">
     <ant dir="${derby.testing.src.dir}/org/apache/derby"/>
   </target>
 

Modified: db/derby/code/trunk/java/testing/org/apache/derby/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derby/build.xml?rev=610358&r1=610357&r2=610358&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derby/build.xml (original)
+++ db/derby/code/trunk/java/testing/org/apache/derby/build.xml Wed Jan  9 04:10:24 2008
@@ -32,7 +32,6 @@
             source="1.5"
             target="1.5"
             fork="yes"
-            executable="${jdk16}/bin/javac"
             bootclasspath="${empty}"
             nowarn="on"
             debug="true"
@@ -44,8 +43,7 @@
             srcdir="${derby.testing.src.dir}"
             destdir="${out.pptesting.dir}">
             <classpath>
-                <!-- Fix this to use the Java SE 5 classpath -->
-                <pathelement path="${java16compile.classpath}"/>
+                <pathelement path="${java15compile.classpath}"/>
                 <pathelement path="${junit}"/>
                 <pathelement path="${out.dir}"/>
             </classpath>