summaryrefslogtreecommitdiffstats
path: root/all/build.xml
diff options
context:
space:
mode:
authorArtur Signell <artur@vaadin.com>2013-02-22 16:23:49 +0200
committerArtur Signell <artur@vaadin.com>2013-02-22 16:24:06 +0200
commitfbdc52551e258d938db2e230366ca0e21d35c5bc (patch)
tree640740bcb63c2757facc9f19748a65eb46b50174 /all/build.xml
parentd9a8a21a62b977e32b65bcf436bbd229c9b798f4 (diff)
parent7af5b3fceb75b6f505a9a6d0a843b788bb06d9a7 (diff)
downloadvaadin-framework-fbdc52551e258d938db2e230366ca0e21d35c5bc.tar.gz
vaadin-framework-fbdc52551e258d938db2e230366ca0e21d35c5bc.zip
Merge remote-tracking branch 'origin/7.0'
Change-Id: Id48ccb3c400a78cddb8bb5c7bbcf2d65174e59d0
Diffstat (limited to 'all/build.xml')
-rw-r--r--all/build.xml6
1 files changed, 6 insertions, 0 deletions
diff --git a/all/build.xml b/all/build.xml
index ef8ac71c4d..40d82b3d47 100644
--- a/all/build.xml
+++ b/all/build.xml
@@ -35,6 +35,9 @@
</target>
<target name="javadoc" depends="copy-jars">
+ <!-- Ensure filtered webcontent files are available -->
+ <antcall target="common.filter.webcontent" />
+
<!-- Unpack all source files to javadoc.temp.dir-->
<antcontrib:foreach list="${modules.to.publish.to.maven}" target="unzip.to.javadoctemp" param="module" />
@@ -76,6 +79,9 @@
</target>
<target name="zip" depends="copy-jars, javadoc">
+ <!-- Ensure filtered webcontent files are available -->
+ <antcall target="common.filter.webcontent" />
+
<zip destfile="${zip.file}">
<fileset dir="${temp.dir}">
<!-- Avoid conflicts with servlet and portlet API. They are provided by the container -->