From c4f0b4cab772e9523ba6632534abfe90a60352e3 Mon Sep 17 00:00:00 2001
From: hanna <hanna@348d0f76-0448-11de-a6fe-93d51630548a>
Date: Sun, 29 Mar 2009 00:29:20 +0000
Subject: [PATCH] Oops.  Javadoc output gets a lot cleaner when I remember to
 add the classpath.

git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@220 348d0f76-0448-11de-a6fe-93d51630548a
---
 build.xml | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/build.xml b/build.xml
index f49b462d3..206befff6 100644
--- a/build.xml
+++ b/build.xml
@@ -12,7 +12,7 @@
         <equals arg1="${target}" arg2="playground"/>
     </condition>
 
-    <path id="thirdparty.dependencies">
+    <path id="external.dependencies">
         <fileset dir="lib" includes="*.jar"/>
     </path>
 
@@ -70,7 +70,7 @@
     <target name="compile" depends="init,resolve"
             description="compile the source">
         <!-- Compile the java code from ${src} into build -->
-        <javac destdir="build" classpathref="thirdparty.dependencies"
+        <javac destdir="build" classpathref="external.dependencies"
                debug="true" debuglevel="lines,vars,source">
             <!--compilerarg value="-Xlint:unchecked" /-->
             <src refid="source"/>
@@ -177,7 +177,7 @@
         <javac destdir="${test.classes}" debug="on" optimize="on">
             <src path="${test.sources}"/>
             <classpath>
-                <path refid="thirdparty.dependencies"/>
+                <path refid="external.dependencies"/>
                 <pathelement location="build"/>
                 <pathelement location="lib/junit-4.4.jar"/>
             </classpath>
@@ -193,7 +193,7 @@
             <formatter type="plain"/>
 
             <classpath>
-                <path refid="thirdparty.dependencies"/>
+                <path refid="external.dependencies"/>
                 <pathelement location="build"/>
                 <pathelement location="${test.classes}"/>
                 <pathelement location="lib/junit-4.4.jar"/>
@@ -208,14 +208,17 @@
 
     </target>
 
-    <target name="javadoc" description="generates javadoc">
+    <target name="javadoc" depends="init,resolve" description="generates javadoc">
         <mkdir dir="javadoc"/>
 	<!-- Javadoc can't take the same dirsets as javac; it only likes getting the base directory -->
 	<!-- Exclude playground files with excludepackagenames instead of the "source" dirset -->
 	<condition property="package.excludes" value="" else="org.broadinstitute.sting.playground.*">
           <equals arg1="${target.is.playground}" arg2="true"/>
 	</condition>
-        <javadoc destdir="javadoc" sourcepath="${source.dir}" excludepackagenames="${package.excludes}" />
+        <javadoc destdir="javadoc" 
+		 sourcepath="${source.dir}" 
+		 classpathref="external.dependencies"
+		 excludepackagenames="${package.excludes}" />
     </target>
 
     <target name="clean"