Build also a docs package that includes the HTML version of the Book and the Tutorial.

svn changeset:8906/svn branch:6.1

diff --git a/build/build.xml b/build/build.xml
index 329266d7341ea94092dd6299054590f43d0fea33..5950064c50bf626dd19e60e010bedabe3e65020e 100644 (file)
--- a/build/build.xml
+++ b/build/build.xml
@@ -1073,7 +1073,7 @@
     <!-- Manual: Build from external repository.                            -->
        <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  -->
 
-    <target name="manual-init">
+    <target name="manual-init" depends="init">
                <!-- Can run XEP only if license is available. -->
                <available file="build/lib/XEP/license.xml" property="xep.license.available" />
 
@@ -1086,7 +1086,7 @@
     </target>
 
     <!-- Checkout doc repository. -->
-    <target name="manual-checkout" unless="docdir">
+    <target name="manual-checkout" depends="manual-init" unless="docdir">
         <mkdir dir="${checkout-path}"/>
 
         <exec executable="svn" dir="${checkout-path}">
@@ -1095,6 +1095,7 @@
             <arg value="docs"/>
         </exec>
 
+               <!-- Documentation source directory. -->
         <property name="docdir" value="${checkout-path}/docs"/>
     </target>
 
@@ -1104,24 +1105,42 @@
     </target>
 
     <!-- Build manual. -->
-    <target name="manual-build" depends="xep-license-copy">
+    <target name="manual-build" depends="manual-init, xep-license-copy">
       <ant dir="${docdir}" antfile="build/build.xml" inheritAll="false">
           <property name="version" value="${version}"/>
       </ant>
     </target>
 
     <!-- Copy the manual from sub Ant results to our output directory. -->
-    <target name="manual-copy" depends="init, manual-checkout">
+    <target name="manual-copy" depends="manual-init">
                <copy todir="${output-dir}/WebContent/docs">
             <fileset dir="${docdir}/build/result/package/WebContent/docs">
                                <exclude name="**/.svn" />
                                <include name="book-of-vaadin.pdf" />
+                               <include name="book/**" />
+                               <include name="tutorial/**" />
+                               <include name="vaadin-tutorial.pdf" />
             </fileset>
         </copy>
     </target>
 
-       <target name="manual" depends="init, manual-init, manual-checkout, manual-build, manual-copy">
-    </target>        
+       <target name="manual-package" depends="manual-init, manual-copy">
+               <tar destfile="${result-path}/${product-file}-docs-${version}.tar.gz" compression="gzip" longfile="gnu">
+                       <tarfileset prefix="docs" dir="${result-path}/${product-file}-${version}/WebContent/docs">
+                               <patternset>
+                                       <include name="api/**" />
+                                       <include name="book/**" />
+                                       <include name="book-of-vaadin.pdf" />
+                                       <include name="tutorial/**" />
+                                       <include name="vaadin-tutorial.pdf" />
+                                       <include name="example-source" />
+                               </patternset>
+                       </tarfileset>
+               </tar>
+       </target>
+
+       <target name="manual" depends="init, manual-init, manual-checkout, manual-build, manual-copy, manual-package">
+    </target>
 
        <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  -->
     <!-- Documentation: Add Javadoc to doc                                  -->