diff options
| author | Marko Grönroos <magi@iki.fi> | 2010-11-12 13:05:55 +0000 |
|---|---|---|
| committer | Marko Grönroos <magi@iki.fi> | 2010-11-12 13:05:55 +0000 |
| commit | f17cc09a8432badd0856c147812048b9d99d2435 (patch) | |
| tree | 598838c17dcc99ce3a8a757d55e73492a0e33f9e /build/build.xml | |
| parent | e15ec0268edcdf22069c68392f42a82380d5100f (diff) | |
| parent | 8a53f2142341d74ed64d5e0830e6661c35c893a8 (diff) | |
| download | vaadin-framework-f17cc09a8432badd0856c147812048b9d99d2435.tar.gz vaadin-framework-f17cc09a8432badd0856c147812048b9d99d2435.zip | |
Merge from versions/6.4 to versions/6.5:
Merged [15882]: Added test case for #5952.
Merged [15933]: Build Eclipse manual separately. For #5964 and #5968.
Merged [15960]: Release tagging tool.
svn changeset:15975/svn branch:6.5
Diffstat (limited to 'build/build.xml')
| -rw-r--r-- | build/build.xml | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/build/build.xml b/build/build.xml index 0603bf7ed7..fe9d024792 100644 --- a/build/build.xml +++ b/build/build.xml @@ -913,9 +913,13 @@ <!-- Build manual. --> <target name="manual-build" depends="manual-init, xep-license-copy"> - <ant dir="${docdir}" antfile="build/build.xml" inheritAll="false"> - <property name="version" value="${version.full}"/> - </ant> + <!-- The HTML and Eclipse Manual must be built with separate runs --> + <ant dir="${docdir}" antfile="build/build.xml" inheritAll="false"> + <property name="version" value="${version.full}"/> + </ant> + <ant dir="${docdir}" antfile="build/build.xml" target="manual-eclipse" inheritAll="false"> + <property name="version" value="${version.full}"/> + </ant> </target> <!-- Copy the manual from sub Ant results to our output directory. --> |