diff options
| author | Artur Signell <artur@vaadin.com> | 2012-09-28 19:44:01 +0300 |
|---|---|---|
| committer | Artur Signell <artur@vaadin.com> | 2012-09-28 19:46:10 +0300 |
| commit | 8e6e071423f4c4fcfbbd9cbf442b4af13176ba58 (patch) | |
| tree | c68cf27f3b3fbdb05891f788482cc03ca6f31a85 | |
| parent | ca59c93fb4dbc112e5deb5f5a4b10c0c730a4be4 (diff) | |
| download | vaadin-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
| -rw-r--r-- | all/build.xml | 4 | ||||
| -rw-r--r-- | all/ivy.xml | 1 |
2 files changed, 3 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 --> diff --git a/all/ivy.xml b/all/ivy.xml index aebba5ba35..103d65e812 100644 --- a/all/ivy.xml +++ b/all/ivy.xml @@ -11,6 +11,7 @@ </configurations> <publications> <artifact type="zip" ext="zip" /> + <artifact type="javadoc" ext="jar" m:classifier="javadoc" /> </publications> <dependencies defaultconf="build"> <!-- API DEPENDENCIES --> |