diff options
| author | Henri Sara <hesara@vaadin.com> | 2012-10-01 09:18:57 +0000 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2012-10-01 09:18:57 +0000 |
| commit | 56bccde137a8cb5587f1f3cd55bce15fb26fc2c3 (patch) | |
| tree | 2bb5bdab5e77539a96db4d186ea2d013b24e6b13 | |
| parent | 72ea54d8fa00ea17f462541584d51098929da895 (diff) | |
| parent | 8e6e071423f4c4fcfbbd9cbf442b4af13176ba58 (diff) | |
| download | vaadin-framework-56bccde137a8cb5587f1f3cd55bce15fb26fc2c3.tar.gz vaadin-framework-56bccde137a8cb5587f1f3cd55bce15fb26fc2c3.zip | |
Merge "Publish all javadoc as an artifact and build as part of the all module (#9745)"
| -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 --> |