diff options
| author | Artur Signell <artur@vaadin.com> | 2013-05-30 17:06:30 +0300 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2013-05-30 15:08:00 +0000 |
| commit | 9a3dc4e99c7a417778342db83cd6e7c05558e5fb (patch) | |
| tree | 4a77e0b93e48c9f2fec4839ffae76c3334ec337b /build.xml | |
| parent | d850db60f9f7e144307bcf525d96665d1be64fc8 (diff) | |
| download | vaadin-framework-9a3dc4e99c7a417778342db83cd6e7c05558e5fb.tar.gz vaadin-framework-9a3dc4e99c7a417778342db83cd6e7c05558e5fb.zip | |
Formatted XML files using defined rules (#11956)
Change-Id: Iecd621321fdde29d2d89d910ba46e9dadee58995
Diffstat (limited to 'build.xml')
| -rw-r--r-- | build.xml | 131 |
1 files changed, 69 insertions, 62 deletions
@@ -1,71 +1,78 @@ <?xml version="1.0"?> -<project name="vaadin" basedir="." default="package" xmlns:ivy="antlib:org.apache.ivy.ant"> - <include file="common.xml" as="common" /> +<project name="vaadin" basedir="." default="package" + xmlns:ivy="antlib:org.apache.ivy.ant"> + <include file="common.xml" as="common" /> - <path id="vaadin.buildhelpers.classpath" location="${vaadin.basedir}/buildhelpers/result/classes" /> + <path id="vaadin.buildhelpers.classpath" location="${vaadin.basedir}/buildhelpers/result/classes" /> - <!-- ================================= - target: all - ================================= --> - <!--<target name="all" description="Compiles all parts of the project" depends="buildhelpers,theme-compiler,shared,server,client">--> - <target name="package" description="Compiles and packages all modules in the project" depends="buildorder"> - <subant buildpathref="build-path" target="publish-local"> - </subant> - </target> + <!-- ================================= target: all ================================= --> + <!--<target name="all" description="Compiles all parts of the project" + depends="buildhelpers,theme-compiler,shared,server,client"> --> + <target name="package" + description="Compiles and packages all modules in the project" + depends="buildorder"> + <subant buildpathref="build-path" target="publish-local"> + </subant> + </target> - <target name="buildorder" depends="official.build.checks"> - <!-- Find out a good build order --> - <ivy:buildlist reference="ivy.build.path"> - <fileset dir="." includes="**/build.xml"> - <exclude name="build.xml" /> - <exclude name="build/**" /> - <exclude name="buildhelpers/**" /> - </fileset> - </ivy:buildlist> - <path id="build-path"> - <path location="buildhelpers/build.xml"/> - <path refid="ivy.build.path" /> - </path> - </target> - <target name="clean" depends="buildorder"> - <subant buildpathref="build-path" target="clean"> - </subant> - <delete dir="result" /> - <!-- Clean IVY cache (~/.ivy2) so no old artifacts are fetched from there (leave everything but Vaadin artifacts) --> - <delete dir="${ivy.cache.dir}/com.vaadin" /> - <delete dir="${ivy.cache.dir}/com.carrotsearch" /> + <target name="buildorder" depends="official.build.checks"> + <!-- Find out a good build order --> + <ivy:buildlist reference="ivy.build.path"> + <fileset dir="." includes="**/build.xml"> + <exclude name="build.xml" /> + <exclude name="build/**" /> + <exclude name="buildhelpers/**" /> + </fileset> + </ivy:buildlist> + <path id="build-path"> + <path location="buildhelpers/build.xml" /> + <path refid="ivy.build.path" /> + </path> + </target> + <target name="clean" depends="buildorder"> + <subant buildpathref="build-path" target="clean"> + </subant> + <delete dir="result" /> + <!-- Clean IVY cache (~/.ivy2) so no old artifacts are fetched from + there (leave everything but Vaadin artifacts) --> + <delete dir="${ivy.cache.dir}/com.vaadin" /> + <delete dir="${ivy.cache.dir}/com.carrotsearch" /> - </target> - <target name="checkstyle" depends="buildorder"> - <subant buildpathref="build-path" target="checkstyle"/> - </target> - <target name="test" depends="buildorder"> - <subant buildpathref="build-path" target="test" /> - </target> - <target name="test-all" depends="buildorder"> - <property name="war.file" location="result/artifacts/${vaadin.version}/vaadin-uitest/vaadin-uitest-${vaadin.version}.war" /> - <parallel> - <sequential> - <!-- Sleep before running integration tests so testbench tests have time to compile and start --> - <sleep minutes="4" /> - <ant antfile="uitest/integration_tests.xml" target="integration-test-all" inheritall="false" inheritrefs="false"> - <property name="demo.war" value="${war.file}" /> - </ant> - </sequential> - <subant buildpathref="build-path" target="test" /> - <ant antfile="uitest/test.xml" target="test-package"> - <property name="war.file" location="${war.file}" /> - </ant> - </parallel> - </target> + </target> + <target name="checkstyle" depends="buildorder"> + <subant buildpathref="build-path" target="checkstyle" /> + </target> + <target name="test" depends="buildorder"> + <subant buildpathref="build-path" target="test" /> + </target> + <target name="test-all" depends="buildorder"> + <property name="war.file" + location="result/artifacts/${vaadin.version}/vaadin-uitest/vaadin-uitest-${vaadin.version}.war" /> + <parallel> + <sequential> + <!-- Sleep before running integration tests so testbench + tests have time to compile and start --> + <sleep minutes="4" /> + <ant antfile="uitest/integration_tests.xml" target="integration-test-all" + inheritall="false" inheritrefs="false"> + <property name="demo.war" value="${war.file}" /> + </ant> + </sequential> + <subant buildpathref="build-path" target="test" /> + <ant antfile="uitest/test.xml" target="test-package"> + <property name="war.file" location="${war.file}" /> + </ant> + </parallel> + </target> - <target name="official.build.checks" if="build.release"> - <condition property="java.version.matches"> - <equals arg1="${ant.java.version}" arg2="${vaadin.java.version}" /> - </condition> - <fail unless="java.version.matches" message="Java version is ${ant.java.version}, but Vaadin must be compiled with genuine Java ${vaadin.java.version} compiler." /> - <echo>Java version is ${ant.java.version} as required.</echo> - </target> + <target name="official.build.checks" if="build.release"> + <condition property="java.version.matches"> + <equals arg1="${ant.java.version}" arg2="${vaadin.java.version}" /> + </condition> + <fail unless="java.version.matches" + message="Java version is ${ant.java.version}, but Vaadin must be compiled with genuine Java ${vaadin.java.version} compiler." /> + <echo>Java version is ${ant.java.version} as required.</echo> + </target> </project> |