aboutsummaryrefslogtreecommitdiffstats
path: root/build/build.xml
diff options
context:
space:
mode:
authorHenri Sara <henri.sara@itmill.com>2011-08-18 11:02:10 +0000
committerHenri Sara <henri.sara@itmill.com>2011-08-18 11:02:10 +0000
commitd9a92db2f6daa9e74431456fd4a94ea54481a2e4 (patch)
tree7f2766310bbefa09b95c58b1b25a320cf9418bf6 /build/build.xml
parente0220a1c1a15f59f92647379cbc3fcd79a077f81 (diff)
downloadvaadin-framework-d9a92db2f6daa9e74431456fd4a94ea54481a2e4.tar.gz
vaadin-framework-d9a92db2f6daa9e74431456fd4a94ea54481a2e4.zip
#7392 remove manual build from Vaadin 6.7 build
svn changeset:20468/svn branch:6.7
Diffstat (limited to 'build/build.xml')
-rw-r--r--build/build.xml20
1 files changed, 3 insertions, 17 deletions
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>