FCL/sftools/fbf/configs/default: comparison common/build.xml

equal deleted inserted replaced

-:794ddd7e666a
+:82b232da6082
 <!-- override helium 7 defaults to operate like helium 5.
 *.log.dir props dont exist yet so need to be set now, otherwise they
 become immutable after helium.ant.xml import -->
 <property name="prep.log.dir"    value="${build.drive}/output/logs"/>
-<property name="compile.log.dir" value="${build.drive}/output/logs"/>
+<!-- property name="compile.log.dir" value="${build.drive}/output/logs"/-->
 <property name="post.log.dir"    value="${build.drive}/output/logs"/>
 <property name="archive.log.dir"    value="${build.drive}/output/logs"/>
 <property name="signals.log.dir"    value="${build.drive}/output/logs"/>
 <if>
 <!-- Import common references -->
 <import file="${sf.common.config.dir}/common_refs.ant.xml" />
 <!-- Import functionality distributed into other file(s) -->
 <import file="${sf.common.config.dir}/build.postbuild.xml"/>
 <!-- Import test functionality distributed into other file(s) -->
 <import file="${sf.common.config.dir}/build.test.xml"/>
 <!-- helium 7+ compatability. needs to be defined -->
 <if>
 </hlm:signalInput>
 <hlm:signalInput id="signalRunQMakeInput" failbuild="never">
 <hlm:notifierListRef refid="defaultFailNotifier" />
 </hlm:signalInput>
+<!-- allow use of a release_metadata.xml without all referenced files being present -->
+<hlm:signalInput id="getenvSignalInput" failbuild="never">
+<hlm:notifierListRef refid="defaultFailNotifier" />
+</hlm:signalInput>
 </then>
 </if>
 <!--
 - END OF PROPERTY DEFINITIONS, TARGETS START HERE
 -->
 <target name="sf-prep" depends="sf-prep-announce,prep-drive,init-build-area,create-bom,log-build-env,sf-get-utils">
 <!-- Test for the disk space we would like for this build -->
-	<fail>
+<fail>
 <condition>
 <not>
 <or>
 <isset property="sf.suppress.drive.space.check"/>
 <hasfreespace partition="${build.drive}" needed="${sf.drive.space.needed}"/>
 </fail>
 <tempfile property="prep.dynamic.config" suffix="ant.xml" destdir="${temp.build.dir}"/>
 <runtarget target="sf-check-env"/>
+<!-- create zips folder for use later -->
+<mkdir dir="${build.drive}/output/zips"/>
 <stopwatch name="sf-prep" action="elapsed"/>
 </target>
 <target name="sf-prep-announce">
 <stopwatch name="sf-prep"/>
 </target>
 <target name="sf-check-env">
 <echo message="Create report on environment info"/>
 <!-- Dario's environment dumper -->
-	  <if>
+<if>
 <isset property="sf.spec.baseline.location"/>
 <then>
 <exec executable="perl" dir="${build.drive}/utilities/envinfo">
 <arg value="envinfo.pl"/>
 <arg value="-r"/>
 </if>
 <echo message="Translate \output\logs\envinfo.txt into a Diamonds file"/>
 <exec executable="perl" dir="${build.drive}">
 <arg value="${sf.common.config.dir}/tools/envinfo2diamonds.pl"/>
 </exec>
 <!-- Conditional location of BuildEnv.xml. Project always preferred to default -->
 <if><available file="${sf.project.location}/BuildEnv.xml"/>
 <then>
 <property name="sf.buildenv.location" value="${sf.project.location}"/>
 </then>
 </condition>
 Build Environment Check failed (${sf.checkenv.exit}). To stop this failure aborting the build set property sf.suppress.buildenv.check to any value.
 </fail>
 </target>
