From ca96dca574f2412c760b0b70a72b3166e9f813fc Mon Sep 17 00:00:00 2001
From: Henri Sara <henri.sara@itmill.com>
Date: Wed, 27 Jul 2011 08:15:35 +0000
Subject: Merged changes to 6.7

svn changeset:19972/svn branch:6.7
---
 build/build.xml | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

(limited to 'build')

diff --git a/build/build.xml b/build/build.xml
index d6bdfa6dd1..3197f15c56 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -30,16 +30,20 @@
     <target name="package-test" depends="clean-result, nightly-init, package-init, init, build, docs, internal-package-zip, nightly-publish">
     </target>
 
+    <!-- Locations of Ant task JARs - build properties not yet read at this point -->
+    <property name="ant.task.jar.antcontrib" value="build/lib/ant-contrib-1.0b3.jar" />
+    <property name="ant.task.jar.maven" value="build/lib/maven-ant-tasks-2.0.10.jar" />
+
     <!-- ant contrib required for flow control (for loop, if, property override)   -->
     <!-- Note that we have to use a namespace to avoid clash when running sub-ant. -->
     <taskdef uri="antlib:net.sf.antcontrib" resource="net/sf/antcontrib/antlib.xml">
         <classpath>
-            <pathelement location="build/lib/ant-contrib-1.0b3.jar" />
+            <pathelement location="${ant.task.jar.antcontrib}" />
         </classpath>
     </taskdef>
 
     <!-- ant contrib for Maven integration -->
-    <path id="maven-ant-tasks.classpath" path="build/lib/maven-ant-tasks-2.0.10.jar" />
+    <path id="maven-ant-tasks.classpath" path="${ant.task.jar.maven}" />
     <typedef resource="org/apache/maven/artifact/ant/antlib.xml"
              uri="antlib:org.apache.maven.artifact.ant"
              classpathref="maven-ant-tasks.classpath" />
@@ -626,7 +630,9 @@
 
     <target name="remove-widgetset-gwt-tmp">
         <echo>Removing widgetset temp files</echo>
-        <delete dir="${output-dir}/WebContent/VAADIN/widgetsets/.gwt-tmp" includeemptydirs="true"/>
+        <delete dir="${widgetsets-output-dir}/.gwt-tmp" includeemptydirs="true"/>
+    	<!-- This is generated by GWT 2.3+ for rpcPolicyManifest and symbolMaps, cannot disable -->
+        <delete dir="${widgetsets-output-dir}/WEB-INF" includeemptydirs="true" failonerror="false" />
     </target>
 
     <!-- Note: Probably not needed any longer as all sources need to be compiled. -->
@@ -993,7 +999,7 @@
     <!-- ================================================================== -->
 
     <!-- Main target for the custom build. -->
-    <target name="custom-build" depends="clean-result, custom-build-init, nightly-init, package-init, init, compile-server-side, compile-client-side, vaadin.jar, vaadin-sources.jar">
+    <target name="custom-build" depends="clean-result, custom-build-init, nightly-init, package-init, init, build">
     </target>
 
 
@@ -1011,7 +1017,7 @@
 		        <property file="${build.properties.file}" />
 				<property name="version" value="${vaadin.version}"/>
 		        <property name="version.full" value="${version}.custom-${build.date.compact}"/>
-				<property name="compile.only.default-widgetset" value="1"/>
+				<!-- <property name="compile.only.default-widgetset" value="1"/> -->
 	   		</then>
 			<!-- Otherwise version and snapshot.repository.url come from target "init" -->
 	  	</antcontrib:if>
@@ -1245,6 +1251,8 @@
         <fail unless="com.vaadin.testbench.deployment.url" message="The 'com.vaadin.testbench.deployment.url' property must be defined."/>
         <fail unless="com.vaadin.testbench.lib.dir" message="The 'com.vaadin.testbench.lib.dir' property must be defined."/>
 
+    	<property name="com.vaadin.testbench.screenshot.block.error" value="0.025"/>
+    	<property name="com.vaadin.testbench.debug" value="false"/>
         <property name="package.name" value="${base-name}"/>
 
         <!-- Only Linux tests allowed. TODO: Generalize this. -->
@@ -1257,9 +1265,8 @@
             <!-- "tests" classes after unpacking the package.          -->
             <property name="output-dir" value="${output-dir}"/>
 
-        	<!-- Convert some tests to run multiple times if failed. -->
-            <property name="create.retry.tests" value="1"/>
-        	<property name="retries" value="3"/>
+        	<!-- Convert tests to run multiple times if failed. -->
+        	<property name="retries" value="2"/>
             	
             <property name="package.filename" value="${package.filename}"/>
             <property name="testing.testarea" value="/tmp/testarea"/>
@@ -1268,6 +1275,8 @@
             <property name="com.vaadin.testbench.tester.host" value="${com.vaadin.testbench.tester.host}"/>
             <property name="com.vaadin.testbench.deployment.url" value="${com.vaadin.testbench.deployment.url}"/>
             <property name="com.vaadin.testbench.lib.dir" value="${com.vaadin.testbench.lib.dir}"/>
+            <property name="com.vaadin.testbench.debug" value="${com.vaadin.testbench.debug}"/>
+            <property name="com.vaadin.testbench.screenshot.block.error" value="${com.vaadin.testbench.screenshot.block.error}"/>
         </ant>
     </target>
 
-- 
cgit v1.2.3