summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorLeif Åstrand <leif@vaadin.com>2012-05-30 09:26:26 +0300
committerLeif Åstrand <leif@vaadin.com>2012-05-30 09:26:26 +0300
commit929a76b832fdbeee20dcd35668a8ed1372ff71f8 (patch)
treeb928019169a66faece56efb72af4ee63ebb5f447 /build
parent658e2255f459208ae18d79bb0e426d6c58b04c03 (diff)
downloadvaadin-framework-929a76b832fdbeee20dcd35668a8ed1372ff71f8.tar.gz
vaadin-framework-929a76b832fdbeee20dcd35668a8ed1372ff71f8.zip
Move dependency to the target that is not run in parallel
Diffstat (limited to 'build')
-rw-r--r--build/build.xml6
1 files changed, 3 insertions, 3 deletions
diff --git a/build/build.xml b/build/build.xml
index 801be1b846..4f654310c0 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -525,7 +525,7 @@
</antcall>
</target>
- <target name="compile-widgetset-testing" depends="compile-tests">
+ <target name="compile-widgetset-testing">
<!-- Crate a path reference containing default widgetset classpath + testbench files -->
<path id="compile.classpath.testingwidgetset">
<path refid="compile.classpath.widgetset" />
@@ -548,7 +548,7 @@
<!-- Compiles all widgetsets. -->
<!-- This is called when building packages and when compiling all -->
<!-- widgetsets, but not when compiling individual widgetsets. -->
- <target name="compile-client-side" depends="compile-server-side">
+ <target name="compile-client-side" depends="compile-server-side, compile-tests">
<echo>Compiling widget sets in parallel.</echo>
<parallel threadsperprocessor="1">
<antcall inheritrefs="true" target="compile-widgetset-default"/>
@@ -571,7 +571,7 @@
<!-- Build each widgetset locally, i.e., not for an installation package. -->
<target name="widgetset-default" depends="init-nonpackage, init, compile-widgetset-generator, compile-widgetset-default" description="Compile the DefaultWidgetSet"/>
- <target name="widgetset-testing" depends="init-nonpackage, init, compile-widgetset-generator, compile-widgetset-testing"/>
+ <target name="widgetset-testing" depends="init-nonpackage, init, compile-tests, compile-widgetset-generator, compile-widgetset-testing"/>
<target name="widgetset-portal-default" depends="init-nonpackage, init, compile-widgetset-generator, compile-widgetset-portal-default"/>
<!-- ================================================================== -->