-<target name="sf-summary" depends="">
-<echo>[SF-SUMMARY]</echo>
-<echo message="Generating build summary"/>
-<exec executable="perl" dir="${sf.common.config.dir}/tools/summary" failonerror="true">
-<arg value="brag_script.pl"/>
-<arg value="--buildid=${sf.spec.job.name}_${sf.spec.job.codeline}.${sf.spec.job.number}"/>
-<arg value="--basedir=${sf.spec.job.rootdir}"/>
-</exec>
-</target>
-<target name="sf-build-all" depends="sf-prebuild-noprep,sf-build-noprep,sf-postbuild">
-<echo>[SF-BUILD-ALL]</echo>
-</target>
-<target name="sf-build-and-pack" depends="sf-build-noprep,sf-postbuild">
-<echo>[SF-BUILD-AND-PACK]</echo>
-</target>
-<target name="sf-build" depends="sf-prebuild,sf-build-noprep,sf-postbuild">
-<echo>[SF-BUILD]</echo>
-</target>
-<target name="sf-scrub-build" description="Cleans up everything left behind after a build. Danger!">
-<if>
-<available file="${sf.spec.job.drive}/"/>
-<then>
-<!-- Un-subst the drive -->
-<hlm:unsubst drive="${sf.spec.job.drive}"/>
-</then>
-</if>
-<!-- Delete build directory -->
-<delete dir="${prep.build.dir}"/>
-</target>
 <!-- Note: Not used from Helium 7 onwards -->
 <target name="generate-layers">
 <echo message="canno-file:${canonical.sysdef.file}"/>
 <echo message="raptor-filters:raptor_${sysdef.configuration}"/>
 </linecontainsregexp>
 </filterchain>
 </copy>
 <copy file="${build.drive}/output/build/canonical_system_definition_${sysdef.configuration}.xml" todir="${build.log.dir}/BOM/"/>
 <delete file="${build.drive}/output/build/canonical_system_definition_${sysdef.configuration}_temp.xml"/>
+</target>
+<target name="sf-summary" depends="">
+<echo>[SF-SUMMARY]</echo>
+<echo message="Generating build summary"/>
+<exec executable="perl" dir="${sf.common.config.dir}/tools/summary" failonerror="true">
+<arg value="brag_script.pl"/>
+<arg value="--buildid=${sf.spec.job.name}_${sf.spec.job.codeline}.${sf.spec.job.number}"/>
+<arg value="--basedir=${sf.spec.job.rootdir}"/>
+</exec>
+</target>
+<target name="sf-build-all" depends="sf-prebuild-noprep,sf-build-noprep,sf-postbuild">
+<echo>[SF-BUILD-ALL]</echo>
+</target>
+<target name="sf-build-and-pack" depends="sf-build-noprep,sf-postbuild">
+<echo>[SF-BUILD-AND-PACK]</echo>
+</target>
+<target name="sf-build" depends="sf-prebuild,sf-build-noprep,sf-postbuild">
+<echo>[SF-BUILD]</echo>
+</target>
+<target name="sf-scrub-build" description="Cleans up everything left behind after a build. Danger!">
+<if>
+<available file="${sf.spec.job.drive}/"/>
+<then>
+<!-- Un-subst the drive -->
+<hlm:unsubst drive="${sf.spec.job.drive}"/>
+</then>
+</if>
+<!-- Delete build directory -->
+<delete dir="${prep.build.dir}"/>
 </target>
 <target name="sf-prebuild" depends="sf-prep,sf-prebuild-noprep"/>
 <target name="sf-prebuild-noprep" depends="sf-prebuild-announce,sf-diamonds-connect,sf-diamonds-envinfo,sf-diamonds-tag-build,sf-getenvs,sf-syncsource,sf-diamondize-bom">
 <stopwatch name="sf-prebuild" action="elapsed"/>
 <istrue value="${sf.spec.publish.enable}"/>
 <then>
 <echo>[SF-DIAMONDS-ENVINFO]</echo>
 <echo message="Send ${build.log.dir}/diamonds_envinfo.xml to Diamonds"/>
 <exec executable="python">
-		    <arg value="${sf.common.config.dir}/tools/brag/send_xml_to_diamonds.py"/>
+<arg value="${sf.common.config.dir}/tools/brag/send_xml_to_diamonds.py"/>
-		    <arg value="-u"/>
+<arg value="-u"/>
-		    <arg value="http://${diamonds.host}${diamonds.build.id}"/>
+<arg value="http://${diamonds.host}${diamonds.build.id}"/>
-		    <arg value="-f"/>
+<arg value="-f"/>
-		    <arg value="${build.log.dir}/diamonds_envinfo.xml"/>
+<arg value="${build.log.dir}/diamonds_envinfo.xml"/>
-		  </exec>
+</exec>
 </then>
 </if>
 </target>
 <target name="sf-diamonds-tag-build">
 <propertyregex input="${sf.job.bom.project.repo}" regexp="\\" replace="/" global="true" property="sf.job.bom.project.repo" override="true"/>
 <exec executable="hg" dir="${sf.project.location}" outputproperty="sf.job.bom.project.checksum">
 <arg value="identify"/>
 <arg value="-i"/>
 </exec>
-	<echo message="${sf.job.bom.project.repo},build/config,${sf.job.bom.project.checksum}" file="${build.drive}/output/logs/BOM/project.csv"/>
+<echo message="${sf.job.bom.project.repo},build/config,${sf.job.bom.project.checksum}" file="${build.drive}/output/logs/BOM/project.csv"/>
 </target>
 <target name="sf-get-utils">
