svn commit: r1225921 - in /incubator/hcatalog/trunk: CHANGES.txt build.xml

[ha...@apache.org]

Author: hashutosh
Date: Fri Dec 30 21:16:35 2011
New Revision: 1225921

URL: http://svn.apache.org/viewvc?rev=1225921&view=rev
Log:
HCATALOG-184: Optionally do not generate forrest docs (traviscrawford via hashutosh)

Modified:
    incubator/hcatalog/trunk/CHANGES.txt
    incubator/hcatalog/trunk/build.xml

Modified: incubator/hcatalog/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/CHANGES.txt?rev=1225921&r1=1225920&r2=1225921&view=diff
==============================================================================
--- incubator/hcatalog/trunk/CHANGES.txt (original)
+++ incubator/hcatalog/trunk/CHANGES.txt Fri Dec 30 21:16:35 2011
@@ -52,6 +52,8 @@ Trunk (unreleased changes)
   HCAT-63. RPM package integration with Hadoop (khorgath via hashutosh)
 
   IMPROVEMENTS
+  HCAT-184. Optionally do not generate forrest docs (traviscrawford via hashutosh)
+
   HCAT-187. HCatalog release missing Hive builtins (traviscrawford via hashutosh)
 
   HCAT-186. Downgrade ivy to 2.1.0 (currently 2.2.0) per HIVE-2580 (traviscrawford via hashutosh)

Modified: incubator/hcatalog/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/build.xml?rev=1225921&r1=1225920&r2=1225921&view=diff
==============================================================================
--- incubator/hcatalog/trunk/build.xml (original)
+++ incubator/hcatalog/trunk/build.xml Fri Dec 30 21:16:35 2011
@@ -370,7 +370,11 @@
   Docs Section
   ================================================================================
   -->
-  <target name="docs" depends="javadoc, 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">
+  <target name="docs" depends="forrest, javadoc"
+          description="Generate Javadoc and Forrest documentation" />
+
+  <target name="forrest" if="forrest.home"
+          description="Generate forrest-based documentation. To use, specify -Dforrest.home=&lt;base of Apache Forrest installation&gt; on the command line.">
     <exec dir="${docs.src}" executable="${forrest.home}/bin/forrest"
           failonerror="true">
     </exec>
@@ -379,22 +383,25 @@
     </copy>
   </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" depends="jar" description="Create documentation">
-      <mkdir dir="${build.javadoc}" />
-      <javadoc overview="${src.dir}/../docs/overview.html" packagenames="org.apache.hcatalog.*" destdir="${build.javadoc}" author="true" version="true" use="true" windowtitle="HCatalog ${hcatalog.version} API" doctitle="HCatalog ${hcatalog.version} API">
-          <packageset dir="${src.dir}" />
-          <classpath>
-              <path refid="classpath" />
-          </classpath>
-          <group title="hcatalog" packages="org.apache.hcatalog.*" />
-      </javadoc>
+  <target name="javadoc" depends="jar" description="Generate Javadoc documentation">
+    <mkdir dir="${build.javadoc}" />
+    <javadoc overview="${src.dir}/../docs/overview.html"
+             packagenames="org.apache.hcatalog.*"
+             destdir="${build.javadoc}"
+             author="true"
+             version="true"
+             use="true"
+             windowtitle="HCatalog ${hcatalog.version} API"
+             doctitle="HCatalog ${hcatalog.version} API"
+             failonerror="true">
+      <packageset dir="${src.dir}" />
+        <classpath>
+          <path refid="classpath" />
+        </classpath>
+        <group title="hcatalog" packages="org.apache.hcatalog.*" />
+    </javadoc>
   </target>
 
-
   <!--
   ===============================================================================
   Distribution Section