FCL/sftools/dev/build: comparison buildframework/helium/builder/build.xml

equal deleted inserted replaced

-:85df38eb4012
+:c7c26511138f
 <project name="helium-builder" default="build" xmlns:au="antlib:org.apache.ant.antunit" xmlns:ivy="antlib:org.apache.ivy.ant" xmlns:ac="antlib:net.sf.antcontrib">
 <property environment="env" />
 <taskdef name="fmpp" classname="fmpp.tools.AntTask" />
 <import file="delivery.ant.xml" />
-<!-- Ensuring that only Ant 1.7.0 is in use. -->
+<!-- Ensuring that only Ant 1.7.0 is in use.
 <ac:if>
 <not>
 <contains string="${ant.version}" substring="1.7.0" />
 </not>
 <then>
 <fail message="Your current ant version is ${ant.version}, you must use 1.7.0" />
 </then>
-</ac:if>
+</ac:if>            -->
 <condition property="platform" value="win32" else="unix">
 <os family="windows"/>
 </condition>
 <dirname property="builder.dir" file="${ant.file.helium-builder}" />
 <property name="source.root.dir" location="${builder.dir}/.." />
 <property name="build.temp.dir" location="${source.root.dir}/build" />
 <property name="components.temp.dir" location="${build.temp.dir}/components" />
 <property name="component" value="*" />
 <exclude name="licences/**" />
 <exclude name="tests/**" />
 <exclude name="build/**" />
 </fileset>
 <target name="cleanup" description="Cleanup (delete the temp build directory)">
 <delete dir="${build.temp.dir}" failonerror="false"/>
 </target>
 <target name="get-build-list">
 <ivy:buildlist reference="ivy.buildlist.path">
 <fileset refid="ant.build.files"/>
 </ivy:buildlist>
 </target>
 <target name="report" depends="get-build-list" description="Create Ivy report for each component">
 <subant target="report" buildpathref="ivy.buildlist.path">
 <property name="builder.dir" location="${builder.dir}" />
 </subant>
 </target>
 <target name="compile" depends="get-build-list">
 <subant target="compile" buildpathref="ivy.buildlist.path">
 <property name="builder.dir" location="${builder.dir}" />
 <property name="source.root.dir" value="${source.root.dir}"/>
 </subant>
 </target>
 <target name="build" depends="get-build-list" description="Build each component">
 <subant target="package" buildpathref="ivy.buildlist.path">
 <property name="builder.dir" location="${builder.dir}" />
 <property name="source.root.dir" value="${source.root.dir}"/>
 <property name="platform" value="${platform}"/>
 </subant>
 </target>
 <target name="clean" depends="get-build-list" description="Run clean on each component">
 <subant target="clean" buildpathref="ivy.buildlist.path">
 <property name="builder.dir" location="${builder.dir}" />
 <property name="source.root.dir" value="${source.root.dir}"/>
 </subant>
 </target>
 <target name="test" depends="get-build-list,build" description="Run test on each component">
 <ac:for param="file" keepgoing="true">
 <path refid="ivy.buildlist.path" />
 <sequential>
 <echo>Testing: @{file}</echo>
 <ant antfile="@{file}" dir="@{file}/.." target="test" inheritAll="false">
 <property name="builder.dir" location="${builder.dir}" />
+<property name="source.root.dir" location="${source.root.dir}" />
 </ant>
 </sequential>
 </ac:for>
 </target>
 <!-- TODO: remove after CI tools are cleaned up -->
 <target name="unittest" depends="test"/>
-<target name="junit" depends="get-build-list" description="Run junit on each component">
+<target name="junit" depends="get-build-list" description="Run JUnit tests on each component">
 <subant target="junit" buildpathref="ivy.buildlist.path">
 <property name="builder.dir" location="${builder.dir}" />
-</subant>
+<property name="source.root.dir" location="${source.root.dir}" />
-</target>
+</subant>
+</target>
-<target name="antunit" depends="get-build-list" description="Run antunit on each component">
+<target name="antunit" depends="get-build-list" description="Run AntUnit tests on each component">
 <subant target="antunit" buildpathref="ivy.buildlist.path">
 <property name="builder.dir" location="${builder.dir}" />
-</subant>
+<property name="source.root.dir" location="${source.root.dir}" />
-</target>
+</subant>
+</target>
 <target name="quality" depends="get-build-list" description="Run quality checks on each component">
 <ac:for param="file" keepgoing="true">
 <path refid="ivy.buildlist.path" />
 <sequential>
 </ant>
 </sequential>
 </ac:for>
 </target>
 <target name="checkstyle" depends="get-build-list" description="Run checkstyle on each component">
 <ac:for param="file" keepgoing="true">
 <path refid="ivy.buildlist.path" />
 <sequential>
 <ant antfile="@{file}" dir="@{file}/.." target="checkstyle" inheritAll="false">
 </ant>
 </sequential>
 </ac:for>
 </target>
 <target name="get-deps" description="Retrieving Helium dependencies">
 <ac:if>
 <not>
 <isset property="config" />
 </not>
 pattern="${source.root.dir}/external/antlibs2/[artifact]-[revision].[ext]" />
 <ivy:retrieve sync="true" conf="default" organisation="com.nokia.helium.config"
 module="helium-${config}-config" revision="1.0"
 inline="true" type="egg"
 pattern="${source.root.dir}/external/python/lib/auto/[artifact]-[revision].[ext]" />
-<fileset id="egg.deps.fileset" dir="${source.root.dir}/external/python/lib/auto" includes="*.egg" />
+<fileset id="egg.deps.fileset" dir="${source.root.dir}/external/python/lib/auto" includes="*.egg" excludes="jython*.egg" />
 <fmpp sourceFile="template/easy-install.pth.ftl" outputFile="${source.root.dir}/external/python/lib/auto/easy-install.pth">
 <data>
 project: antProject()
 </data>
 </fmpp>
 replace="\1"
 casesensitive="false" />
 <echo message="Revision set to: ${helium.revision}" />
 </target>
 <target name="update-version" depends="get-helium-revision">
 <ac:if>
 <available file="${source.root.dir}/config/version.txt.orig" />
 <then>
 <move file="${source.root.dir}/config/version.txt.orig" tofile="${source.root.dir}/config/version.txt" />
 <propertyfile file="${source.root.dir}/config/version.txt" comment="Helium version - DO NOT EDIT">
 <entry key="helium.version" value="${helium.version}-r${helium.revision}"/>
 </propertyfile>
 </target>
 <target name="restore-version">
 <move file="${source.root.dir}/config/version.txt.orig" tofile="${source.root.dir}/config/version.txt" />
 </target>
 <target name="create-releasable" depends="get-deps,update-version,build-helium-docs,zip-releasable,restore-version" description="Create releasable binary package"/>
 <target name="textdoc">
 <fileset dir="${source.root.dir}" includes="*/java/*/**/*.rst"/>
 <fileset dir="${source.root.dir}" includes="*/python/*/**/*.rst"/>
 </copy>
 <rstMacro version="1.0" src="${build.temp.dir}/doc/doctmp"/>
 </target>
 <!-- Macro to generate html docs from rst. -->
 <macrodef name="rstMacro">
 <attribute name="version"/>
 <attribute name="src" default="${source.root.dir}/sf/doc/src"/>
 <arg file="@{src}" />
 <arg file="@{output}" />
 </exec>
 </sequential>
 </macrodef>
 </project>

changeset 588	c7c26511138f
parent 587	85df38eb4012
child 628	7c4a911dc066