-	<stopwatch name="sf-get-utils"/>
+<stopwatch name="sf-get-utils"/>
 <echo message="Cloning utilities repository to ${build.drive}/utilities"/>
 <exec executable="hg">
 <arg value="clone"/>
 <arg value="--updaterev"/>
 <arg value="default"/>
 <arg value="http://developer.symbian.org/oss/MCL/sftools/fbf/utilities"/>
 <arg value="${build.drive}/utilities"/>
 </exec>
-	<stopwatch name="sf-get-utils" action="elapsed"/>
+<stopwatch name="sf-get-utils" action="elapsed"/>
 </target>
 <target name="sf-getenvs">
 <stopwatch name="sf-getenvs"/>
 <!-- create BOM dir -->
 <stopwatch name="sf-getenvs (baseline)"/>
 <!-- record baseline information in BOM file -->
 <echo message="${sf.spec.baseline.location}" file="${build.drive}/output/logs/BOM/baseline.txt"/>
 <!-- run internal target preparation-getenv -->
+<delete file="${build.drive}/currentRelease.xml"/>
 <runtarget target="preparation-getenv"/>
 <stopwatch name="sf-getenvs (baseline)" action="elapsed"/>
 </then>
 </if>
 <stopwatch name="sf-getenvs" action="elapsed"/>
 </target>
 <target name="sf-get-source" depends="sf-generate-source-spec">
 <stopwatch name="sf-get-source"/>
 <!-- Get test manifest, and move resolved csv so that it doesnt conflict with source-spec.ant.xml -->
-<ant antfile="${temp.build.dir}/source-test-spec.ant.xml" />
+<if>
-<move file="${build.drive}/output/logs/BOM/sources.csv" tofile="${build.drive}/output/logs/BOM/sources_test.csv"/>
+<istrue value="${sf.spec.smoketest.enable}"/>
+<then>
+<ant antfile="${temp.build.dir}/source-test-spec.ant.xml" />
+<move file="${build.drive}/output/logs/BOM/sources.csv" tofile="${build.drive}/output/logs/BOM/sources_test.csv"/>
+</then>
+</if>
+<if><available file="${temp.build.dir}/source-rnd-spec.ant.xml"/>
+<then>
+<ant antfile="${temp.build.dir}/source-rnd-spec.ant.xml" />
+<move file="${build.drive}/output/logs/BOM/sources.csv" tofile="${build.drive}/output/logs/BOM/sources_rnd.csv"/>
+</then>
+</if>
 <ant antfile="${temp.build.dir}/source-spec.ant.xml" />
 <stopwatch name="sf-get-source" action="elapsed"/>
 </target>
 <target name="sf-generate-source-spec">
 <if>
 <istrue value="${sf.spec.sourcesync.enable}" />
 <then>
 <property name="sf.source.csv.file" value="${sf.spec.sourcesync.sourcespecdir}/${sf.spec.sourcesync.sourcespecfile}"/>
-</then>
+<property name="sf.source_rnd.csv.file" value="${sf.spec.sourcesync.sourcespecdir}/${sf.spec.sourcesync.sourcespecfile.rnd}"/>
-</if>
+</then>
-<property name="sf.source.csv.file" value="nul:"/>
+</if>
+<property name="sf.source.csv.file"     value="nul:"/>
+<property name="sf.source_rnd.csv.file" value="nul:"/>
 <fmpp sourceFile="${sf.common.config.dir}/templates/source-spec.ant.xml.ftl"
 outputFile="${temp.build.dir}/source-spec.ant.xml">
 <data expandProperties="yes">
 ant: antProperties()
 data: [
 csv(${sf.source.csv.file}, {separator:','})
 ]
 </data>
 </fmpp>
-<fmpp sourceFile="${sf.common.config.dir}/templates/source-spec.ant.xml.ftl"
-outputFile="${temp.build.dir}/source-test-spec.ant.xml">
+<if><available file="${sf.spec.sourcesync.sourcespecdir}/${sf.spec.sourcesync.sourcespecfile.rnd}"/>
-<data expandProperties="yes">
+<then>
-ant: antProperties()
+<fmpp sourceFile="${sf.common.config.dir}/templates/source-spec.ant.xml.ftl"
-data: [
+outputFile="${temp.build.dir}/source-rnd-spec.ant.xml">
-csv(${sf.test.csv.file}, {separator:','})
+<data expandProperties="yes">
-]
+ant: antProperties()
-</data>
+data: [
-</fmpp>
+csv(${sf.source_rnd.csv.file}, {separator:','})
+]
+</data>
+</fmpp>
+</then>
+</if>
+<if>
+<istrue value="${sf.spec.smoketest.enable}"/>
+<then>
+<fmpp sourceFile="${sf.common.config.dir}/templates/source-spec.ant.xml.ftl"
+outputFile="${temp.build.dir}/source-test-spec.ant.xml">
+<data expandProperties="yes">
+ant: antProperties()
+data: [
+csv(${sf.test.csv.file}, {separator:','})
+]
+</data>
+</fmpp>
+</then>
+</if>
 </target>
 <!-- generate dir list using passed location and name
 if a baseline list is available then generate deltas too -->
 ant: antProperties()
 config: csv(${build.drive}/output/logs/BOM/config.csv,{separator:',',headers:[loc,dst,rev]})
 project: csv(${build.drive}/output/logs/BOM/project.csv,{separator:',',headers:[loc,dst,rev]})
 baseline: slicedText(${build.drive}/output/logs/BOM/baseline.txt,{trim})
 toolsbaseline: slicedText(${build.drive}/output/logs/BOM/toolsbaseline.txt,{trim})
