svn commit: r605830 - in /lucene/hadoop/trunk: CHANGES.txt build.xml

[ac...@apache.org]

Author: acmurthy
Date: Thu Dec 20 00:22:15 2007
New Revision: 605830

URL: http://svn.apache.org/viewvc?rev=605830&view=rev
Log:
HADOOP-2457. Added a 'forrest.home' property to the 'docs' target in build.xml.

Modified:
    lucene/hadoop/trunk/CHANGES.txt
    lucene/hadoop/trunk/build.xml

Modified: lucene/hadoop/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/CHANGES.txt?rev=605830&r1=605829&r2=605830&view=diff
==============================================================================
--- lucene/hadoop/trunk/CHANGES.txt (original)
+++ lucene/hadoop/trunk/CHANGES.txt Thu Dec 20 00:22:15 2007
@@ -129,6 +129,9 @@
     HADOOP-2432. HDFS includes the name of the file while throwing 
     "File does not exist"  exception. (Jim Kellerman via dhruba)
 
+    HADOOP-2457. Added a 'forrest.home' property to the 'docs' target in
+    build.xml. (acmurthy) 
+
   OPTIMIZATIONS
 
     HADOOP-1898.  Release the lock protecting the last time of the last stack

Modified: lucene/hadoop/trunk/build.xml
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/build.xml?rev=605830&r1=605829&r2=605830&view=diff
==============================================================================
--- lucene/hadoop/trunk/build.xml (original)
+++ lucene/hadoop/trunk/build.xml Thu Dec 20 00:22:15 2007
@@ -608,8 +608,8 @@
   <!-- Documentation                                                      -->
   <!-- ================================================================== -->
   
-  <target name="docs" description="Generate documentation">
-    <exec dir="${docs.src}" executable="forrest" failonerror="true" />
+  <target name="docs" depends="forrest.check" description="Generate forrest-based documentation. To use, specify -Dforrest.home=&lt;base of Apache Forrest installation&gt; on the command line." if="forrest.home">
+    <exec dir="${docs.src}" executable="${forrest.home}/bin/forrest" failonerror="true" />
     <copy todir="${docs.dir}">
       <fileset dir="${docs.src}/build/site/" />
     </copy>
@@ -617,6 +617,10 @@
            includes="hadoop-default.xml" style="conf/configuration.xsl"/>
   </target>
 
+  <target name="forrest.check" unless="forrest.home">
+    <fail message="'forrest.home' is not defined. Please pass -Dforrest.home=&lt;base of Apache Forrest installation&gt; to Ant on the command-line." />
+  </target>
+	
   <target name="javadoc" description="Generate javadoc">
     <mkdir dir="${build.javadoc}"/>
     <javadoc