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

equal deleted inserted replaced

-:5600a84475d7
+:94890205b399
 <istrue value="${sf.spec.package.bin.enable}"/>
 <then>
 <stopwatch name="sf-postbuild packaging binaries"/>
 <echo message="INFO Packaging Binaries"/>
 <runtarget target="sf-package-binary"/>
-<!--                    <runtarget target="sf-package-tools"/> -->
 <echo message="INFO Validate Zip files"/>
 <runtarget target="sf-package-validate"/>
 <stopwatch name="sf-postbuild packaging binaries" action="elapsed"/>
 </then>
 </then>
 </if>
 <!-- copy log files linked to the generation of roms for REE -->
 <runtarget target="sf-copy-rom-logs"/>
-		<runtarget target="sf-merge-brag"/>
+<runtarget target="sf-merge-brag"/>
 <!-- Zip up all the logs -->
 <runtarget target="sf-zip-logs"/>
 <if>
 <istrue value="${sf.spec.publish.enable}" />
 <arg value="/c"/>
 <arg value="evalid -x \.sym$ -g epoc32/release/winscw/urel output/md5/epoc32_release_winscw_urel.md5"/>
 </exec>
 <exec executable="cmd" dir="${build.drive}/">
 <arg value="/c"/>
-<arg value="evalid -g epoc32/cshlpcmp_template 	output/md5/epoc32_cshlpcmp_template.md5"/>
+<arg value="evalid -g epoc32/cshlpcmp_template output/md5/epoc32_cshlpcmp_template.md5"/>
 </exec>
 <exec executable="cmd" dir="${build.drive}/">
 <arg value="/c"/>
 <arg value="evalid -g epoc32/data output/md5/epoc32_data.md5"/>
 </exec>
 <property name="sf.epoc32.exclusions.file" value="nul:"/>
 <exec executable="7za" dir="${build.drive}" output="${build.log.dir}/zip_${build.id}_binaries_epoc32.log">
 <arg value="a"/>
 <arg value="-t${sf.spec.package.zip.format}"/>
 <arg value="-x@${build.log.dir}/rnd_excludefile.txt"/>
-					<arg value="-x@${sf.spec.prebuilt.excludelist}"/>
+<arg value="-x@${sf.spec.prebuilt.excludelist}"/>
 <arg value="-x@${sf.epoc32.exclusions.file}"/>
 <arg value="-x!epoc32\gcc"/>
 <arg value="-x!epoc32\gcc_mingw"/>
 <arg value="-x!epoc32\tools"/>
+<arg value="-x!epoc32\data\buildinfo.txt"/>
 <arg value="-x!epoc32\build"/>
 <arg value="-x!epoc32\release\armv5"/>
 <arg value="-x!epoc32\release\winscw"/>
 <arg value="-xr!*.sym"/>
 <arg value="${build.drive}/output/zips/release/binaries_epoc.zip"/>
 <arg value="epoc32\"/>
 </exec>
-	    </sequential>
+</sequential>
 <if>
 <isset property="sf.sdk.header.list.file"/>
 <then>
 <exec executable="7za" dir="${build.drive}" output="${build.log.dir}/zip_${build.id}_binaries_sdk.log">
 <arg value="a"/>
 <arg value="-t${sf.spec.package.zip.format}"/>
 <arg value="-i@${sf.sdk.header.list.file}"/>
 <arg value="-x@${build.log.dir}/rnd_excludefile.txt"/>
-						<arg value="-x@${sf.spec.prebuilt.excludelist}"/>
+<arg value="-x@${sf.spec.prebuilt.excludelist}"/>
 <arg value="${build.drive}/output/zips/release/binaries_epoc_sdk.zip"/>
 </exec>
 <!-- Check that all the files we want in the SDK are zipped -->
 <antcall target="sf-log-to-brag">
 <param name="sf.brag.id" value="SDK"/>
 <!-- WinsCW binaries, by udeb/urel/lib -->
 <exec executable="7za" dir="${build.drive}" output="${build.log.dir}/zip_${build.id}_binaries_winscw_udeb.log">
 <arg value="a"/>
 <arg value="-t${sf.spec.package.zip.format}"/>
 <arg value="-x@${build.log.dir}/rnd_excludefile.txt"/>
