From: Henri Sara <henri.sara@itmill.com>
Date: Thu, 18 Aug 2011 11:02:10 +0000 (+0000)
Subject: #7392 remove manual build from Vaadin 6.7 build
X-Git-Tag: 6.7.0.beta1~55
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=d9a92db2f6daa9e74431456fd4a94ea54481a2e4;p=vaadin-framework.git

#7392 remove manual build from Vaadin 6.7 build

svn changeset:20468/svn branch:6.7
---

diff --git a/build/build.xml b/build/build.xml
index 9ee295c2df..b38e922c72 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -6,13 +6,13 @@
          basedir="../" default="package-all">
 
     <!--Call one of package-* targets unless you understand what you are doing. -->
-    <target name="package-all" depends="clean-all, init, build, docs, internal-package-war, differences, internal-package-liferay" description="Build public packages.">
+    <target name="package-all" depends="clean-all, init, build, javadoc, internal-package-war, differences, internal-package-liferay" description="Build public packages.">
     </target>
 
     <target name="package-jar" depends="clean-result, init, vaadin.jar" description="Create vaadin-x.y.z.jar file.">
     </target>
 
-    <target name="package-war" depends="clean-result, init, build, docs, internal-package-war, differences">
+    <target name="package-war" depends="clean-result, init, build, javadoc, internal-package-war, differences">
     </target>
 
     <target name="package-liferay-zip" depends="clean-result, init, build, internal-package-liferay">
@@ -619,20 +619,6 @@
     <!-- ================================================================== -->
     <!-- Documentation                                                      -->
     <!-- ================================================================== -->
-    <target name="docs" depends="init, javadoc, manual">
-    </target>
-
-	<target name="manual">
-    	<!-- Only pass the necessary properties -->
-        <ant antfile="build/build_manual.xml" target="manual" inheritall="false" inheritrefs="false">
-            <property name="version.full" value="${version.full}"/>
-        	<property name="checkout-path" value="${checkout-path}" />
-            <property name="result-path" value="${result-path}"/>
-            <property name="output-dir" value="${output-dir}"/>
-            <property name="product-file" value="${product-file}"/>
-        </ant>
-    </target>
-	
 
     <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  -->
     <!-- Documentation: Add Javadoc to doc                                  -->
@@ -726,7 +712,7 @@
     <!-- ================================================================== -->
 
     <!-- Main target for the nightly build. -->
-	<target name="nightly" depends="clean-result, nightly-init, init, build, docs, differences">
+	<target name="nightly" depends="clean-result, nightly-init, init, build, javadoc, differences">
     </target>
 
 
diff --git a/build/build_manual.xml b/build/build_manual.xml
deleted file mode 100644
index dc24c648f0..0000000000
--- a/build/build_manual.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="Book of Vaadin" basedir="../" default="manual">
-
-	<!-- Properties that need to be given by the caller:
-	  output-dir, result-path, version.full, product-file, checkout-path, user.name and jarsigner.bin -->
-
-    <target name="init">
-        <!-- Create result dirs unless already exist -->
-        <mkdir dir="${output-dir}" />
-        <mkdir dir="${output-dir}/WebContent" />
-        <mkdir dir="${output-dir}/WebContent/docs" />
-
-        <property name="docdir" value="${checkout-path}/docs"/>
-        
-        <available file="${docdir}/manual/book.xml" property="manual.source.available"/>
-    </target>
-
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  -->
-    <!-- Manual: Build from external repository.                            -->
-    <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -  -->
-
-    <!-- Build manual. -->
-    <target name="manual-build" depends="init" if="manual.source.available">
-    	<!-- The HTML and Eclipse Manual must be built with separate runs --> 
-        <ant dir="${docdir}" antfile="build/build.xml" inheritAll="false">
-            <property name="result-path" value="build/result"/>
-            <property name="output-dir" value="build/result/package" />
-            <property name="version" value="${version.full}"/>
-        </ant>
-        <ant dir="${docdir}" antfile="build/build.xml" target="manual-eclipse" inheritAll="false">
-            <property name="result-path" value="build/result"/>
-            <property name="output-dir" value="build/result/package" />
-            <property name="version" value="${version.full}"/>
-        </ant>
-    </target>
-
-    <!-- Copy the manual from sub Ant results to our output directory. -->
-    <target name="manual-copy" depends="init" if="manual.source.available">
-        <copy todir="${output-dir}/WebContent/docs">
-            <fileset dir="${docdir}/build/result/package/WebContent/docs">
-                <exclude name="**/.svn" />
-                <include name="book-of-vaadin.pdf" />
-            </fileset>
-        </copy>
-    </target>
-
-	<!-- Package documentation in a documentation Zip package.   -->
-	<!-- * Built Eclipse plugin is not included in this package. -->
-    <target name="manual-package" depends="init, manual-copy" if="manual.source.available">
-        <zip destfile="${result-path}/${product-file}-docs-${version.full}.zip">
-            <zipfileset prefix="docs" dir="${output-dir}/WebContent/docs">
-                <patternset>
-                    <!-- FIXME -->
-                    <include name="api/**" />
-                    <include name="book-of-vaadin.pdf" />
-                </patternset>
-            </zipfileset>
-            <zipfileset prefix="docs" dir="${docdir}/build/result/package/WebContent/docs">
-                <patternset>
-                    <!-- FIXME -->
-                    <include name="book/**" />
-                    <include name="tutorial/**" />
-                    <include name="vaadin-tutorial.pdf" />
-                </patternset>
-            </zipfileset>
-        </zip>
-    </target>
-
-	<!-- Publishes Eclipse plugin version of the manual as TeamCity artifacts.  -->
-	<!-- These are actually published during manual build, but with wrong path. -->
-	<target name="manual-publish-eclipse" if="manual.source.available">
-        <echo>##teamcity[publishArtifacts '${docdir}/build/result/package/eclipse/plugins/*.jar']</echo>
-        <echo>##teamcity[publishArtifacts '${docdir}/build/result/package/eclipse/features/*.jar']</echo>
-	</target>
-
-	<target name="manual-source-not-available" unless="manual.source.available">
-		<echo>Skipping Book of Vaadin build as it is not available in ${checkout-path}/docs</echo>
-	</target>
-
-	<target name="manual" depends="init, manual-source-not-available, manual-build, manual-copy, manual-package, manual-publish-eclipse">
-    </target>
-
-</project>