diff options
| author | Sauli Tähkäpää <sauli@vaadin.com> | 2014-03-10 18:07:35 +0200 |
|---|---|---|
| committer | Sauli Tähkäpää <sauli@vaadin.com> | 2014-03-10 18:07:35 +0200 |
| commit | 0417c063514eccb34075bc41268398f5cab05947 (patch) | |
| tree | 732cfe26b268c110e58ab5bcb540185b716f289d /all | |
| parent | c0e408c325a8b5465bfad4526a16a473928c17f4 (diff) | |
| download | vaadin-framework-0417c063514eccb34075bc41268398f5cab05947.tar.gz vaadin-framework-0417c063514eccb34075bc41268398f5cab05947.zip | |
Fixed nojavadoc parameter on "all" build.
Change-Id: I336cbee8bf33591552034c1cdf29d34fc49e3c43
Diffstat (limited to 'all')
| -rw-r--r-- | all/build.xml | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/all/build.xml b/all/build.xml index 0d6f48fc32..65980e9b05 100644 --- a/all/build.xml +++ b/all/build.xml @@ -37,12 +37,14 @@ <target name="javadoc" depends="copy-jars"> <!-- Ensure filtered webcontent files are available --> <antcall target="common.filter.webcontent" /> - - <property name="javadoc.dir" location="${result.dir}/javadoc" /> <antcontrib:if> <isset property="nojavadoc" /> - <then /> + <then> + <jar file="${javadoc.jar}" compress="true"> + <fileset refid="common.files.for.all.jars" /> + </jar> + </then> <else> <!-- Unpack all source files to javadoc.temp.dir --> <antcontrib:foreach list="${modules.to.publish.to.maven}" target="unzip.to.javadoctemp" param="module" /> @@ -63,14 +65,14 @@ <link offline="true" href="http://java.sun.com/j2ee/1.4/docs/api/" packagelistLoc="build/javadoc/j2ee-1.4" /> <classpath refid="classpath.javadoc" /> </javadoc> + + <!-- Create a javadoc jar --> + <jar file="${javadoc.jar}" compress="true"> + <fileset dir="${javadoc.dir}" /> + <fileset refid="common.files.for.all.jars" /> + </jar> </else> </antcontrib:if> - <!-- Create a javadoc jar --> - <jar file="${javadoc.jar}" compress="true"> - <fileset dir="${javadoc.dir}" /> - <fileset refid="common.files.for.all.jars" /> - </jar> - </target> <target name="copy-jars"> |