svn commit: r587905 - in /db/derby/code/trunk: build.xml java/demo/build.xml java/demo/vtis/README

[rh...@apache.org]

Author: rhillegas
Date: Wed Oct 24 08:05:33 2007
New Revision: 587905

URL: http://svn.apache.org/viewvc?rev=587905&view=rev
Log:
DERBY-3129: Fix build problems introduced by previous submission.

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

Modified: db/derby/code/trunk/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/build.xml?rev=587905&r1=587904&r2=587905&view=diff
==============================================================================
--- db/derby/code/trunk/build.xml (original)
+++ db/derby/code/trunk/build.xml Wed Oct 24 08:05:33 2007
@@ -390,6 +390,10 @@
     <ant dir="${derby.demo.src.dir}"/>
   </target>
 
+  <target name="vti-demo" depends="buildsource">
+    <ant dir="${derby.demo.src.dir}" target="compile-vtidemo"/>
+  </target>
+
   <target name="testing" depends="demo">
     <ant dir="${derby.testing.src.dir}"/>
   </target>
@@ -637,7 +641,7 @@
   <property name="javadoc.tool.jdk16" value="${jdk16}/bin/javadoc"/>
 
   <target name="javadoc"
-    depends="init-javadoc-tool,init,initjars,publishedapi,derbydocs,toolsdocs,grammardocs,demodocs,testingdocs"/>
+    depends="init-javadoc-tool,init,initjars,publishedapi,derbydocs,toolsdocs,grammardocs,testingdocs"/>
 
   <target name="init-javadoc-tool" depends="init-javadoc-not-jdk16,init-javadoc-jdk16"/>
 

Modified: db/derby/code/trunk/java/demo/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/demo/build.xml?rev=587905&r1=587904&r2=587905&view=diff
==============================================================================
--- db/derby/code/trunk/java/demo/build.xml (original)
+++ db/derby/code/trunk/java/demo/build.xml Wed Oct 24 08:05:33 2007
@@ -110,19 +110,6 @@
         <pathelement path="${java14compile.classpath};${jcc};"/>
       </classpath>
     </javac>
-    <javac
-      source="1.5"
-      target="1.5"
-      nowarn="on"
-      debug="${debug}"
-      depend="${depend}"
-      deprecation="${deprecation}"
-      optimize="${optimize}"
-      proceed="${proceed}"
-      verbose="${verbose}"
-      srcdir="${derby.demo.src.dir}/vtis/java"
-      destdir="${out.dir}">
-    </javac>
     <ant target="compile" dir="toursdb"/>
   </target>
 
@@ -138,6 +125,23 @@
   <target name="toursdb" unless="toursdb.available">
     <ant dir="${derby.demo.src.dir}/toursdb"/>
   </target>
+
+  <target name="compile-vtidemo">
+    <javac
+      source="1.5"
+      target="1.5"
+      nowarn="on"
+      debug="${debug}"
+      depend="${depend}"
+      deprecation="${deprecation}"
+      optimize="${optimize}"
+      proceed="${proceed}"
+      verbose="${verbose}"
+      srcdir="${derby.demo.src.dir}/vtis/java"
+      destdir="${out.dir}">
+    </javac>
+  </target>
+
 
 </project>
 

Modified: db/derby/code/trunk/java/demo/vtis/README
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/demo/vtis/README?rev=587905&r1=587904&r2=587905&view=diff
==============================================================================
--- db/derby/code/trunk/java/demo/vtis/README (original)
+++ db/derby/code/trunk/java/demo/vtis/README Wed Oct 24 08:05:33 2007
@@ -1,13 +1,8 @@
-This branch of the Demo subtree contains sample table functions. The
-code is built by the top-level Derby compile target and the javadoc is
-built by the top-level Derby javadoc target. That is, from the root
-directory of your subversion client or source distribution, invoke
-"ant all". This will build all of Derby and will also build all of the
-classes in this demo. The demo classes will be compiled into
-classes/org/apache/derbyDemo/vtis... Similarly, if you invoke
-"ant buildjavadoc" then all of the Derby javadoc will be built and,
-in addition, javadoc for this demo will be built into the demo
-subdirectory of the javadoc output.
+This branch of the Demo subtree contains sample table functions.
+
+To build the code, invoke the vti-demo build target in the
+top level build script. To build the javadoc, invoke the demodocs
+target in the top level build script.
 
 Two sql scripts are provided to test-drive these table functions.
 Use Derby's ij tool to run these scripts: