diff options
| author | Mikael Vappula <mikael@vaadin.com> | 2011-12-01 16:48:19 +0200 |
|---|---|---|
| committer | Mikael Vappula <mikael@vaadin.com> | 2011-12-01 16:48:44 +0200 |
| commit | 46309c47b6700127c7aebb68d7fd893b1f0f8429 (patch) | |
| tree | 35ec3c8d68d1d2fd060089ef78feb4d61107a831 /build/build.xml | |
| parent | b41b0a91f6b05dfe25444a9abad8c75537f4c4d2 (diff) | |
| download | vaadin-framework-46309c47b6700127c7aebb68d7fd893b1f0f8429.tar.gz vaadin-framework-46309c47b6700127c7aebb68d7fd893b1f0f8429.zip | |
Ivy configuration and TestBench test build script updates.
Included first version of Ant based replacement of old vaadin-server.py
demo server launch script.
Diffstat (limited to 'build/build.xml')
| -rw-r--r-- | build/build.xml | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/build/build.xml b/build/build.xml index 21a66e9700..f06de06ba0 100644 --- a/build/build.xml +++ b/build/build.xml @@ -38,8 +38,6 @@ <target name="ivy-configure" depends="check-ivy-installed" unless="ivy.resolved"> <!-- Ivy task definitions --> <taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant" classpath="${ivy.jar.file}" /> - <!-- Ivy module descriptors --> - <property name="ivy.dep.file" value="build/ivy/ivy.xml" /> <!-- Ivy settings --> <property name="ivy.settings.file" value="build/ivy/ivysettings.xml" /> <ivy:configure /> @@ -47,7 +45,7 @@ <target name="ivy-resolve" depends="ivy-configure" unless="ivy.resolved"> <property name="ivy.resolved" value="1" /> - <ivy:resolve resolveid="main"/> + <ivy:resolve file="build/ivy/ivy.xml" resolveid="common"/> <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"/> @@ -363,19 +361,13 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - --> <target name="webcontent" depends="preprocess-src,defaulttheme"> - <!-- copy 3rd part libraries used by tests --> - <ivy:retrieve pattern="${output-dir}/WebContent/tests/lib/[artifact]-[revision].[ext]" conf="jetty" resolveid="main"/> - <ivy:retrieve pattern="${output-dir}/WebContent/tests/lib/[artifact]-[revision].[ext]" - organisation="emma" module="emma" revision="2.0.5312-patched" inline="true" resolveid="main" /> - <!-- Add WebContent --> - <echo>Adding VAADIN/themes, demo and hsqldb.jar files.</echo> + <echo>Adding VAADIN/themes and demo files.</echo> <copy todir="${output-dir}/WebContent"> <fileset dir="WebContent"> <exclude name="**/.svn" /> <!-- TODO check what is necessary --> <include name="demo/**/*" /> - <include name="WEB-INF/lib/hsqldb.jar" /> <include name="VAADIN/themes/**/*" /> <include name="META-INF/**/*" /> </fileset> @@ -985,7 +977,7 @@ </target> <!-- Assumes java classes have been compiled but depends does not work out well as this is run from a <parallel> task--> - <target name="testbench-tests" depends="init-taskdefs" unless="tests.testbench.skip"> + <target name="testbench-tests" depends="init" unless="tests.testbench.skip"> <fail unless="product-file" message="The 'product-file' property must be defined."/> <fail unless="version" message="The 'version' property must be defined."/> @@ -1011,8 +1003,8 @@ <!-- Convert tests to run multiple times if failed. --> <property name="retries" value="2"/> - - <property name="package.filename" value="${package.filename}"/> + + <property name="package.filename" value="${basedir}/${package.filename}"/> <property name="testing.testarea" value="/tmp/testarea"/> <property name="package.name" value="${package.name}"/> <property name="test-output-dir" value="../build/test-output" /> @@ -1021,6 +1013,7 @@ <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> <emma enabled="${emma.enabled}" > |