-				<arg value="-x@${sf.spec.prebuilt.excludelist}"/>
+<arg value="-x@${sf.spec.prebuilt.excludelist}"/>
 <arg value="-xr!*.sym"/>
 <arg value="-xr!*.lib"/>
 <arg value="${build.drive}/output/zips/release/binaries_winscw_udeb.zip"/>
 <arg value="epoc32\release\winscw\udeb"/>
 </exec>
 <exec executable="7za" dir="${build.drive}" output="${build.log.dir}/zip_${build.id}_binaries_winscw_urel.log">
 <arg value="a"/>
 <arg value="-t${sf.spec.package.zip.format}"/>
 <arg value="-x@${build.log.dir}/rnd_excludefile.txt"/>
-				<arg value="-x@${sf.spec.prebuilt.excludelist}"/>
+<arg value="-x@${sf.spec.prebuilt.excludelist}"/>
 <arg value="-xr!*.sym"/>
 <arg value="-xr!*.lib"/>
 <arg value="${build.drive}/output/zips/release/binaries_winscw_urel.zip"/>
 <arg value="epoc32\release\winscw\urel"/>
 </exec>
 <exec executable="7za" dir="${build.drive}" output="${build.log.dir}/zip_${build.id}_binaries_winscw_lib.log">
 <arg value="a"/>
 <arg value="-t${sf.spec.package.zip.format}"/>
 <arg value="-ir!epoc32/release/winscw/*.lib"/>
 <arg value="-x@${build.log.dir}/rnd_excludefile.txt"/>
-				<arg value="-x@${sf.spec.prebuilt.excludelist}"/>
+<arg value="-x@${sf.spec.prebuilt.excludelist}"/>
 <arg value="${build.drive}/output/zips/release/binaries_winscw_lib.zip"/>
 </exec>
 <!-- ARMv5 binaries, by udeb/urel/lib -->
 <exec executable="7za" dir="${build.drive}" output="${build.log.dir}/zip_${build.id}_binaries_armv5_udeb.log">
 <arg value="a"/>
 <arg value="-t${sf.spec.package.zip.format}"/>
 <arg value="-x@${build.log.dir}/rnd_excludefile.txt"/>
-				<arg value="-x@${sf.spec.prebuilt.excludelist}"/>
+<arg value="-x@${sf.spec.prebuilt.excludelist}"/>
 <arg value="-xr!*.sym"/>
 <arg value="${build.drive}/output/zips/release/binaries_armv5_udeb.zip"/>
 <arg value="epoc32\release\armv5\udeb"/>
 </exec>
 <exec executable="7za" dir="${build.drive}" output="${build.log.dir}/zip_${build.id}_binaries_armv5_urel.log">
 <arg value="a"/>
 <arg value="-t${sf.spec.package.zip.format}"/>
 <arg value="-x@${build.log.dir}/rnd_excludefile.txt"/>
-				<arg value="-x@${sf.spec.prebuilt.excludelist}"/>
+<arg value="-x@${sf.spec.prebuilt.excludelist}"/>
 <arg value="-xr!*.sym"/>
 <arg value="${build.drive}/output/zips/release/binaries_armv5_urel.zip"/>
 <arg value="epoc32\release\armv5\urel"/>
 </exec>
 <exec executable="7za" dir="${build.drive}" output="${build.log.dir}/zip_${build.id}_binaries_armv5_lib.log">
 <arg value="a"/>
 <arg value="-t${sf.spec.package.zip.format}"/>
 <arg value="-x@${build.log.dir}/rnd_excludefile.txt"/>
