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 rh...@apache.org on 2008/05/21 20:35:11 UTC

svn commit: r658805 - in /db/derby/code/trunk: build.xml java/demo/build.xml

Author: rhillegas
Date: Wed May 21 11:35:11 2008
New Revision: 658805

URL: http://svn.apache.org/viewvc?rev=658805&view=rev
Log:
DERBY-3684: Wire the vti demo code into the standard build just as other demo code is wired in.

Modified:
    db/derby/code/trunk/build.xml
    db/derby/code/trunk/java/demo/build.xml

Modified: db/derby/code/trunk/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/build.xml?rev=658805&r1=658804&r2=658805&view=diff
==============================================================================
--- db/derby/code/trunk/build.xml (original)
+++ db/derby/code/trunk/build.xml Wed May 21 11:35:11 2008
@@ -440,7 +440,7 @@
     <ant dir="${derby.build.src.dir}"/>
   </target>
 
-  <target name="demo" depends="buildsource">
+  <target name="demo" depends="buildsource,vti-demo">
     <ant dir="${derby.demo.src.dir}"/>
   </target>
 

Modified: db/derby/code/trunk/java/demo/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/demo/build.xml?rev=658805&r1=658804&r2=658805&view=diff
==============================================================================
--- db/derby/code/trunk/java/demo/build.xml (original)
+++ db/derby/code/trunk/java/demo/build.xml Wed May 21 11:35:11 2008
@@ -131,6 +131,7 @@
     <javac
       source="1.5"
       target="1.5"
+      bootclasspath="${empty}"
       nowarn="on"
       debug="${debug}"
       depend="${depend}"
@@ -140,6 +141,9 @@
       verbose="${verbose}"
       srcdir="${derby.demo.src.dir}/vtis/java"
       destdir="${out.dir}">
+      <classpath>
+        <pathelement path="${java15compile.classpath}"/>
+      </classpath>
     </javac>
   </target>