mirrors
/
vaadin-framework
mirror of https://github.com/vaadin/framework.git
Watch 1
Star 0
Fork 0
Code Issues 0 Releases 330 Wiki Activity
Browse Source

Further Ivy/Ant cleanup 

This change removes the top-level build.xml and some other Ivy/Ant
configuration entries.

Change-Id: I56fb1621a66ef190a72cfe1f9eb277bb878db4b5
tags/7.7.0.alpha1
Henri Sara 8 years ago
parent
6b134587d6
commit
9beaf0fa7f
3 changed files with 2 additions and 169 deletions
Split View Show Diff Stats
  1. 0
    60
      build.xml
  2. 0
    107
      common.xml
  3. 2
    2
      uitest/build.xml

+ 0
- 60
build.xml View File

@@ -1,60 +0,0 @@
<?xml version="1.0"?>

<project name="vaadin" basedir="." default="package" xmlns:ivy="antlib:org.apache.ivy.ant">
<include file="common.xml" as="common" />

<!-- ================================= 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">
</target>

<target name="buildorder" depends="official.build.checks">
<path id="build-path">
<path location="uitest/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" />

</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" />

<!-- 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" />

<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>

</project>

+ 0
- 107
common.xml View File

@@ -13,114 +13,7 @@
<ivy:resolve log="download-only" file="${vaadin.basedir}/ivy-taskdefs.xml" conf="taskdefs" />
<ivy:cachepath pathid="taskdefs.classpath" conf="taskdefs" />
<taskdef uri="antlib:net.sf.antcontrib" resource="net/sf/antcontrib/antlib.xml" classpathref="taskdefs.classpath" />
<!-- ant contrib for Maven integration -->
<taskdef resource="org/apache/maven/artifact/ant/antlib.xml" uri="antlib:org.apache.maven.artifact.ant" classpathref="taskdefs.classpath" />

<!-- FIXME These are not available in other files -->
<filterset begintoken="@" endtoken="@" id="filter-vaadin.version">
<filter token="version" value="${vaadin.version}" />
</filterset>

<union id="empty.reference" />


<target name="compile" description="Compiles the module" depends="dependencies, directories" if="src-exists">
<fail unless="module.name" message="No module name given" />

<javac srcdir="${src}" destdir="${classes}" source="${vaadin.java.version}" target="${vaadin.java.version}" debug="true" encoding="UTF-8" includeantruntime="false">
<classpath refid="classpath.compile.dependencies" />
<classpath refid="classpath.compile.custom" />
</javac>
<copy todir="${classes}">
<fileset dir="${src}" includes="${extra.classes}" />
</copy>
</target>

<target name="directories">
<property name="result.dir" location="result" />
<property name="src" location="${result.dir}/../src" />
<property name="classes" location="${result.dir}/classes" />
<available file="${src}" type="dir" property="src-exists" />
<mkdir dir="${classes}" />
</target>

<target name="test.run" depends="test.compile">
<fail unless="module.name" message="No module name given" />

<property name="result.dir" location="result" />
<property name="classes" location="${result.dir}/classes" />
<property name="test.src" location="${result.dir}/../tests/src" />
<property name="test.classes" location="${result.dir}/tests/classes" />

<!-- Ensure report dir is empty before running tests -->
<property name="report.dir" location="${result.dir}/reports" />
<delete dir="${report.dir}" />
<mkdir dir="${report.dir}" />

<junit showoutput="no" printsummary="no" fork="yes">
<formatter type="xml" />
<jvmarg value="-ea" />
<classpath location="${test.classes}" />
<classpath location="${classes}" />
<classpath refid="classpath.compile.custom" />
<classpath refid="classpath.test.dependencies" />

<batchtest fork="yes" todir="${report.dir}">
<fileset dir="${test.src}">
<include name="**/*Test.java" />
<include name="**/*Tests.java" />
</fileset>
</batchtest>
</junit>
</target>

<target name="test.compile" description="Compiles tests" depends="compile, dependencies.test">
<fail unless="module.name" message="No module name given" />
<property name="result.dir" location="result" />
<property name="base.dir" location="${result.dir}/.." />
<property name="test.src" location="${base.dir}/tests/src" />
<property name="test.resources" location="${base.dir}/tests/resources" />
<property name="test.classes" location="${result.dir}/tests/classes" />
<property name="classes" location="${result.dir}/classes" />

<mkdir dir="${test.classes}" />

<javac srcdir="${test.src}" destdir="${test.classes}" source="${vaadin.java.version}" target="${vaadin.java.version}" debug="true" encoding="UTF-8" includeantruntime="false">
<classpath refid="classpath.test.dependencies" />
<classpath location="${classes}" />
<classpath refid="classpath.test.custom" />
</javac>

<!-- Copy resources -->
<copy todir="${test.classes}" failonerror="false">
<fileset dir="${test.resources}" />
<!-- include html templates used in declarative tests -->
<fileset dir="${test.src}">
<include name="**/*.html" />
</fileset>
</copy>
</target>

<target name="dependencies" description="Resolves dependencies needed by this module">
<property name='conf' value="build, build-provided" />
<ivy:resolve log="download-only" resolveid="common" conf="${conf}" />
<ivy:cachepath pathid="classpath.compile.dependencies" conf="${conf}" />
</target>

<target name="dependencies.test" description="Resolves dependencies needed by test">
<ivy:resolve log="download-only" resolveid="common" conf="test" />
<ivy:cachepath pathid="classpath.test.dependencies" conf="test" />
</target>

<target name="remove-test-reports">
<fail unless="result.dir" message="No result.dir parameter given" />
<delete dir="${result.dir}/reports" />
</target>

<target name="clean" depends="remove-test-reports">
<fail unless="result.dir" message="No result.dir parameter given" />
<delete dir="${result.dir}" />
</target>

<!-- Checkstyle conf -->
<property name="cs.dir" location="${vaadin.basedir}/checkstyle" />

+ 2
- 2
uitest/build.xml View File

@@ -6,7 +6,6 @@
Provides a uitest WAR containing Vaadin UI tests
</description>
<include file="../common.xml" as="common" />
<include file="../build.xml" as="vaadin" />

<!-- global properties -->
<property name="module.name" value="vaadin-uitest" />
@@ -60,7 +59,8 @@
</target>

<target name="clean">
<antcall target="common.clean" />
<fail unless="result.dir" message="No result.dir parameter given" />
<delete dir="${result.dir}" />
</target>
<target name="checkstyle">
<echo>Checkstyle is disabled for uitest for now</echo>

Write Preview
Loading…
Cancel
Save