summaryrefslogtreecommitdiffstats
path: root/uitest/build.xml
diff options
context:
space:
mode:
authorArtur Signell <artur@vaadin.com>2013-06-10 20:15:35 +0300
committerArtur Signell <artur@vaadin.com>2013-06-10 20:21:56 +0300
commit37bc9e41db0278f42263452e12a8b3fc87b664ba (patch)
treeec48ab05ece102bd43e727da253030dac26475b3 /uitest/build.xml
parentd9becf9523fdd71abb1b93072a76df163b9dd2c0 (diff)
downloadvaadin-framework-37bc9e41db0278f42263452e12a8b3fc87b664ba.tar.gz
vaadin-framework-37bc9e41db0278f42263452e12a8b3fc87b664ba.zip
Reformatted using Ant editor (#12040)
Change-Id: If8afd65d5905302c64f12ef7f76ee7e63073c474
Diffstat (limited to 'uitest/build.xml')
-rw-r--r--uitest/build.xml32
1 files changed, 10 insertions, 22 deletions
diff --git a/uitest/build.xml b/uitest/build.xml
index dc9258a807..d4dbb648c1 100644
--- a/uitest/build.xml
+++ b/uitest/build.xml
@@ -1,7 +1,6 @@
<?xml version="1.0"?>
-<project name="vaadin-uitest" basedir="." default="publish-local"
- xmlns:ivy="antlib:org.apache.ivy.ant">
+<project name="vaadin-uitest" basedir="." default="publish-local" xmlns:ivy="antlib:org.apache.ivy.ant">
<description>
Provides a uitest WAR containing Vaadin UI tests
</description>
@@ -11,8 +10,7 @@
<!-- global properties -->
<property name="module.name" value="vaadin-uitest" />
<property name="result.dir" value="result" />
- <property name="result.war"
- location="${result.dir}/lib/${module.name}-${vaadin.version}.war" />
+ <property name="result.war" location="${result.dir}/lib/${module.name}-${vaadin.version}.war" />
<path id="classpath.compile.custom">
</path>
@@ -22,12 +20,10 @@
to the source path -->
<ivy:resolve resolveid="common" conf="build, build-provided" />
- <ivy:cachepath pathid="classpath.compile.dependencies"
- conf="build, build-provided" />
+ <ivy:cachepath pathid="classpath.compile.dependencies" conf="build, build-provided" />
</target>
- <target name="compile" description="Compiles the module"
- depends="dependencies">
+ <target name="compile" description="Compiles the module" depends="dependencies">
<fail unless="module.name" message="No module name given" />
<property name="result.dir" location="result" />
@@ -37,21 +33,16 @@
<mkdir dir="${classes}" />
<!-- TODO: Get rid of this -->
- <javac destdir="${classes}" source="${vaadin.java.version}"
- target="${vaadin.java.version}" debug="true" encoding="UTF-8"
- includeantruntime="false">
+ <javac destdir="${classes}" source="${vaadin.java.version}" target="${vaadin.java.version}" debug="true" encoding="UTF-8" includeantruntime="false">
<src path="${server.test.sources}" />
<include name="com/vaadin/tests/data/bean/**" />
<include name="com/vaadin/tests/VaadinClasses.java" />
- <include
- name="com/vaadin/data/util/sqlcontainer/SQLTestsConstants.java" />
+ <include name="com/vaadin/data/util/sqlcontainer/SQLTestsConstants.java" />
<classpath refid="classpath.compile.dependencies" />
<classpath refid="classpath.compile.custom" />
</javac>
- <javac destdir="${classes}" source="${vaadin.java.version}"
- target="${vaadin.java.version}" debug="true" encoding="UTF-8"
- includeantruntime="false">
+ <javac destdir="${classes}" source="${vaadin.java.version}" target="${vaadin.java.version}" debug="true" encoding="UTF-8" includeantruntime="false">
<src path="${src}" />
<classpath location="${classes}" />
<classpath refid="classpath.compile.dependencies" />
@@ -60,8 +51,7 @@
</target>
<target name="testing-widgetset" depends="dependencies,compile">
- <property name="module"
- value="com.vaadin.tests.widgetset.TestingWidgetSet" />
+ <property name="module" value="com.vaadin.tests.widgetset.TestingWidgetSet" />
<property name="style" value="OBF" />
<property name="localWorkers" value="2" />
<property name="extraParams" value="" />
@@ -73,8 +63,7 @@
<echo>Compiling ${module} to ${module.output.dir}</echo>
<!-- compile the module -->
- <java classname="com.google.gwt.dev.Compiler" classpathref="classpath.compile.dependencies"
- failonerror="yes" fork="yes" maxmemory="512m">
+ <java classname="com.google.gwt.dev.Compiler" classpathref="classpath.compile.dependencies" failonerror="yes" fork="yes" maxmemory="512m">
<classpath location="src" />
<classpath location="${classes}" />
<arg value="-workDir" />
@@ -109,8 +98,7 @@
<property name="src" location="${result.dir}/../src" />
<ivy:resolve resolveid="common" conf="build" />
- <ivy:cachepath pathid="classpath.runtime.dependencies"
- conf="build" />
+ <ivy:cachepath pathid="classpath.runtime.dependencies" conf="build" />
<delete dir="${deps.dir}" />
<mkdir dir="${deps.dir}" />