svn commit: r112033 - /incubator/beehive/trunk/netui/ant/javadoc.xml

[st...@apache.org]

Author: steveh
Date: Wed Dec 15 14:16:27 2004
New Revision: 112033

URL: http://svn.apache.org/viewcvs?view=rev&rev=112033
Log:
Clean up of netui doc build.

(1) Changed target "check-for-tlds" to "check-for-resources"
(2) Removed outdated target "copy-to-forrest"

DRT: docs, build.dist
Modified:
   incubator/beehive/trunk/netui/ant/javadoc.xml

Modified: incubator/beehive/trunk/netui/ant/javadoc.xml
Url: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/ant/javadoc.xml?view=diff&rev=112033&p1=incubator/beehive/trunk/netui/ant/javadoc.xml&r1=112032&p2=incubator/beehive/trunk/netui/ant/javadoc.xml&r2=112033
==============================================================================
--- incubator/beehive/trunk/netui/ant/javadoc.xml	(original)
+++ incubator/beehive/trunk/netui/ant/javadoc.xml	Wed Dec 15 14:16:27 2004
@@ -12,11 +12,11 @@
 	<property name="xalan.jar" location="${docs.dir}/external/xalan.jar"/>
 	<property name="doclet.jar" location="${docs.dir}/tools/lib/jsptagrefdoclet_single.jar"/>
 
-	<available file="${build.lib.dir}/beehive-netui-tags-html.tld" property="tlds.present"/>
+	<available file="${build.lib.dir}" type="dir" property="resources.present"/>
 
 	<path id="javadoc.classpath">
-		<fileset dir="${struts.dir}" includes="*.jar"/>
-		<fileset dir="${xdoclet.dir}" includes="*.jar"/>
+		<fileset dir="${external.dir}/struts" includes="*.jar"/>
+		<fileset dir="${external.dir}/xdoclet" includes="*.jar"/>
 		<fileset dir="${build.lib.dir}" includes="*.jar"/>
 		<pathelement path="${commons-el.jar}"/>
 		<pathelement path="${xbean.jar}"/>
@@ -29,6 +29,7 @@
 		<pathelement path="${jsp20.jar}"/>
 		<pathelement path="${servlet24.jar}"/>
 	</path>
+	
 	<target name="usage">
 		<echo message="================================================================================"/>
 		<echo message="|                                  Usage                                       |"/>
@@ -42,20 +43,20 @@
 		<echo message="|                                                                              |"/>
 		<echo message="================================================================================"/>
 	</target>
-	<!-- You must deploy netui before you run this target, or any of its sub-targets. -->
-	<target name="build" description="Generates Javadoc for all core classes and tags, copies all docs to the build directory for distribution, also copies all docs to the forrest directory.">
-	    <echo message="tlds.present: ${tlds.present}"/>
-		<antcall target="clean"/>
+	
+	<target name="build" depends="check-for-resources" description="Generates Javadoc for all core classes and tags, copies all docs to the build directory for distribution, also copies all docs to the forrest directory.">
+	    <antcall target="clean"/>
 		<antcall target="generate-class-ref"/>
 		<antcall target="generate-taglib-ref"/>
 		<fixcrlf srcDir="${build.dir}/docs/apidocs" includes="**/*.html"/>
-            <!--<antcall target="copy-to-forrest"/>-->
 	</target>
+	
 	<target name="clean">
 		<delete dir="${docs.temp}" failonerror="false"/>
 		<delete dir="${build.dir}/docs" failonerror="false"/>
 		<delete dir="${docs.dir}/temp" failonerror="false"/>
 	</target>
+	
 	<!-- The 'use' attribute is currently set to 'false' because of Java bug 5055723.
          This bug will be fixed for the general release of JDK5.
          Track the bug at: http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=5055723
@@ -92,10 +93,9 @@
 			<packageset dir="${src.dir}/util"/>
 		</javadoc>
 	</target>
-	<target name="generate-taglib-ref" depends="check-for-tlds" 
-	  description="Uses a custom doclet to generate HTML topics from Java source files.  
-	  Checks for the presence of the TLD file beehive-netui-tags-html.tld first.
-	  If it isn't present, Beehive 'deploy' is called.">
+	
+	<target name="generate-taglib-ref" 
+	  description="Uses a custom doclet to generate HTML topics from Java source files.">
 		<delete dir="${docs.temp}" failonerror="false"/>
 		<delete dir="${build.dir}/docs/apidocs/taglib" failonerror="false"/>
 		<mkdir dir="${build.dir}/docs/apidocs/taglib"/>
@@ -139,6 +139,7 @@
 		<delete file="${docs.build.dir}/apidocs/taglib/taglib-summary-ignore.html" failonerror="false"/>
 		<delete dir="${docs.temp}" failonerror="false"/>
 	</target>
+	
 	<!-- Get the latest TLD files and unzip them to a temp folder. From there, they'll be grabbed by
          the JspTagRef doclet for generating tag topics. -->
 	<target name="copy-tld-files" description="copies tld files to another directory, the copies are modified by insert-namespace-for-tld">
@@ -148,15 +149,13 @@
 			<fileset dir="${build.lib.dir}" includes="**/*.tld"/>
 		</copy>
 	</target>
-	<target name="copy-to-forrest" description="">
-		<copy todir="${beehive.dir}/site/src/documentation/content/apidocs" overwrite="true">
-			<fileset dir="${docs.build.dir}/apidocs"/>
-		</copy>
-	</target>
+	
 	<target name="make-doclet-jar" description="Utiltiy function that re-JARs jsptagrefdoclet.jar.  Use this target if you make changes to the XSLT files, or other files, imbedded in jsptagrefdoclet.jar">
 		<jar jarfile="${docs.dir}/tools/lib/jsptagrefdoclet.jar" basedir="${docs.dir}/tools/docletsrc"/>
 	</target>
-	<target name="check-for-tlds" unless="tlds.present">
+	
+	<target name="check-for-resources" unless="resources.present">
 		<ant dir="../../" target="deploy"/>
 	</target>
+	
 </project>