Merged fix for #2819 - Updated build.xml to remove .gwt-tmp when a widgetset has...

svn changeset:7401/svn branch:6.0

diff --git a/build/build.xml b/build/build.xml
index 06bcd3fb79a61f05ec7dde6ddb325a7347163aca..e5cadfd72e869aa9f980d1beda07d4425f08c61b 100644 (file)
--- a/build/build.xml
+++ b/build/build.xml
@@ -734,6 +734,11 @@
                <echo>TEST TARGET CALLED</echo>
        </target>
 
+       <target name="remove-widgetset-gwt-tmp">
+               <echo>Removing widgetset temp files</echo>
+               <delete dir="${output-dir}/WebContent/ITMILL/widgetsets/.gwt-tmp" includeemptydirs="true"/>
+       </target>
+
        <target name="compile-widgetset-default">
                <echo>Compiling src (client-side)</echo>
                <echo>com.itmill.toolkit.terminal.gwt.DefaultWidgetSet</echo>
@@ -751,6 +756,7 @@
                                <pathelement location="${result-path}/src" />
                        </classpath>
                </java>
+               <antcall target="remove-widgetset-gwt-tmp"/>
                <echo>Compiled DefaultWidgetSet</echo>
        </target>
 
@@ -780,6 +786,7 @@
                                <pathelement path="${output-dir}/WebContent/WEB-INF/src" />
                        </classpath>
                </java>
+               <antcall target="remove-widgetset-gwt-tmp"/>
                <echo>Compiled ReservationWidgetSet</echo>
        </target>
 
@@ -802,6 +809,7 @@
                                <pathelement path="${output-dir}/WebContent/WEB-INF/src" />
                        </classpath>
                </java>
+               <antcall target="remove-widgetset-gwt-tmp"/>
                <echo>Compiled SamplerWidgetSet</echo>
        </target>
        
@@ -823,7 +831,8 @@
                                <pathelement path="${output-dir}/WebContent/WEB-INF/src" />
                        </classpath>
                </java>
-               <echo>Compiled SamplerWidgetSet</echo>
+               <antcall target="remove-widgetset-gwt-tmp"/>
+               <echo>Compiled CoverflowWidgetSet</echo>
        </target>
        
        <target name="compile-widgetset-colorpicker">
@@ -844,6 +853,7 @@
                                <pathelement path="${output-dir}/WebContent/WEB-INF/src" />
                        </classpath>
                </java>
+               <antcall target="remove-widgetset-gwt-tmp"/>
                <echo>Compiled ColorPickerWidgetSet</echo>
        </target>