hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cutt...@apache.org
Subject svn commit: r602271 - in /lucene/hadoop/branches/branch-0.15: CHANGES.txt build.xml docs/hadoop-default.html
Date Fri, 07 Dec 2007 23:32:37 GMT
Author: cutting
Date: Fri Dec  7 15:32:37 2007
New Revision: 602271

URL: http://svn.apache.org/viewvc?rev=602271&view=rev
Log:
Merge -r 602269:602270 from trunk to 0.15 branch.  Fixes: HADOOP-2382.

Added:
    lucene/hadoop/branches/branch-0.15/docs/hadoop-default.html
      - copied unchanged from r602270, lucene/hadoop/trunk/docs/hadoop-default.html
Modified:
    lucene/hadoop/branches/branch-0.15/CHANGES.txt
    lucene/hadoop/branches/branch-0.15/build.xml

Modified: lucene/hadoop/branches/branch-0.15/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/hadoop/branches/branch-0.15/CHANGES.txt?rev=602271&r1=602270&r2=602271&view=diff
==============================================================================
--- lucene/hadoop/branches/branch-0.15/CHANGES.txt (original)
+++ lucene/hadoop/branches/branch-0.15/CHANGES.txt Fri Dec  7 15:32:37 2007
@@ -18,9 +18,11 @@
   IMPROVEMENTS
 
     HADOOP-2160.  Remove project-level, non-user documentation from
-    releases, since it's now maintained in a separate tree.
+    releases, since it's now maintained in a separate tree.  (cutting)
 
-    HADOOP-1327.  Add user documentation for streaming.
+    HADOOP-1327.  Add user documentation for streaming.  (cutting)
+
+    HADOOP-2382.  Add hadoop-default.html to subversion. (cutting)
 
 
 Release 0.15.1 - 2007-11-27

Modified: lucene/hadoop/branches/branch-0.15/build.xml
URL: http://svn.apache.org/viewvc/lucene/hadoop/branches/branch-0.15/build.xml?rev=602271&r1=602270&r2=602271&view=diff
==============================================================================
--- lucene/hadoop/branches/branch-0.15/build.xml (original)
+++ lucene/hadoop/branches/branch-0.15/build.xml Fri Dec  7 15:32:37 2007
@@ -22,7 +22,7 @@
   <property name="conf.dir" value="${basedir}/conf"/>
   <property name="docs.dir" value="${basedir}/docs"/>
   <property name="contrib.dir" value="${basedir}/src/contrib"/>
-  <property name="docs.src" value="${basedir}/src/web"/>
+  <property name="docs.src" value="${basedir}/src/docs"/>
   <property name="c++.src" value="${basedir}/src/c++"/>
   <property name="c++.utils.src" value="${c++.src}/utils"/>
   <property name="c++.pipes.src" value="${c++.src}/pipes"/>
@@ -602,14 +602,16 @@
   <!-- ================================================================== -->
   <!-- Documentation                                                      -->
   <!-- ================================================================== -->
-  <target name="docs">
-    <exec dir="src/docs" executable="forrest" failonerror="true" />
-    <copy todir="docs/">
-      <fileset dir="src/docs/build/site/" />
+  <target name="docs" description="Generate documentation">
+    <exec dir="${docs.src}" executable="forrest" failonerror="true" />
+    <copy todir="${docs.dir}">
+      <fileset dir="${docs.src}/build/site/" />
     </copy>
+    <style basedir="${conf.dir}" destdir="${docs.dir}"
+           includes="hadoop-default.xml" style="conf/configuration.xsl"/>
   </target>
 
-  <target name="javadoc" depends="default-doc">
+  <target name="javadoc" description="Generate javadoc">
     <mkdir dir="${build.javadoc}"/>
     <javadoc
       overview="${src.dir}/overview.html"
@@ -649,14 +651,6 @@
     </javadoc>
   </target>	
 	
-  <target name="default-doc">
-    <style basedir="${conf.dir}" destdir="${build.docs}"
-           includes="hadoop-default.xml" style="conf/configuration.xsl"/>
-    <copy todir="${build.docs}">
-      <fileset dir="${docs.dir}" />
-    </copy>
-  </target>
-
   <!-- ================================================================== -->
   <!-- D I S T R I B U T I O N                                            -->
   <!-- ================================================================== -->
@@ -708,6 +702,7 @@
     </copy>
 
     <copy todir="${dist.dir}/docs">
+      <fileset dir="${docs.dir}" />
       <fileset dir="${build.docs}"/>
     </copy>
 
@@ -762,7 +757,7 @@
   <!-- ================================================================== -->
   <target name="clean" depends="clean-contrib">
     <delete dir="${build.dir}"/>
-    <delete dir="src/docs/build"/>
+    <delete dir="${docs.src}/build"/>
   </target>
 
   <!-- ================================================================== -->



Mime
View raw message