-sources: csv(${build.drive}/output/logs/BOM/sources.csv,{separator:',',headers:[loc,dst,type,rev,sysdef]})
+sources: csv(${build.drive}/output/logs/BOM/sources.csv, {separator:',',headers:[loc,dst,type,rev,sysdef]})
 </data>
 </fmpp>
 <!-- Make a copy in BOM dir -->
 <copy file="${build.drive}/output/logs/sf-diamondize-bom.xml" tofile="${build.log.dir}/BOM/build-info.xml"/>
 </target>
 <target name="sf-preprocess-package-config">
-	<echo message="${sf.spec.sourcesync.sourcespecdir}/${sf.spec.sourcesync.sourcespecfile}"/>
+<echo message="${sf.spec.sourcesync.sourcespecdir}/${sf.spec.sourcesync.sourcespecfile}"/>
 <exec executable="perl" dir="${build.drive}/" failonerror="false" output="${build.log.dir}/zipconfig.log">
 <arg value="${sf.common.config.dir}/tools/populateziptemplate.pl"/>
 <arg value="${sf.spec.sourcesync.sourcespecdir}/${sf.spec.sourcesync.sourcespecfile}"/>
 <arg value="${sf.common.config.dir}/templates/zip.cfg.xml.ftl.template"/>
 <arg value="${temp.build.dir}/zip.cfg.xml.ftl"/>
 </if>
 </target>
 <!-- Unpack the rnd zips ready to be used in the build -->
 <target name="sf-unpack-rnd">
-<echo message="Unpacking any available RnD binaries"/>
+<echo message="INFO Unpacking any available RnD binaries"/>
 <for param="rndZip">
 <fileset dir="${build.drive}/output/zips/">
 <include name="binaries_*.zip"/> <!-- Internal rnd bins -->
 <include name="release/bin_*.zip"/> <!-- Releaseable rnd bins -->
 </fileset>
 <arg value="-y"/> <!-- Need to unpack in overwrite mode, due to TEF -->
 <arg value="-i!epoc32\*"/> <!-- Only unzip items into the epoc32 tree -->
 <arg value="@{rndZip}"/>
 </exec>
 </sequential>
-	</for>
+</for>
+<if><istrue value="${sf.spec.baseline.enable}"/>
+<then>
+<!-- also unpack any rnd bins from baseline location. may collide with package build getenv -->
+<delete file="${build.drive}/currentRelease.xml"/>
+<antcall target="preparation-getenv" inheritAll="false">
+<param name="base_release.path"           value="${sf.spec.baseline.location}"/>
+<param name="base_release.getenv_options" value="-i rnd -k"/>
+</antcall>
+</then>
+</if>
 </target>
 <target name="sf-compile-options">
 <hlm:sbsMakeOptions engine="gmake" id="sbs.fullbuild.options"/>
 <hlm:sbsMakeOptions engine="gmake" id="sbs.toolsbuild.options"/>
 <target name="sf-log-to-brag">
 <mkdir dir="${build.log.dir}/summary"/>
 <echo message="Generating ${sf.brag.id}_BRAG.xml from ${sf.brag.log}"/>
 <exec executable="perl" failonerror="false" output="${build.log.dir}/summary/${sf.brag.id}_BRAG.xml" logError="true">
 <arg value="${sf.common.config.dir}/tools/brag/logToBRAG.pl"/>
-	    <arg value="--phase=${sf.brag.phase}"/>
+<arg value="--phase=${sf.brag.phase}"/>
 <arg value="--step=${sf.brag.step}"/>
 <arg value="--rules=${sf.common.config.dir}/tools/brag/rules.${sf.brag.id}.tsv"/>
 <arg value="${sf.brag.log}"/>
 </exec>
 <!-- And copy the XSL so the output can be transformed by a browser -->

changeset 1121	82b232da6082
parent 1113	488afbbbaebd
child 1117	0006ed4e0b6d