summaryrefslogtreecommitdiffstats
path: root/all/build.xml
diff options
context:
space:
mode:
authorArtur Signell <artur@vaadin.com>2012-09-28 19:44:01 +0300
committerArtur Signell <artur@vaadin.com>2012-09-28 19:46:10 +0300
commit8e6e071423f4c4fcfbbd9cbf442b4af13176ba58 (patch)
treec68cf27f3b3fbdb05891f788482cc03ca6f31a85 /all/build.xml
parentca59c93fb4dbc112e5deb5f5a4b10c0c730a4be4 (diff)
downloadvaadin-framework-8e6e071423f4c4fcfbbd9cbf442b4af13176ba58.tar.gz
vaadin-framework-8e6e071423f4c4fcfbbd9cbf442b4af13176ba58.zip
Publish all javadoc as an artifact and build as part of the all module (#9745)
Change-Id: I2d5ce81a2b9170eb7c9b91e37d0cf39d5383457c
Diffstat (limited to 'all/build.xml')
-rw-r--r--all/build.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/all/build.xml b/all/build.xml
index d8bc535bb4..8f60703be6 100644
--- a/all/build.xml
+++ b/all/build.xml
@@ -10,7 +10,7 @@
<!-- global properties -->
<property name="module.name" value="vaadin-all" />
<property name="result.dir" value="result" />
- <property name="javadoc.jar" location="${result.dir}/vaadin-all-${vaadin.version}-javadoc.jar" />
+ <property name="javadoc.jar" location="${result.dir}/lib/vaadin-all-${vaadin.version}-javadoc.jar" />
<property name="temp.dir" location="${result.dir}/temp" />
<property name="temp.deps.dir" value="${temp.dir}/lib" />
<property name="javadoc.temp.dir" location="${result.dir}/javadoc-temp" />
@@ -75,7 +75,7 @@
</target>
- <target name="zip" depends="copy-jars">
+ <target name="zip" depends="copy-jars, javadoc">
<zip destfile="${zip.file}">
<fileset dir="${temp.dir}">
<!-- Avoid conflicts with servlet and portlet API. They are provided by the container -->