diff options
| author | Mikael Vappula <mikael@vaadin.com> | 2011-11-25 16:41:03 +0200 |
|---|---|---|
| committer | Mikael Vappula <mikael@vaadin.com> | 2011-11-25 16:41:03 +0200 |
| commit | 00bb974280dd7e6363b9872f9a95560513e44018 (patch) | |
| tree | 773f29a7391e2f4339acdc33dab72029db1a1704 /build | |
| parent | 7254371cf6316349e372a78511365dfa55d57bb2 (diff) | |
| download | vaadin-framework-00bb974280dd7e6363b9872f9a95560513e44018.tar.gz vaadin-framework-00bb974280dd7e6363b9872f9a95560513e44018.zip | |
Fixed ivy configuration errors caused by parallel ant tasks
Diffstat (limited to 'build')
| -rw-r--r-- | build/build.xml | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/build/build.xml b/build/build.xml index 0a42cde984..886c395071 100644 --- a/build/build.xml +++ b/build/build.xml @@ -45,12 +45,13 @@ <ivy:configure /> </target> - <target name="ivy-resolve" depends="ivy-configure"> - <ivy:resolve /> - <ivy:cachepath pathid="compile.classpath" conf="compile"/> - <ivy:cachepath pathid="client-side.compile.classpath" conf="client-side.compile"/> - <ivy:cachepath pathid="test.runtime.classpath" conf="test.runtime"/> - <ivy:cachepath pathid="taskdefs.classpath" conf="ant-tasks"/> + <target name="ivy-resolve" depends="ivy-configure" unless="ivy.resolved"> + <property name="ivy.resolved" value="1" /> + <ivy:resolve /> + <ivy:cachepath pathid="compile.classpath" conf="compile"/> + <ivy:cachepath pathid="client-side.compile.classpath" conf="client-side.compile"/> + <ivy:cachepath pathid="test.runtime.classpath" conf="test.runtime"/> + <ivy:cachepath pathid="taskdefs.classpath" conf="ant-tasks"/> </target> <target name="init-taskdefs" depends="ivy-resolve"> @@ -505,12 +506,14 @@ <target name="compile-widgetset-default"> <antcall target="compile-widgetset"> + <reference refid="client-side.compile.classpath" /> <param name="widgetset" value="com.vaadin.terminal.gwt.DefaultWidgetSet"/> </antcall> </target> <target name="compile-widgetset-portal-default" unless="compile.only.default-widgetset"> <antcall target="compile-widgetset"> + <reference refid="client-side.compile.classpath" /> <param name="widgetset" value="com.vaadin.portal.gwt.PortalDefaultWidgetSet"/> </antcall> </target> @@ -521,8 +524,8 @@ <target name="compile-client-side" depends="compile-server-side"> <echo>Compiling widget sets in parallel.</echo> <parallel threadsperprocessor="1"> - <antcall target="compile-widgetset-default"/> - <antcall target="compile-widgetset-portal-default"/> + <antcall inheritrefs="true" target="compile-widgetset-default"/> + <antcall inheritrefs="true" target="compile-widgetset-portal-default"/> </parallel> </target> |