-				<arg value="-x@${sf.spec.prebuilt.excludelist}"/>
+<arg value="-x@${sf.spec.prebuilt.excludelist}"/>
 <arg value="-xr!*.sym"/>
 <arg value="-ir!epoc32/release/armv5/_*.bin"/> <!-- include bootloaders in common lib zipfile -->
 <arg value="${build.drive}/output/zips/release/binaries_armv5_lib.zip"/>
 <arg value="epoc32\release\armv5\lib"/>
 </exec>
 </parallel>
 <runtarget target="sf-package-tools"/>
 <!-- Generate release_metadata entries for the above zips -->
 <antcall target="sf-zip-content">
 <param name="zip.config.file" value="${temp.build.dir}/zip.cfg.xml.ftl"/>
 <param name="zip.target.name" value="bin-just-metadata" />
 <target name="sf-package-tools" >
 <exec executable="7za" dir="${build.drive}" output="${build.log.dir}/zip_${build.id}_tools_epoc32.log">
 <arg value="a"/>
 <arg value="-t${sf.spec.package.zip.format}"/>
 <arg value="-x@${build.log.dir}/rnd_excludefile.txt"/>
-			<arg value="-x@${sf.spec.prebuilt.excludelist}"/>
+<arg value="-x@${sf.spec.prebuilt.excludelist}"/>
 <arg value="${build.drive}/output/zips/release/tools_epoc.zip"/>
 <arg value="epoc32/tools"/>
 <arg value="epoc32/gcc"/>
 <arg value="epoc32/gcc_mingw"/>
+<arg value="epoc32/data/buildinfo.txt"/>
 </exec>
 <antcall target="sf-zip-content">
 <param name="zip.config.file" value="${temp.build.dir}/zip.cfg.xml.ftl"/>
 <param name="zip.target.name" value="tools" />
 </antcall>
 <data expandProperties="yes">
 ant: antProperties()
 </data>
 </fmpp>
 <!-- Send the data to the server -->
-	  <exec executable="python">
+<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}/linksForDiamonds.xml"/>
+<arg value="${build.log.dir}/linksForDiamonds.xml"/>
-	  </exec>
+</exec>
 </target>
-	<target name="sf-merge-brag">
+<target name="sf-merge-brag">
 <!-- Merge all our bits of XML together -->
 <exec executable="perl" output="${build.log.dir}/summary/_BRAG.xml" logError="true">
 <arg value="${sf.common.config.dir}/tools/mergeXML.pl"/>
 <arg value="--xsl=brag.xsl"/>
 <arg value="--merge=buildStatus,phase(name),step(name),failures(level)"/>
 <arg value="${build.log.dir}/summary/*?_BRAG.xml"/>
 </exec>
-	</target>
+</target>
 <target name="sf-brag-to-diamonds">
 <!-- Run XSL transform to create file to send to diamonds -->
 <java jar="${sf.common.config.dir}/sysdefdowngrade/xalan-j_2_7_1/xalan.jar" fork="true">
 <arg value="-IN"/>
 <arg value="${build.log.dir}/summary/_BRAG.xml"/>
 <istrue value="${sf.spec.logs.zip.enable}"/>
 <then>
 <mkdir dir="${build.output.dir}/zips/release"/> <!-- workaround for when there's no other releaseables, just the logs -->
 <zip destfile="${build.output.dir}/zips/release/build_logs.zip" basedir="${build.drive}">
 <include name="output/logs/**"/>
-					<exclude name="output/logs/BC/**"/>
+<exclude name="output/logs/BC/**"/>
 <exclude name="output/logs/BOM/**"/>
 <exclude name="output/logs/deliverables/**"/>
 <exclude name="output/logs/releaseables/**"/>
 </zip>
 <!-- workaround for the time when when 'sf-run-analysis-raptor' has not been run -->
 </copy>
 <mkdir dir="${publish.dir}/html"/>
 <copy todir="${publish.dir}/html" preservelastmodified="true" failonerror="false">
 <fileset dir="${build.log.dir}/html"><include name="*.html"/></fileset>
 </copy>
-		<mkdir dir="${publish.dir}/BC"/>
+<mkdir dir="${publish.dir}/BC"/>
 <copy todir="${publish.dir}/BC" preservelastmodified="true" failonerror="false">
 <fileset dir="${build.log.dir}/BC/">
-		       <include name="BBCResults.xsl"/>
+<include name="BBCResults.xsl"/>
-			   <include name="headers_report.xml"/>
+<include name="headers_report.xml"/>
-			   <include name="libraries_report.xml"/>
+<include name="libraries_report.xml"/>
-		   </fileset>
+</fileset>
 </copy>
