diff options
| author | Henri Sara <henri.sara@itmill.com> | 2011-08-10 07:10:48 +0000 |
|---|---|---|
| committer | Henri Sara <henri.sara@itmill.com> | 2011-08-10 07:10:48 +0000 |
| commit | 44011d913afb6e6131b3ff5c53773f99294b64d6 (patch) | |
| tree | 73d8ad381cf1a48d5efda340590dc8a4c33ffb42 | |
| parent | 0ccf68886cca3638c6c8a8e7680267064fd0598b (diff) | |
| download | vaadin-framework-44011d913afb6e6131b3ff5c53773f99294b64d6.tar.gz vaadin-framework-44011d913afb6e6131b3ff5c53773f99294b64d6.zip | |
#7178 removed colorpicker and optimized widgetset compilation from Vaadin 6.7, parallelize compilation or permutations with -localWorkers
svn changeset:20249/svn branch:6.7
| -rw-r--r-- | build/build.xml | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/build/build.xml b/build/build.xml index f4e5a9ea1b..fcf3b7bebc 100644 --- a/build/build.xml +++ b/build/build.xml @@ -673,6 +673,8 @@ <arg value="${widgetsets-output-dir}" /> <arg value="-style" /> <arg value="OBF" /> + <arg value="-localWorkers" /> + <arg value="4" /> <arg value="${widgetset}" /> <jvmarg value="-Xss8M"/> @@ -696,18 +698,6 @@ </antcall> </target> - <target name="compile-widgetset-optimized" unless="compile.only.default-widgetset"> - <antcall target="compile-widgetset"> - <param name="widgetset" value="com.vaadin.demo.gwt.OptimizedWidgetSet"/> - </antcall> - </target> - - <target name="compile-widgetset-colorpicker" unless="compile.only.default-widgetset"> - <antcall target="compile-widgetset"> - <param name="widgetset" value="com.vaadin.demo.colorpicker.gwt.ColorPickerWidgetSet"/> - </antcall> - </target> - <!-- Builds the client-side engine, i.e., the widgetsets sequentially. --> <!-- Notice that antcall does not fulfill dependencies. --> <target name="compile-client-side-sequential" unless="build.parallel"> @@ -715,8 +705,6 @@ <!-- We can't call these with 'depends' because of the 'unless' specifier. --> <antcall target="compile-widgetset-default"/> <antcall target="compile-widgetset-portal-default"/> - <antcall target="compile-widgetset-optimized"/> - <antcall target="compile-widgetset-colorpicker"/> </target> <!-- Builds the client-side engine, i.e., the widgetsets in parallel. --> @@ -726,8 +714,6 @@ <parallel threadsperprocessor="1"> <antcall target="compile-widgetset-default"/> <antcall target="compile-widgetset-portal-default"/> - <antcall target="compile-widgetset-optimized"/> - <antcall target="compile-widgetset-colorpicker"/> </parallel> </target> @@ -761,7 +747,6 @@ <!-- 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"/> <target name="widgetset-portal-default" depends="init-nonpackage, init, compile-widgetset-generator, compile-widgetset-portal-default"/> - <target name="widgetset-colorpicker" depends="init-nonpackage, init, compile-widgetset-generator, compile-widgetset-colorpicker"/> <!-- ================================================================== --> <!-- Libraries and Demos --> |