From 7b1a91f9ece0d38c74886383df3ee29d354592f8 Mon Sep 17 00:00:00 2001
From: Teemu Suo-Anttila <teemusa@vaadin.com>
Date: Wed, 23 Mar 2016 11:57:28 +0200
Subject: Build vaadin-buildhelpers with maven

Change-Id: I1b67fdc7d32d57f98bca78dba4fa190950b94507
---
 build.xml | 120 +++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 60 insertions(+), 60 deletions(-)

(limited to 'build.xml')

diff --git a/build.xml b/build.xml
index a88892772e..0c50b377b0 100644
--- a/build.xml
+++ b/build.xml
@@ -1,76 +1,76 @@
 <?xml version="1.0"?>
 
 <project name="vaadin" basedir="." default="package" xmlns:ivy="antlib:org.apache.ivy.ant">
-    <include file="common.xml" as="common" />
+	<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" 
+	<!-- ================================= 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="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="bin/**" />
-                <exclude name="buildhelpers/**" />
-                <exclude name="all/**" />
-            </fileset>
-        </ivy:buildlist>
-        <path id="build-path">
-            <path location="buildhelpers/build.xml" />
-            <path refid="ivy.build.path" />
-            <path location="all/build.xml" />
-        </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 
+	<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="bin/**" />
+				<exclude name="buildhelpers/**" />
+				<exclude name="all/**" />
+			</fileset>
+		</ivy:buildlist>
+		<path id="build-path">
+			<!--    <path location="buildhelpers/build.xml" /> -->
+			<path refid="ivy.build.path" />
+			<path location="all/build.xml" />
+		</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" />
+		<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>
+	<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">
-        <parallel>
-            <!-- JUnit tests, can be run without a server -->
-            <subant buildpathref="build-path" target="test" />
+	<target name="test-all" depends="buildorder">
+		<parallel>
+			<!-- JUnit tests, can be run without a server -->
+			<subant buildpathref="build-path" target="test" />
 
-            <!-- Server deployment + TestBench tests  -->
-            <antcall target="integration-test" />
-        </parallel>
-    </target>
+			<!-- Server deployment + TestBench tests  -->
+			<antcall target="integration-test" />
+		</parallel>
+	</target>
 
-    <target name="integration-test" depends="buildorder">
-        <property name="war.file" location="result/artifacts/${vaadin.version}/vaadin-uitest/vaadin-uitest-${vaadin.version}.war" />
+	<target name="integration-test" depends="buildorder">
+		<property name="war.file" location="result/artifacts/${vaadin.version}/vaadin-uitest/vaadin-uitest-${vaadin.version}.war" />
 
-        <ant antfile="uitest/build.xml" target="test-testbench">
-            <property name="war.file" location="${war.file}" />
-        </ant>
-     </target>
+		<ant antfile="uitest/build.xml" target="test-testbench">
+			<property name="war.file" location="${war.file}" />
+		</ant>
+	</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>
-- 
cgit v1.2.3