-		<mkdir dir="${publish.dir}/ats_reports"/>
+<mkdir dir="${publish.dir}/ats_reports"/>
-		<copy file="${sf.common.config.dir}/tools/ats/report_dummy.html" tofile="${publish.dir}/ats_reports/index.html" failonerror="false"/>
+<copy file="${sf.common.config.dir}/tools/ats/report_dummy.html" tofile="${publish.dir}/ats_reports/index.html" failonerror="false"/>
 </target>
 <!-- TODO: Make this work for package builds once we have sysmodel story worked out -->
 <target name="sf-run-analysis-missing-files" if="sf.spec.checkbuild">
 <!-- splitbuild is only set for Platform builds -->
 </if>
 </target>
 <target name="sf-check-missing-os-files" depends="sf-compile-options">
 <hlm:argSet id="sbs.check.tools.var">
 <hlm:arg name="config" value="${sf.spec.sbs.tools.config}" />
 <hlm:arg name="run-check" value="true" />
 </hlm:argSet>
 <hlm:argSet id="sbs.check.main.var">
 <hlm:arg name="config" value="${sf.spec.sbs.config}" />
 <hlm:arg name="run-check" value="true" />
 </hlm:argSet>
 <antcall target="compile-main" inheritAll="false" inheritRefs="true">
 <param name="build.system" value="${sf.spec.build.system}" />
 <param name="sysdef.configurations.list" value="${sf.spec.os.sysdef.clean.configurations.list}" />
 <param name="sf.spec.sysdef.version" value ="${sf.spec.os.sysdef.version}"/>
 </antcall>
 <if><istrue value="${sf.os.compile.iterate}"/>
 <then>
 <for list="${sf.spec.sbs.config}" delimiter="," param="sf.spec.check.splitconfig">
 <sequential>
-				<echo message="INFO [Iterative check] @{sf.spec.check.splitconfig}"/>
+<echo message="INFO [Iterative check] @{sf.spec.check.splitconfig}"/>
 <hlm:argSet id="sbs.check.iterate.main.var">
 <hlm:arg name="config" value="@{sf.spec.check.splitconfig}" />
 <hlm:arg name="run-check" value="true" />
 </hlm:argSet>
 <param name="build.id" value ="sbs_check"/>
 <reference refid="sbs.check.iterate.main.var" torefid="sbs.var" />
 <reference refid="sbs.fullbuild.options" torefid="sbs.make.options" />
 <reference refid="sf.spec.os.system.definition.files" torefid="system.definition.files" />
 </antcall>
-				</sequential>
+</sequential>
-			</for>
+</for>
-		</then>
+</then>
 <else>
 <antcall target="compile-main" inheritAll="false" inheritRefs="true">
 <param name="build.system" value="${sf.spec.build.system}" />
 <param name="sysdef.configurations.list" value="${sf.spec.os.sysdef.clean.configurations.list}" />
 <param name="sf.spec.sysdef.version" value ="${sf.spec.os.sysdef.version}"/>
 <param name="build.id" value ="sbs_check"/>
 <reference refid="sbs.check.main.var" torefid="sbs.var" />
 <reference refid="sbs.fullbuild.options" torefid="sbs.make.options" />
 <reference refid="sf.spec.os.system.definition.files" torefid="system.definition.files" />
 </antcall>
 </else>
 </if>
 </target>
 <target name="sf-check-missing-s60-files" depends="sf-compile-options">
 <hlm:argSet id="sbs.check.tools.var">
 <if>
 <istrue value="${sf.spec.package.bin.enable}"/>
 <then>
 <echo message="INFO Packaging Binaries"/>
 <runtarget target="sf-package-binary"/>
-<!--                <runtarget target="sf-package-tools"/> -->
 <echo message="INFO Validate Zip files"/>
 <runtarget target="sf-package-validate"/>
 </then>
 </if>
-		<runtarget target="sf-merge-brag"/>
+<runtarget target="sf-merge-brag"/>
 <runtarget target="sf-zip-logs"/>
 <if>
 <istrue value="${sf.spec.publish.enable}" />
 <then>

changeset 1009	94890205b399
parent 1005	a65c8f61a120
child 1013	d20ad9274826
child 1028	11f25704ec27