Target check-env-arm-license

# HG changeset patch # User Shabe Razvi # Date 1255026980 -3600 # Node ID 56a1d97e7c73852167bd0e9a2a69a34abc9fe6da # Parent 3c858aa7a023e0e5f51d6cc0ad2e80c3f2833759 Skip sf-compare-to-baseline if sf.spec.publish.enable is false. Update FBF documentation. diff -r 3c858aa7a023 -r 56a1d97e7c73 common/build.postbuild.xml --- a/common/build.postbuild.xml Tue Oct 06 17:31:14 2009 +0100 +++ b/common/build.postbuild.xml Thu Oct 08 19:36:20 2009 +0100 @@ -36,9 +36,14 @@ - - - + + + + + + + + diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/alltargets-frame.html --- a/doc/api/helium/alltargets-frame.html Tue Oct 06 17:31:14 2009 +0100 +++ b/doc/api/helium/alltargets-frame.html Thu Oct 08 19:36:20 2009 +0100 @@ -36,7 +36,7 @@ - all + check-env-arm-license
@@ -52,7 +52,11 @@
- reset-bom-sources-csv + get-arm-license + +
+ + set-arm-version
@@ -60,467 +64,7 @@
- sf-bom-info-0 - -
- - sf-bom-info-1 - -
- - sf-bom-info-10 - -
- - sf-bom-info-100 - -
- - sf-bom-info-101 - -
- - sf-bom-info-102 - -
- - sf-bom-info-103 - -
- - sf-bom-info-104 - -
- - sf-bom-info-105 - -
- - sf-bom-info-106 - -
- - sf-bom-info-107 - -
- - sf-bom-info-108 - -
- - sf-bom-info-109 - -
- - sf-bom-info-11 - -
- - sf-bom-info-110 - -
- - sf-bom-info-111 - -
- - sf-bom-info-112 - -
- - sf-bom-info-113 - -
- - sf-bom-info-114 - -
- - sf-bom-info-115 - -
- - sf-bom-info-12 - -
- - sf-bom-info-13 - -
- - sf-bom-info-14 - -
- - sf-bom-info-15 - -
- - sf-bom-info-16 - -
- - sf-bom-info-17 - -
- - sf-bom-info-18 - -
- - sf-bom-info-19 - -
- - sf-bom-info-2 - -
- - sf-bom-info-20 - -
- - sf-bom-info-21 - -
- - sf-bom-info-22 - -
- - sf-bom-info-23 - -
- - sf-bom-info-24 - -
- - sf-bom-info-25 - -
- - sf-bom-info-26 - -
- - sf-bom-info-27 - -
- - sf-bom-info-28 - -
- - sf-bom-info-29 - -
- - sf-bom-info-3 - -
- - sf-bom-info-30 - -
- - sf-bom-info-31 - -
- - sf-bom-info-32 - -
- - sf-bom-info-33 - -
- - sf-bom-info-34 - -
- - sf-bom-info-35 - -
- - sf-bom-info-36 - -
- - sf-bom-info-37 - -
- - sf-bom-info-38 - -
- - sf-bom-info-39 - -
- - sf-bom-info-4 - -
- - sf-bom-info-40 - -
- - sf-bom-info-41 - -
- - sf-bom-info-42 - -
- - sf-bom-info-43 - -
- - sf-bom-info-44 - -
- - sf-bom-info-45 - -
- - sf-bom-info-46 - -
- - sf-bom-info-47 - -
- - sf-bom-info-48 - -
- - sf-bom-info-49 - -
- - sf-bom-info-5 - -
- - sf-bom-info-50 - -
- - sf-bom-info-51 - -
- - sf-bom-info-52 - -
- - sf-bom-info-53 - -
- - sf-bom-info-54 - -
- - sf-bom-info-55 - -
- - sf-bom-info-56 - -
- - sf-bom-info-57 - -
- - sf-bom-info-58 - -
- - sf-bom-info-59 - -
- - sf-bom-info-6 - -
- - sf-bom-info-60 - -
- - sf-bom-info-61 - -
- - sf-bom-info-62 - -
- - sf-bom-info-63 - -
- - sf-bom-info-64 - -
- - sf-bom-info-65 - -
- - sf-bom-info-66 - -
- - sf-bom-info-67 - -
- - sf-bom-info-68 - -
- - sf-bom-info-69 - -
- - sf-bom-info-7 - -
- - sf-bom-info-70 - -
- - sf-bom-info-71 - -
- - sf-bom-info-72 - -
- - sf-bom-info-73 - -
- - sf-bom-info-74 - -
- - sf-bom-info-75 - -
- - sf-bom-info-76 - -
- - sf-bom-info-77 - -
- - sf-bom-info-78 - -
- - sf-bom-info-79 - -
- - sf-bom-info-8 - -
- - sf-bom-info-80 - -
- - sf-bom-info-81 - -
- - sf-bom-info-82 - -
- - sf-bom-info-83 - -
- - sf-bom-info-84 - -
- - sf-bom-info-85 - -
- - sf-bom-info-86 - -
- - sf-bom-info-87 - -
- - sf-bom-info-88 - -
- - sf-bom-info-89 - -
- - sf-bom-info-9 - -
- - sf-bom-info-90 - -
- - sf-bom-info-91 - -
- - sf-bom-info-92 - -
- - sf-bom-info-93 - -
- - sf-bom-info-94 - -
- - sf-bom-info-95 - -
- - sf-bom-info-96 - -
- - sf-bom-info-97 - -
- - sf-bom-info-98 - -
- - sf-bom-info-99 + sf-brag-to-diamonds
@@ -552,10 +96,30 @@
+ sf-check-missing-os-files + +
+ + sf-check-missing-s60-files + +
+ + sf-check-utilities-dir + +
+ + sf-compare-to-baseline + +
+ sf-compile
+ sf-create-public-PDK + +
+ sf-delete-junction
@@ -568,6 +132,10 @@
+ sf-diamonds-connect + +
+ sf-diamonds-tag-build
@@ -576,6 +144,10 @@
+ sf-gen-buildinfo-txt + +
+ sf-generate-source-spec
@@ -632,10 +204,6 @@
- sf-parse-project-config - -
- sf-platform-bootstrap
@@ -656,470 +224,6 @@
- sf-prebuild-0 - -
- - sf-prebuild-1 - -
- - sf-prebuild-10 - -
- - sf-prebuild-100 - -
- - sf-prebuild-101 - -
- - sf-prebuild-102 - -
- - sf-prebuild-103 - -
- - sf-prebuild-104 - -
- - sf-prebuild-105 - -
- - sf-prebuild-106 - -
- - sf-prebuild-107 - -
- - sf-prebuild-108 - -
- - sf-prebuild-109 - -
- - sf-prebuild-11 - -
- - sf-prebuild-110 - -
- - sf-prebuild-111 - -
- - sf-prebuild-112 - -
- - sf-prebuild-113 - -
- - sf-prebuild-114 - -
- - sf-prebuild-115 - -
- - sf-prebuild-12 - -
- - sf-prebuild-13 - -
- - sf-prebuild-14 - -
- - sf-prebuild-15 - -
- - sf-prebuild-16 - -
- - sf-prebuild-17 - -
- - sf-prebuild-18 - -
- - sf-prebuild-19 - -
- - sf-prebuild-2 - -
- - sf-prebuild-20 - -
- - sf-prebuild-21 - -
- - sf-prebuild-22 - -
- - sf-prebuild-23 - -
- - sf-prebuild-24 - -
- - sf-prebuild-25 - -
- - sf-prebuild-26 - -
- - sf-prebuild-27 - -
- - sf-prebuild-28 - -
- - sf-prebuild-29 - -
- - sf-prebuild-3 - -
- - sf-prebuild-30 - -
- - sf-prebuild-31 - -
- - sf-prebuild-32 - -
- - sf-prebuild-33 - -
- - sf-prebuild-34 - -
- - sf-prebuild-35 - -
- - sf-prebuild-36 - -
- - sf-prebuild-37 - -
- - sf-prebuild-38 - -
- - sf-prebuild-39 - -
- - sf-prebuild-4 - -
- - sf-prebuild-40 - -
- - sf-prebuild-41 - -
- - sf-prebuild-42 - -
- - sf-prebuild-43 - -
- - sf-prebuild-44 - -
- - sf-prebuild-45 - -
- - sf-prebuild-46 - -
- - sf-prebuild-47 - -
- - sf-prebuild-48 - -
- - sf-prebuild-49 - -
- - sf-prebuild-5 - -
- - sf-prebuild-50 - -
- - sf-prebuild-51 - -
- - sf-prebuild-52 - -
- - sf-prebuild-53 - -
- - sf-prebuild-54 - -
- - sf-prebuild-55 - -
- - sf-prebuild-56 - -
- - sf-prebuild-57 - -
- - sf-prebuild-58 - -
- - sf-prebuild-59 - -
- - sf-prebuild-6 - -
- - sf-prebuild-60 - -
- - sf-prebuild-61 - -
- - sf-prebuild-62 - -
- - sf-prebuild-63 - -
- - sf-prebuild-64 - -
- - sf-prebuild-65 - -
- - sf-prebuild-66 - -
- - sf-prebuild-67 - -
- - sf-prebuild-68 - -
- - sf-prebuild-69 - -
- - sf-prebuild-7 - -
- - sf-prebuild-70 - -
- - sf-prebuild-71 - -
- - sf-prebuild-72 - -
- - sf-prebuild-73 - -
- - sf-prebuild-74 - -
- - sf-prebuild-75 - -
- - sf-prebuild-76 - -
- - sf-prebuild-77 - -
- - sf-prebuild-78 - -
- - sf-prebuild-79 - -
- - sf-prebuild-8 - -
- - sf-prebuild-80 - -
- - sf-prebuild-81 - -
- - sf-prebuild-82 - -
- - sf-prebuild-83 - -
- - sf-prebuild-84 - -
- - sf-prebuild-85 - -
- - sf-prebuild-86 - -
- - sf-prebuild-87 - -
- - sf-prebuild-88 - -
- - sf-prebuild-89 - -
- - sf-prebuild-9 - -
- - sf-prebuild-90 - -
- - sf-prebuild-91 - -
- - sf-prebuild-92 - -
- - sf-prebuild-93 - -
- - sf-prebuild-94 - -
- - sf-prebuild-95 - -
- - sf-prebuild-96 - -
- - sf-prebuild-97 - -
- - sf-prebuild-98 - -
- - sf-prebuild-99 - -
- sf-prebuild-announce
@@ -1160,6 +264,10 @@
+ sf-run-analysis-missing-files + +
+ sf-run-analysis-raptor
@@ -1192,6 +300,10 @@
+ sf-run-sfl-licence-munging + +
+ sf-s60-compile
@@ -1204,6 +316,10 @@
+ sf-start-ats + +
+ sf-summary
@@ -1216,6 +332,14 @@
+ sf-test-bc-check + +
+ + sf-test-smoketest + +
+ sf-truclean
diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/deprecated-list.html --- a/doc/api/helium/deprecated-list.html Tue Oct 06 17:31:14 2009 +0100 +++ b/doc/api/helium/deprecated-list.html Thu Oct 08 19:36:20 2009 +0100 @@ -248,444 +248,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/index-1.html --- a/doc/api/helium/index-1.html Tue Oct 06 17:31:14 2009 +0100 +++ b/doc/api/helium/index-1.html Thu Oct 08 19:36:20 2009 +0100 @@ -115,7 +115,6 @@

@@ -182,6 +181,7 @@

ccm.home.dir

ccmgetinput

ccmtask.python.script.file

check-env-arm-license

@@ -284,6 +284,7 @@

genxml.output.file.suffix

get-arm-license

getenv.tool.location

H

@@ -422,7 +423,6 @@

relnotes.config.dir

remote.builds.config.file

required.ant.version

reset-bom-sources-csv

robot.email.to

rombuild.buildinfo.output

rombuild.buildinfo.template

@@ -442,135 +442,28 @@

sbs.implicit.tools.build

sbs.tools.config

selge.ini.network.dir

sf-build-smoketestpkg

sf-check-env

sf-check-missing-os-files

sf-check-missing-s60-files

sf-check-utilities-dir

sf-compare-to-baseline

sf-diamonds-tag-build

sf-find-ATS-worker-root

sf-gen-buildinfo-txt

sf-generate-source-spec

sf-getenvs

sf-getenv-tools

@@ -585,128 +478,11 @@

sf-package-source

sf-package-tools

sf-package-validate

sf-parse-project-config

sf-platform-bootstrap

sf-platform-bootstrap-gt

sf-platform-bootstrap-s60

@@ -717,6 +493,7 @@

sf-run-analysis-diamonds

sf-run-analysis-list

sf-run-analysis-missing-files

sf-run-analysis-raptor

sf-run-analysis-whatlog

sf-run-analysis-whatlog-collisons

@@ -725,12 +502,16 @@

sf-run-analysis-whatlog-summary

sf-run-analysis-yarp

sf-run-evalid

sf-run-sfl-licence-munging

diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/overview-frame.html --- a/doc/api/helium/overview-frame.html Tue Oct 06 17:31:14 2009 +0100 +++ b/doc/api/helium/overview-frame.html Thu Oct 08 19:36:20 2009 +0100 @@ -60,8 +60,6 @@
SF-POSTBUILD
- SF-SOURCESPEC -

Property groups diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/overview-summary.html --- a/doc/api/helium/overview-summary.html Tue Oct 06 17:31:14 2009 +0100 +++ b/doc/api/helium/overview-summary.html Thu Oct 08 19:36:20 2009 +0100 @@ -122,10 +122,6 @@ SF-POSTBUILD - - SF-SOURCESPEC - -
diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/project-SF-COMMON-CONFIG.html --- a/doc/api/helium/project-SF-COMMON-CONFIG.html Tue Oct 06 17:31:14 2009 +0100 +++ b/doc/api/helium/project-SF-COMMON-CONFIG.html Thu Oct 08 19:36:20 2009 +0100 @@ -82,7 +82,7 @@

Project SF-COMMON-CONFIG

Location

D:/maintools/sf-config/common/build.xml +

d:/maintools/sf-config/common/build.xml

Description

@@ -124,6 +124,9 @@ sf-diamondize-bom + sf-diamonds-connect + + sf-diamonds-tag-build @@ -151,9 +154,6 @@ sf-package-source - sf-parse-project-config - - sf-prebuild @@ -181,7 +181,7 @@ sf-truclean - sf-unpack-rnd

unpack rnd zips if available

+ sf-unpack-rnd

Unpack the rnd zips ready to be used in the build

sf-zip-content @@ -285,6 +285,10 @@
+${sf.common.config.dir}/tools/brag/logToBRAG.pl + +
+ brag_script.pl
@@ -293,6 +297,14 @@
+${sf.common.config.dir}/tools/generate_diamonds_tags_xml.pl + +
+ +--output=${build.drive}/output/logs/sf-diamonds-tag-build.xml + +
+ ${sf.common.config.dir}/tools/listdir.pl
@@ -328,6 +340,10 @@ ${build.log.dir}/rnd_excludefile.txt
+ +${sf.common.config.dir}/tools/brag/logToBRAG.pl + +

Python Modules

diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/project-SF-COMMON-TEST.html --- a/doc/api/helium/project-SF-COMMON-TEST.html Tue Oct 06 17:31:14 2009 +0100 +++ b/doc/api/helium/project-SF-COMMON-TEST.html Thu Oct 08 19:36:20 2009 +0100 @@ -82,7 +82,7 @@

Project SF-COMMON-TEST

Location

D:/maintools/sf-config/common/build.test.xml +

d:/maintools/sf-config/common/build.test.xml

Description

@@ -114,6 +114,15 @@ sf-send-testpkg

Sending testdrop to ATS3

+ + sf-start-ats + + + sf-test-bc-check + + + sf-test-smoketest +

Properties

diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/project-SF-CONFIG.html --- a/doc/api/helium/project-SF-CONFIG.html Tue Oct 06 17:31:14 2009 +0100 +++ b/doc/api/helium/project-SF-CONFIG.html Thu Oct 08 19:36:20 2009 +0100 @@ -82,6 +82,8 @@

Project SF-CONFIG

Location

d:/maintools/sf-config/build.xml +

Description

@@ -94,6 +96,15 @@ Target nameDescription + + check-env-arm-license + + + get-arm-license + + + set-arm-version +

Properties

diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/project-SF-PLATFORM-CONFIG.html --- a/doc/api/helium/project-SF-PLATFORM-CONFIG.html Tue Oct 06 17:31:14 2009 +0100 +++ b/doc/api/helium/project-SF-PLATFORM-CONFIG.html Thu Oct 08 19:36:20 2009 +0100 @@ -82,7 +82,7 @@

Project SF-PLATFORM-CONFIG

Location

D:/maintools/sf-config/sf-platform/build.xml +

d:/maintools/sf-config/sf-platform/build.xml

Description

@@ -106,6 +106,9 @@ sf-compile

Name: SF-COMPILE

Desc: Override of common sf-compile target defined in common\build.xml

os build will be skipped if sf.spec.os.skipbuild=true s60 build will be skipped if sf.spec.s60.skipbuild=true

+ sf-gen-buildinfo-txt + + sf-os-compile

Name: SF-OS-COMPILE

Desc: Compile OS part of build using the spec defined in:

- job_props.ant.xml - job_refs.ant.xml diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/project-SF-POSTBUILD.html --- a/doc/api/helium/project-SF-POSTBUILD.html Tue Oct 06 17:31:14 2009 +0100 +++ b/doc/api/helium/project-SF-POSTBUILD.html Thu Oct 08 19:36:20 2009 +0100 @@ -82,7 +82,7 @@

Project SF-POSTBUILD

Location

D:/maintools/sf-config/common/build.postbuild.xml +

d:/maintools/sf-config/common/build.postbuild.xml

Description

@@ -97,6 +97,24 @@ Target nameDescription + sf-brag-to-diamonds + + + sf-check-missing-os-files + + + sf-check-missing-s60-files + + + sf-check-utilities-dir + + + sf-compare-to-baseline + + + sf-create-public-PDK + + sf-package-binary @@ -127,6 +145,9 @@ sf-run-analysis-list + sf-run-analysis-missing-files

TODO: Make this work for package builds once we have sysmodel story worked out

+ + sf-run-analysis-raptor @@ -151,10 +172,13 @@ sf-run-evalid + sf-run-sfl-licence-munging + + sf-tag-hg-code - sf-zip-logs

package all logs into zipfile before publish

+ sf-zip-logs

package all logs into zipfile for publishing

@@ -179,10 +203,6 @@
-${sf.common.config.dir}/tools/zip_includefiles.pl - -
- -x@${build.log.dir}/rnd_excludefile.txt
@@ -211,6 +231,10 @@
+${sf.common.config.dir}/tools/brag/raptorToBRAG.pl + +
+ ${sf.common.config.dir}/tools/analysis/yarp.pl
@@ -239,9 +263,53 @@
+${sf.project.location}/sysdefs/system_model_s60.xml + +
+ ${sf.common.config.dir}/tools/analysis/find_collisions.pl
+ +${sf.common.config.dir}/tools/brag/send_xml_to_diamonds.py + +
+ +${build.log.dir}/sf-run-analysis.xml + +
+ +${sf.common.config.dir}/tools/mergeXML.pl + +
+ +${build.log.dir}/summary/*?_BRAG.xml + +
+ +${sf.common.config.dir}/tools/brag/send_xml_to_diamonds.py + +
+ +${temp.build.dir}/bragForDiamonds.xml + +
+ +${build.drive}/utilities/releaseAutomation/fcls4releasenotes.pl + +
+ +${build.drive}/utilities/releaseAutomation/mercurialComparison.pl + +
+ +${build.log.dir}/BOM/build-info.xml + +
+ +${build.drive}/utilities/williamr/convert_to_eula.pl + +

Python Modules

diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/project-frame-SF-COMMON-CONFIG.html --- a/doc/api/helium/project-frame-SF-COMMON-CONFIG.html Tue Oct 06 17:31:14 2009 +0100 +++ b/doc/api/helium/project-frame-SF-COMMON-CONFIG.html Thu Oct 08 19:36:20 2009 +0100 @@ -52,6 +52,8 @@
sf-diamondize-bom
+ sf-diamonds-connect +
sf-diamonds-tag-build
sf-generate-source-spec @@ -70,8 +72,6 @@
sf-package-source
- sf-parse-project-config -
sf-prebuild
sf-prebuild-announce diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/project-frame-SF-COMMON-TEST.html --- a/doc/api/helium/project-frame-SF-COMMON-TEST.html Tue Oct 06 17:31:14 2009 +0100 +++ b/doc/api/helium/project-frame-SF-COMMON-TEST.html Thu Oct 08 19:36:20 2009 +0100 @@ -46,6 +46,12 @@
sf-send-testpkg
+ sf-start-ats +
+ sf-test-bc-check +
+ sf-test-smoketest +
diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/project-frame-SF-CONFIG.html --- a/doc/api/helium/project-frame-SF-CONFIG.html Tue Oct 06 17:31:14 2009 +0100 +++ b/doc/api/helium/project-frame-SF-CONFIG.html Thu Oct 08 19:36:20 2009 +0100 @@ -34,6 +34,12 @@
+ check-env-arm-license +
+ get-arm-license +
+ set-arm-version +
diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/project-frame-SF-PLATFORM-CONFIG.html --- a/doc/api/helium/project-frame-SF-PLATFORM-CONFIG.html Tue Oct 06 17:31:14 2009 +0100 +++ b/doc/api/helium/project-frame-SF-PLATFORM-CONFIG.html Thu Oct 08 19:36:20 2009 +0100 @@ -40,6 +40,8 @@
sf-compile
+ sf-gen-buildinfo-txt +
sf-os-compile
sf-platform-bootstrap diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/project-frame-SF-POSTBUILD.html --- a/doc/api/helium/project-frame-SF-POSTBUILD.html Tue Oct 06 17:31:14 2009 +0100 +++ b/doc/api/helium/project-frame-SF-POSTBUILD.html Thu Oct 08 19:36:20 2009 +0100 @@ -34,6 +34,18 @@
+ sf-brag-to-diamonds +
+ sf-check-missing-os-files +
+ sf-check-missing-s60-files +
+ sf-check-utilities-dir +
+ sf-compare-to-baseline +
+ sf-create-public-PDK +
sf-package-binary
sf-package-postbuild-rnd @@ -54,6 +66,8 @@
sf-run-analysis-list
+ sf-run-analysis-missing-files +
sf-run-analysis-raptor
sf-run-analysis-whatlog @@ -70,6 +84,8 @@
sf-run-evalid
+ sf-run-sfl-licence-munging +
sf-tag-hg-code
sf-zip-logs diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-check-env-arm-license.dot.png Binary file doc/api/helium/target-check-env-arm-license.dot.png has changed diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-check-env-arm-license.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/doc/api/helium/target-check-env-arm-license.html Thu Oct 08 19:36:20 2009 +0100 @@ -0,0 +1,194 @@ + + + + + + + + + + + + + + + + + Target check-env-arm-license + + + + + + + + + + + + + + + + + +

+ + + + + + + + + + + +

overview

deprecated

properties-table

index

help

+Helium API + +

+ prev + next

+ frames + no frames + + + + + +

+ + +

+ + + +

Target check-env-arm-license

+ +

Location

d:\maintools\sf-config\build.xml:11: +

+ +

Conditional execution

No conditions on target execution.

+ +

Description

+ + + + +

Property dependencies

+ + +

+ + + + + + + + + + +
Name Edit status
User editable properties
Internal properties
+

Name	Edit status
User editable properties
Internal properties

+ +

+ + +

Target dependencies

+ check-env-arm-license dependencies + + + +

+ + +

Source code

+    <target name="check-env-arm-license"/>
+

+ + +

+ + + + + + + + + + + + + +

+ + + + + + + + + + + +

overview

deprecated

properties-table

index

help

+Helium API + +

+ prev + next

+ frames + no frames + + + + + +

+ + + Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. License: http://www.eclipse.org/legal/epl-v10.html + + + + + diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-create-canonical-sysdef-file.dot.png Binary file doc/api/helium/target-create-canonical-sysdef-file.dot.png has changed diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-create-canonical-sysdef-file.html --- a/doc/api/helium/target-create-canonical-sysdef-file.html Tue Oct 06 17:31:14 2009 +0100 +++ b/doc/api/helium/target-create-canonical-sysdef-file.html Thu Oct 08 19:36:20 2009 +0100 @@ -82,7 +82,7 @@

Target create-canonical-sysdef-file

Location

D:\maintools\sf-config\sf-platform\build.xml:69: +

d:\maintools\sf-config\sf-platform\build.xml:84:

Conditional execution

diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-example.dot.png Binary file doc/api/helium/target-example.dot.png has changed diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-generate-layers.dot.png Binary file doc/api/helium/target-generate-layers.dot.png has changed diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-generate-layers.html --- a/doc/api/helium/target-generate-layers.html Tue Oct 06 17:31:14 2009 +0100 +++ b/doc/api/helium/target-generate-layers.html Thu Oct 08 19:36:20 2009 +0100 @@ -82,7 +82,7 @@

Target generate-layers

Location

D:\maintools\sf-config\common\build.xml:180: +

d:\maintools\sf-config\common\build.xml:186:

Conditional execution

diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-get-arm-license.dot.png Binary file doc/api/helium/target-get-arm-license.dot.png has changed diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-get-arm-license.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/doc/api/helium/target-get-arm-license.html Thu Oct 08 19:36:20 2009 +0100 @@ -0,0 +1,196 @@ + + + + + + + + + + + + + + + + + Target get-arm-license + + + + + + + + + + + + + + + + + +

+ + + + + + + + + + + +

overview

deprecated

properties-table

index

help

+Helium API + +

+ prev + next

+ frames + no frames + + + + + +

+ + +

+ + + +

Target get-arm-license

+ +

Location

d:\maintools\sf-config\build.xml:12: +

+ +

Conditional execution

No conditions on target execution.

+ +

Description

+ + + + +

Property dependencies

+ + +

+ + + + + + + + + + +
Name Edit status
User editable properties
Internal properties
+

Name	Edit status
User editable properties
Internal properties

+ +

+ + +

Target dependencies

+ get-arm-license dependencies + + + +

+ + +

Source code

+    <target name="get-arm-license"/>
+

+ + +

+ + + + + + + + + + + + + +

+ + + + + + + + + + + +

overview

deprecated

properties-table

index

help

+Helium API + +

+ prev + next

+ frames + no frames + + + + + +

+ + + Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. License: http://www.eclipse.org/legal/epl-v10.html + + + + + + + diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-set-arm-version.dot.png Binary file doc/api/helium/target-set-arm-version.dot.png has changed diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-set-arm-version.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/doc/api/helium/target-set-arm-version.html Thu Oct 08 19:36:20 2009 +0100 @@ -0,0 +1,194 @@ + + + + + + + + + + + + + + + + + Target set-arm-version + + + + + + + + + + + + + + + + + +

+ + + + + + + + + + + +

overview

deprecated

properties-table

index

help

+Helium API + +

+ prev + next

+ frames + no frames + + + + + +

+ + +

+ + + +

Target set-arm-version

+ +

Location

d:\maintools\sf-config\build.xml:10: +

+ +

Conditional execution

No conditions on target execution.

+ +

Description

+ + + + +

Property dependencies

+ + +

+ + + + + + + + + + +
Name Edit status
User editable properties
Internal properties
+

Name	Edit status
User editable properties
Internal properties

+ +

+ + +

Target dependencies

+ set-arm-version dependencies + + + +

+ + +

Source code

+    <target name="set-arm-version"/>
+

+ + +

+ + + + + + + + + + + + + +

+ + + + + + + + + + + +

overview

deprecated

properties-table

index

help

+Helium API + +

+ prev + next

+ frames + no frames + + + + + +

+ + + Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. License: http://www.eclipse.org/legal/epl-v10.html + + + + + diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-bc-check.dot.png Binary file doc/api/helium/target-sf-bc-check.dot.png has changed diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-bc-check.html --- a/doc/api/helium/target-sf-bc-check.html Tue Oct 06 17:31:14 2009 +0100 +++ b/doc/api/helium/target-sf-bc-check.html Thu Oct 08 19:36:20 2009 +0100 @@ -82,7 +82,7 @@

Target sf-bc-check

Location

D:\maintools\sf-config\common\build.test.xml:31: +

d:\maintools\sf-config\common\build.test.xml:34:

Conditional execution

@@ -167,11 +167,13 @@ sf-bc-check dependencies

- - - - - + + + + + + +

@@ -263,7 +265,7 @@ <exec executable="perl" dir="${sf.common.config.dir}/tools/ats/" failonerror="false" append="true" output="${build.log.dir}/ATS_${build.id}_dynamicbc.log"> <arg value="ats_specialise_test_drop.pl"/> <arg value="--test-drop-name=${env.COMPUTERNAME}-bctest-${build.id}_${program}"/> - <arg value="--device-name=GENERIC EMULATOR on ${env.COMPUTERNAME}"/> + <arg value="--host-name=${env.COMPUTERNAME}.ad-sfpd.intra"/> <arg value="--src=${sf.spec.test.package.location}/../bctest/${program}"/> <arg value="--dest=${sf.spec.test.package.location}\${env.COMPUTERNAME}-bctest-${build.id}_${program}"/> </exec> diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-brag-to-diamonds.dot.png Binary file doc/api/helium/target-sf-brag-to-diamonds.dot.png has changed diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-brag-to-diamonds.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/doc/api/helium/target-sf-brag-to-diamonds.html Thu Oct 08 19:36:20 2009 +0100 @@ -0,0 +1,268 @@ + + + + + + + + + + + + + + + + + Target sf-brag-to-diamonds + + + + + + + + + + + + + + + + + +

+ + + + + + + + + + + +

overview

deprecated

properties-table

index

help

+Helium API + +

+ prev + next

+ frames + no frames + + + + + +

+ + +

+ + + +

Target sf-brag-to-diamonds

+ +

Location

d:\maintools\sf-config\common\build.postbuild.xml:507: +

+ +

Conditional execution

No conditions on target execution.

+ +

Description

+ + +

Target external Dependency

+ + + + + + + + + + +
Name
perl
python
+

Name
perl
python

+ + +

Property dependencies

+ + +

+ + + + + + + + + + + + + + + + + + + + + + +
Name Edit status
User editable properties
Internal properties
build.log.dir discouraged
diamonds.build.id never
diamonds.host discouraged
temp.build.dir never
+

Name	Edit status
User editable properties
Internal properties
`build.log.dir`	discouraged
`diamonds.build.id`	never
`diamonds.host`	discouraged
`temp.build.dir`	never

+ +

+ + +

Target dependencies

+ sf-brag-to-diamonds dependencies + + + + +

+ + +

Source code

+    <target name="sf-brag-to-diamonds">
+        <!-- Merge all our bits of XML together -->
+        <exec executable="perl" output="${build.log.dir}/summary/_BRAG.xml">
+            <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>
+        <!-- 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"/>
+            <arg value="-XSL"/>
+            <arg value="${sf.common.config.dir}/tools/brag/bragForDiamonds.xsl"/>
+            <arg value="-OUT"/>
+            <arg value="${temp.build.dir}/bragForDiamonds.xml"/>
+        </java>
+        <if>
+            <istrue value="${sf.spec.publish.enable}"/>
+            <then>
+                <!-- Try to obtain the diamonds ID for this build -->
+                <if>
+                    <not><isset property="diamonds.build.id"/></not>
+                    <then>
+                        <property file="${build.log.dir}/diamonds_build_id.properties"/> <!-- This will fail silently -->
+                    </then>
+                </if>
+                <if>
+                    <isset property="diamonds.build.id"/>
+                    <then>
+                        <!-- Send the data to the server -->
+                        <exec executable="python">
+                            <arg value="${sf.common.config.dir}/tools/brag/send_xml_to_diamonds.py"/>
+                            <arg value="-s"/>
+                            <arg value="${diamonds.host}"/>
+                            <arg value="-u"/>
+                            <arg value="${diamonds.build.id}"/>
+                            <arg value="-f"/>
+                            <arg value="${temp.build.dir}/bragForDiamonds.xml"/>
+                        </exec>
+                    </then>
+                    <else>
+                        <echo message="diamonds.build.id is not known - unable to push any build specific information to diamonds server"/>
+                    </else>
+                </if>
+            </then>
+        </if>
+    </target>
+

+ + +

+ + + + + + + + + + + + + +

+ + + + + + + + + + + +

overview

deprecated

properties-table

index

help

+Helium API + +

+ prev + next

+ frames + no frames + + + + + +

+ + + Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. License: http://www.eclipse.org/legal/epl-v10.html + + + + + diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-build-all.dot.png Binary file doc/api/helium/target-sf-build-all.dot.png has changed diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-build-all.html --- a/doc/api/helium/target-sf-build-all.html Tue Oct 06 17:31:14 2009 +0100 +++ b/doc/api/helium/target-sf-build-all.html Thu Oct 08 19:36:20 2009 +0100 @@ -82,7 +82,7 @@

Target sf-build-all

Location

D:\maintools\sf-config\common\build.xml:122: +

d:\maintools\sf-config\common\build.xml:145:

Conditional execution

@@ -123,62 +123,70 @@ sf-build-all dependencies

- - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-build-and-pack.dot.png Binary file doc/api/helium/target-sf-build-and-pack.dot.png has changed diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-build-and-pack.html --- a/doc/api/helium/target-sf-build-and-pack.html Tue Oct 06 17:31:14 2009 +0100 +++ b/doc/api/helium/target-sf-build-and-pack.html Thu Oct 08 19:36:20 2009 +0100 @@ -82,7 +82,7 @@

Target sf-build-and-pack

Location

D:\maintools\sf-config\common\build.xml:136: +

d:\maintools\sf-config\common\build.xml:149:

Conditional execution

@@ -123,47 +123,59 @@ sf-build-and-pack dependencies

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-build-noprep.dot.png Binary file doc/api/helium/target-sf-build-noprep.dot.png has changed diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-build-noprep.html --- a/doc/api/helium/target-sf-build-noprep.html Tue Oct 06 17:31:14 2009 +0100 +++ b/doc/api/helium/target-sf-build-noprep.html Thu Oct 08 19:36:20 2009 +0100 @@ -82,7 +82,7 @@

Target sf-build-noprep

Location

D:\maintools\sf-config\sf-platform\build.xml:20: +

d:\maintools\sf-config\sf-platform\build.xml:20:

Conditional execution

@@ -123,49 +123,61 @@ sf-build-noprep dependencies

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-build-smoketestpkg.dot.png Binary file doc/api/helium/target-sf-build-smoketestpkg.dot.png has changed diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-build-smoketestpkg.html --- a/doc/api/helium/target-sf-build-smoketestpkg.html Tue Oct 06 17:31:14 2009 +0100 +++ b/doc/api/helium/target-sf-build-smoketestpkg.html Thu Oct 08 19:36:20 2009 +0100 @@ -82,7 +82,7 @@

Target sf-build-smoketestpkg

Location

D:\maintools\sf-config\common\build.test.xml:139: +

d:\maintools\sf-config\common\build.test.xml:142:

Conditional execution

@@ -152,10 +152,11 @@ sf-build-smoketestpkg dependencies

- - - - + + + + +

@@ -183,13 +184,13 @@ <exec executable="perl" dir="${build.drive}/smoketest/group" failonerror="false" append="true" output="${build.log.dir}/ATS_${build.id}_smoketest.log"> <arg value="smoketest.pl"/> </exec> - <copy file="${build.drive}/smoketest/group/smoketest.zip" todir="${sf.spec.test.package.location}"/> + <copy file="${build.drive}/smoketest/group/smoketest.zip" todir="${sf.spec.test.package.location}" failonerror="false"/> <echo message="INFO Updating smoketest package with test info"/> <exec executable="perl" dir="${sf.common.config.dir}/tools/ats/" failonerror="false" append="true" output="${build.log.dir}/ATS_${build.id}_smoketest.log"> <arg value="ats_specialise_test_drop.pl"/> <arg value="--test-drop-name=Smoketest-${build.id}"/> - <arg value="--device-name=GENERIC EMULATOR on ${env.COMPUTERNAME}"/> + <arg value="--device-name=${env.COMPUTERNAME}.ad-sfpd.intra"/> <arg value="--src=${sf.spec.test.package.location}\smoketest.zip"/> <arg value="--dest=${sf.spec.test.package.location}\${sf.spec.test.package.name}"/> <arg value="--build-id=http://${sf.spec.publish.diamonds.server}${diamonds.build.id}"/> diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-build.dot.png Binary file doc/api/helium/target-sf-build.dot.png has changed diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-build.html --- a/doc/api/helium/target-sf-build.html Tue Oct 06 17:31:14 2009 +0100 +++ b/doc/api/helium/target-sf-build.html Thu Oct 08 19:36:20 2009 +0100 @@ -82,7 +82,7 @@

Target sf-build

Location

D:\maintools\sf-config\common\build.xml:140: +

d:\maintools\sf-config\common\build.xml:153:

Conditional execution

@@ -123,65 +123,73 @@ sf-build dependencies

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-check-env.dot.png Binary file doc/api/helium/target-sf-check-env.dot.png has changed diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-check-env.html --- a/doc/api/helium/target-sf-check-env.html Tue Oct 06 17:31:14 2009 +0100 +++ b/doc/api/helium/target-sf-check-env.html Thu Oct 08 19:36:20 2009 +0100 @@ -82,7 +82,7 @@

Target sf-check-env

Location

D:\maintools\sf-config\common\build.xml:99: +

d:\maintools\sf-config\common\build.xml:95:

Conditional execution

@@ -105,6 +105,9 @@ perl + + perl +

@@ -147,7 +150,6 @@

Source code

     <target name="sf-check-env">
-
         <!-- Conditional location of BuildEnv.xml. Project always preferred to default -->
         <if><available file="${sf.project.location}/BuildEnv.xml"/>        
             <then>
@@ -159,7 +161,7 @@
         </if>
         
         <echo message="Build Env against ${sf.buildenv.location}/BuildEnv.xml"/>
-        <exec executable="perl" dir="${sf.common.config.dir}/tools" failonerror="true">
+        <exec executable="perl" dir="${sf.common.config.dir}/tools" resultproperty="sf.checkenv.exit">
             <arg value="CheckBuildEnv.pl"/>
             <arg value="--xml=${sf.buildenv.location}/BuildEnv.xml"/>
             <arg value="--dbg=${build.log.dir}/BuildEnvironmentCheck.log"/>
@@ -167,6 +169,24 @@
             <arg value="--tools='${sf.spec.sbs.tools.config}'"/>
             <arg value="Common"/>
         </exec>
+        <exec executable="perl" failonerror="false" output="${build.log.dir}/summary/BuildEnvironmentCheck_BRAG.xml" logError="true">
+            <arg value="${sf.common.config.dir}/tools/brag/logToBRAG.pl"/>
+            <arg value="--phase=Prebuild"/>
+            <arg value="--step=Build Environment Check"/>
+            <arg value="--rules=${sf.common.config.dir}/tools/brag/rules.BuildEnvironmentCheck.tsv"/>
+            <arg value="${build.log.dir}/BuildEnvironmentCheck.log"/>
+        </exec>
+        <fail>
+            <condition>
+                <not>
+                    <or>
+                        <equals arg1="sf.checkenv.exit" arg2="0"/>
+                        <isset property="sf.suppress.buildenv.check"/>
+                    </or>
+                </not>
+            </condition>
+Build Environment Check failed. To stop this failure aborting the build set property sf.suppress.buildenv.check to any value.
+        </fail>
     </target>

diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-check-missing-os-files.dot.png Binary file doc/api/helium/target-sf-check-missing-os-files.dot.png has changed diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-check-missing-os-files.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/doc/api/helium/target-sf-check-missing-os-files.html Thu Oct 08 19:36:20 2009 +0100 @@ -0,0 +1,223 @@ + + + + + + + + + + + + + + + + + Target sf-check-missing-os-files + + + + + + + + + + + + + + + + + +

+ + + + + + + + + + + +

overview

deprecated

properties-table

index

help

+Helium API + +

+ prev + next

+ frames + no frames + + + + + +

+ + +

+ + + +

Target sf-check-missing-os-files

+ +

Location

d:\maintools\sf-config\common\build.postbuild.xml:649: +

+ +

Conditional execution

No conditions on target execution.

+ +

Description

+ + + + +

Property dependencies

+ + +

+ + + + + + + + + + +
Name Edit status
User editable properties
Internal properties
+

Name	Edit status
User editable properties
Internal properties

+ +

+ + +

Target dependencies

+ sf-check-missing-os-files dependencies + + + + +

+ + +

Source code

+    <target name="sf-check-missing-os-files">
+        <hlm:argSet xmlns:hlm="http://www.nokia.com/helium" 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 xmlns:hlm="http://www.nokia.com/helium" 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}"/>
+            <param name="build.id" value="sbs_check"/>
+            <reference refid="sbs.check.tools.var" torefid="sbs.var"/>
+            <reference refid="sbs.toolsbuild.options" torefid="sbs.make.options"/>
+            <reference refid="sf.spec.os.system.definition.files" torefid="system.definition.files"/>
+        </antcall> 
+        <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> 
+    </target>
+

+ + +

+ + + + + + + + + + + + + +

+ + + + + + + + + + + +

overview

deprecated

properties-table

index

help

+Helium API + +

+ prev + next

+ frames + no frames + + + + + +

+ + + Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. License: http://www.eclipse.org/legal/epl-v10.html + + + + + diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-check-missing-s60-files.dot.png Binary file doc/api/helium/target-sf-check-missing-s60-files.dot.png has changed diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-check-missing-s60-files.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/doc/api/helium/target-sf-check-missing-s60-files.html Thu Oct 08 19:36:20 2009 +0100 @@ -0,0 +1,225 @@ + + + + + + + + + + + + + + + + + Target sf-check-missing-s60-files + + + + + + + + + + + + + + + + + +

+ + + + + + + + + + + +

overview

deprecated

properties-table

index

help

+Helium API + +

+ prev + next

+ frames + no frames + + + + + +

+ + +

+ + + +

Target sf-check-missing-s60-files

+ +

Location

d:\maintools\sf-config\common\build.postbuild.xml:679: +

+ +

Conditional execution

No conditions on target execution.

+ +

Description

+ + + + +

Property dependencies

+ + +

+ + + + + + + + + + +
Name Edit status
User editable properties
Internal properties
+

Name	Edit status
User editable properties
Internal properties

+ +

+ + +

Target dependencies

+ sf-check-missing-s60-files dependencies + + + + +

+ + +

Source code

+    <target name="sf-check-missing-s60-files">
+    
+        <hlm:argSet xmlns:hlm="http://www.nokia.com/helium" 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 xmlns:hlm="http://www.nokia.com/helium" 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.s60.sysdef.clean.configurations.list}"/>
+            <param name="sf.spec.sysdef.version" value="${sf.spec.s60.sysdef.version}"/>
+            <param name="build.id" value="sbs_check"/>
+            <reference refid="sbs.check.tools.var" torefid="sbs.var"/>
+            <reference refid="sbs.toolsbuild.options" torefid="sbs.make.options"/>
+            <reference refid="sf.spec.s60.system.definition.files" torefid="system.definition.files"/>
+        </antcall> 
+        <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.s60.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.s60.system.definition.files" torefid="system.definition.files"/>
+        </antcall>
+        
+    </target>
+

+ + +

+ + + + + + + + + + + + + +

+ + + + + + + + + + + +

overview

deprecated

properties-table

index

help

+Helium API + +

+ prev + next

+ frames + no frames + + + + + +

+ + + Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. License: http://www.eclipse.org/legal/epl-v10.html + + + + + diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-check-utilities-dir.dot.png Binary file doc/api/helium/target-sf-check-utilities-dir.dot.png has changed diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-check-utilities-dir.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/doc/api/helium/target-sf-check-utilities-dir.html Thu Oct 08 19:36:20 2009 +0100 @@ -0,0 +1,201 @@ + + + + + + + + + + + + + + + + + Target sf-check-utilities-dir + + + + + + + + + + + + + + + + + +

+ + + + + + + + + + + +

overview

deprecated

properties-table

index

help

+Helium API + +

+ prev + next

+ frames + no frames + + + + + +

+ + +

+ + + +

Target sf-check-utilities-dir

+ +

Location

d:\maintools\sf-config\common\build.postbuild.xml:556: +

+ +

Conditional execution

No conditions on target execution.

+ +

Description

+ + + + +

Property dependencies

+ + +

+ + + + + + + + + + + + + +
Name Edit status
User editable properties
build.drive recommended
Internal properties
+

Name	Edit status
User editable properties
`build.drive`	recommended
Internal properties

+ +

+ + +

Target dependencies

+ sf-check-utilities-dir dependencies + + + + + +

+ + +

Source code

+    <target name="sf-check-utilities-dir">
+        <available property="sf-utilities-available" file="${build.drive}/utilities" type="dir"/>
+    </target>
+

+ + +

+ + + + + + + + + + + + + +

+ + + + + + + + + + + +

overview

deprecated

properties-table

index

help

+Helium API + +

+ prev + next

+ frames + no frames + + + + + +

+ + + Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. License: http://www.eclipse.org/legal/epl-v10.html + + + + + diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-compare-to-baseline.dot.png Binary file doc/api/helium/target-sf-compare-to-baseline.dot.png has changed diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-compare-to-baseline.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/doc/api/helium/target-sf-compare-to-baseline.html Thu Oct 08 19:36:20 2009 +0100 @@ -0,0 +1,256 @@ + + + + + + + + + + + + + + + + + Target sf-compare-to-baseline + + + + + + + + + + + + + + + + + +

+ + + + + + + + + + + +

overview

deprecated

properties-table

index

help

+Helium API + +

+ prev + next

+ frames + no frames + + + + + +

+ + +

+ + + +

Target sf-compare-to-baseline

+ +

Location

d:\maintools\sf-config\common\build.postbuild.xml:560: +

+ +

Conditional execution

Target is run if property defined: sf-utilities-available

+ +

Description

+ + +

Target external Dependency

+ + + + + + + + + + +
Name
perl
perl
+

Name
perl
perl

+ + +

Property dependencies

+ + +

+ + + + + + + + + + + + + + + + +
Name Edit status
User editable properties
build.drive recommended
Internal properties
build.log.dir discouraged
+

Name	Edit status
User editable properties
`build.drive`	recommended
Internal properties
`build.log.dir`	discouraged

+ +

+ + +

Target dependencies

+ sf-compare-to-baseline dependencies + + + + + + + +

+ + +

Source code

+    <target name="sf-compare-to-baseline" depends="sf-diamondize-bom,sf-check-utilities-dir" if="sf-utilities-available">
+        <property name="sf.releasenotes.wiki.txt" value="${build.log.dir}/releaseNotes.wiki.txt"/>
+        <delete file="${sf.releasenotes.wiki.txt}"/>
+        <!-- FCL usage -->
+        <exec executable="perl" dir="${build.drive}/utilities/releaseAutomation/" output="${build.log.dir}/fcls4releasenotes.log">
+            <arg value="${build.drive}/utilities/releaseAutomation/fcls4releasenotes.pl"/>
+            <arg value="--pdkname1=${sf.previous.pdk.tag}"/>
+            <arg value="--pdkloc2=${build.log.dir}"/>
+        </exec>
+        <!-- Mercurial comparison -->
+        <echo file="${sf.releasenotes.wiki.txt}" append="true">== Mercurial Comparison ==${line.separator}${line.separator}</echo>
+        <if>
+            <isset property="sf.previous.pdk.tag"/>
+            <then>
+                <echo file="${sf.releasenotes.wiki.txt}" append="true">The Mercurial changes from Nokia were delivered as a bulk update based on '''XXXXXXXXXXXXXXXXXXXXXX'''.${line.separator}${line.separator}List of the Mercurial changes (files added/removed/modified) between ${sf.previous.pdk.tag} and PDK '''XXXXX''' - [[Media:XXXX.txt]].${line.separator}${line.separator}A short study of the results concentrating on the added and removed files has identified these significant package changes:${line.separator}${line.separator}</echo>
+                <if>
+                    <istrue value="${sf.spec.sourcesync.archive}"/>
+                    <then>
+                        <echo file="${sf.releasenotes.wiki.txt}" append="true">'''Information cannot be derived as source was synced with archive option'''"${line.separator}${line.separator}</echo>
+                    </then>
+                    <else>
+                        <exec executable="perl" dir="${build.drive}/" output="${sf.releasenotes.wiki.txt}" append="true">
+                            <arg value="${build.drive}/utilities/releaseAutomation/mercurialComparison.pl"/>
+                            <arg value="${build.log.dir}/BOM/build-info.xml"/>
+                            <arg value="${sf.previous.pdk.tag}"/>
+                            <arg value="${build.log.dir}/mercurialComparison.tsv"/>
+                        </exec>
+                    </else>
+                </if>
+            </then>
+            <else>
+                <echo file="${sf.releasenotes.wiki.txt}" append="true">'''Information cannot be provided as the tag for the previous PDK was not provided to the build'''"${line.separator}${line.separator}</echo>
+            </else>
+        </if>
+        
+        <!-- Code churn -->
+        <!-- TODO? -->
+        <fixcrlf file="${sf.releasenotes.wiki.txt}"/>
+    </target>
+

+ + +

+ + + + + + + + + + + + + +

+ + + + + + + + + + + +

overview

deprecated

properties-table

index

help

+Helium API + +

+ prev + next

+ frames + no frames + + + + + +

+ + + Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. License: http://www.eclipse.org/legal/epl-v10.html + + + + + diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-compile.dot.png Binary file doc/api/helium/target-sf-compile.dot.png has changed diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-compile.html --- a/doc/api/helium/target-sf-compile.html Tue Oct 06 17:31:14 2009 +0100 +++ b/doc/api/helium/target-sf-compile.html Thu Oct 08 19:36:20 2009 +0100 @@ -82,7 +82,7 @@

Target sf-compile

Location

D:\maintools\sf-config\sf-platform\build.xml:115: +

d:\maintools\sf-config\sf-platform\build.xml:130:

Conditional execution

diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-create-public-PDK.dot.png Binary file doc/api/helium/target-sf-create-public-PDK.dot.png has changed diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-create-public-PDK.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/doc/api/helium/target-sf-create-public-PDK.html Thu Oct 08 19:36:20 2009 +0100 @@ -0,0 +1,254 @@ + + + + + + + + + + + + + + + + + Target sf-create-public-PDK + + + + + + + + + + + + + + + + + +

+ + + + + + + + + + + +

overview

deprecated

properties-table

index

help

+Helium API + +

+ prev + next

+ frames + no frames + + + + + +

+ + +

+ + + +

Target sf-create-public-PDK

+ +

Location

d:\maintools\sf-config\common\build.postbuild.xml:711: +

+ +

Conditional execution

No conditions on target execution.

+ +

Description

+ + + + +

Property dependencies

+ + +

+ + + + + + + + + + +
Name Edit status
User editable properties
Internal properties
+

Name	Edit status
User editable properties
Internal properties

+ +

+ + +

Target dependencies

+ sf-create-public-PDK dependencies + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

+ + +

Source code

+    <target name="sf-create-public-PDK" depends="sf-prebuild,sf-run-sfl-licence-munging">
+        <if>
+            <istrue value="${sf.spec.md5.enable}"/>
+            <then>
+                <echo message="INFO Creating MD5s"/>
+                <runtarget target="sf-run-evalid"/>
+            </then>
+        </if>
+        
+        <!-- Package up the binaries we built -->
+        <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-zip-logs"/>
+        <if>
+            <istrue value="${sf.spec.publish.enable}"/>
+            <then>
+                <echo message="Publish log files and reports to ${sf.spec.publish.rootdir}"/>
+                <runtarget target="sf-publish"/>
+            </then>
+        </if>
+    </target>
+

+ + +

+ + + + + + + + + + + + + +

+ + + + + + + + + + + +

overview

deprecated

properties-table

index

help

+Helium API + +

+ prev + next

+ frames + no frames + + + + + +

+ + + Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. License: http://www.eclipse.org/legal/epl-v10.html + + + + + diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-delete-junction.dot.png Binary file doc/api/helium/target-sf-delete-junction.dot.png has changed diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-delete-junction.html --- a/doc/api/helium/target-sf-delete-junction.html Tue Oct 06 17:31:14 2009 +0100 +++ b/doc/api/helium/target-sf-delete-junction.html Thu Oct 08 19:36:20 2009 +0100 @@ -82,7 +82,7 @@

Target sf-delete-junction

Location

D:\maintools\sf-config\common\build.test.xml:23: +

d:\maintools\sf-config\common\build.test.xml:26:

Conditional execution

diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-delta-dir.dot.png Binary file doc/api/helium/target-sf-delta-dir.dot.png has changed diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-delta-dir.html --- a/doc/api/helium/target-sf-delta-dir.html Tue Oct 06 17:31:14 2009 +0100 +++ b/doc/api/helium/target-sf-delta-dir.html Thu Oct 08 19:36:20 2009 +0100 @@ -82,7 +82,7 @@

Target sf-delta-dir

Location

D:\maintools\sf-config\common\build.xml:331: +

d:\maintools\sf-config\common\build.xml:341:

Conditional execution

diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-diamondize-bom.dot.png Binary file doc/api/helium/target-sf-diamondize-bom.dot.png has changed diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-diamondize-bom.html --- a/doc/api/helium/target-sf-diamondize-bom.html Tue Oct 06 17:31:14 2009 +0100 +++ b/doc/api/helium/target-sf-diamondize-bom.html Thu Oct 08 19:36:20 2009 +0100 @@ -82,7 +82,7 @@

Target sf-diamondize-bom

Location

D:\maintools\sf-config\common\build.xml:420: +

d:\maintools\sf-config\common\build.xml:430:

Conditional execution

@@ -129,8 +129,10 @@ sf-diamondize-bom dependencies

- - + + + +

@@ -138,24 +140,19 @@

Source code

-    <target name="sf-diamondize-bom">
-        <if>
-            <istrue value="${sf.spec.publish.enable}"/>
-            <then>
-                <fmpp sourceFile="${sf.common.config.dir}/templates/build-info.xml.ftl" outputFile="${build.drive}/output/logs/sf-diamondize-bom.xml">
-                    <data expandProperties="yes">
-                        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]})              
-                    </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"/>
-            </then>
-        </if>
+    <target name="sf-diamondize-bom" depends="sf-record-proj-conf-bom">
+        <fmpp sourceFile="${sf.common.config.dir}/templates/build-info.xml.ftl" outputFile="${build.drive}/output/logs/sf-diamondize-bom.xml">
+            <data expandProperties="yes">
+                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]})              
+            </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>

diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-diamonds-connect.dot.png Binary file doc/api/helium/target-sf-diamonds-connect.dot.png has changed diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-diamonds-connect.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/doc/api/helium/target-sf-diamonds-connect.html Thu Oct 08 19:36:20 2009 +0100 @@ -0,0 +1,212 @@ + + + + + + + + + + + + + + + + + Target sf-diamonds-connect + + + + + + + + + + + + + + + + + +

+ + + + + + + + + + + +

overview

deprecated

properties-table

index

help

+Helium API + +

+ prev + next

+ frames + no frames + + + + + +

+ + +

+ + + +

Target sf-diamonds-connect

+ +

Location

d:\maintools\sf-config\common\build.xml:212: +

+ +

Conditional execution

No conditions on target execution.

+ +

Description

+ + + + +

Property dependencies

+ + +

+ + + + + + + + + + + + + + + + +
Name Edit status
User editable properties
Internal properties
build.log.dir discouraged
diamonds.build.id never
+

Name	Edit status
User editable properties
Internal properties
`build.log.dir`	discouraged
`diamonds.build.id`	never

+ +

+ + +

Target dependencies

+ sf-diamonds-connect dependencies + + + + + +

+ + +

Source code

+    <target name="sf-diamonds-connect">
+      <if>
+        <istrue value="${sf.spec.publish.enable}"/>
+        <then>
+          <echo>[SF-DIAMONDS-CONNECT]</echo>
+          <runtarget target="diamonds"/>
+          <echo message="Save Diamonds build id value (${diamonds.build.id}) in a file"/>
+          <echo message="diamonds.build.id=${diamonds.build.id}" file="${build.log.dir}/diamonds_build_id.properties"/>
+        </then>
+      </if>
+    </target>
+

+ + +

+ + + + + + + + + + + + + +

+ + + + + + + + + + + +

overview

deprecated

properties-table

index

help

+Helium API + +

+ prev + next

+ frames + no frames + + + + + +

+ + + Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. License: http://www.eclipse.org/legal/epl-v10.html + + + + + diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-diamonds-tag-build.dot.png Binary file doc/api/helium/target-sf-diamonds-tag-build.dot.png has changed diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-diamonds-tag-build.html --- a/doc/api/helium/target-sf-diamonds-tag-build.html Tue Oct 06 17:31:14 2009 +0100 +++ b/doc/api/helium/target-sf-diamonds-tag-build.html Thu Oct 08 19:36:20 2009 +0100 @@ -82,7 +82,7 @@

Target sf-diamonds-tag-build

Location

D:\maintools\sf-config\common\build.xml:206: +

d:\maintools\sf-config\common\build.xml:224:

Conditional execution

@@ -96,6 +96,17 @@

Target external Dependency

+ + + + + + + +
Name
perl
+

Property dependencies

@@ -127,7 +138,6 @@ style="border-style: none"/> -

@@ -141,12 +151,12 @@ <istrue value="${sf.spec.publish.enable}"/> <then> <echo>[SF-DIAMONDS-TAG-BUILD]</echo> - <runtarget target="diamonds"/> - <fmpp sourceFile="${sf.common.config.dir}/diamonds/sf-tag-build.xml.ftl" outputFile="${build.drive}/output/logs/sf-tag-build.xml"> - <data expandProperties="yes"> - ant: antProperties() - </data> - </fmpp> + <echo message="Generate ${build.drive}/output/logs/sf-diamonds-tag-build.xml with Diamonds tags for this build"/> + <exec executable="perl" dir="${sf.common.config.dir}/tools" failonerror="true"> + <arg value="${sf.common.config.dir}/tools/generate_diamonds_tags_xml.pl"/> + <arg value="--tags=${sf.diamonds.tags}"/> + <arg value="--output=${build.drive}/output/logs/sf-diamonds-tag-build.xml"/> + </exec> </then> </if> </target> diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-find-ATS-worker-root.dot.png Binary file doc/api/helium/target-sf-find-ATS-worker-root.dot.png has changed diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-find-ATS-worker-root.html --- a/doc/api/helium/target-sf-find-ATS-worker-root.html Tue Oct 06 17:31:14 2009 +0100 +++ b/doc/api/helium/target-sf-find-ATS-worker-root.html Thu Oct 08 19:36:20 2009 +0100 @@ -82,7 +82,7 @@

Target sf-find-ATS-worker-root

Location

D:\maintools\sf-config\common\build.test.xml:4: +

d:\maintools\sf-config\common\build.test.xml:7:

Conditional execution

diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-gen-buildinfo-txt.dot.png Binary file doc/api/helium/target-sf-gen-buildinfo-txt.dot.png has changed diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-gen-buildinfo-txt.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/doc/api/helium/target-sf-gen-buildinfo-txt.html Thu Oct 08 19:36:20 2009 +0100 @@ -0,0 +1,207 @@ + + + + + + + + + + + + + + + + + Target sf-gen-buildinfo-txt + + + + + + + + + + + + + + + + + +

+ + + + + + + + + + + +

overview

deprecated

properties-table

index

help

+Helium API + +

+ prev + next

+ frames + no frames + + + + + +

+ + +

+ + + +

Target sf-gen-buildinfo-txt

+ +

Location

d:\maintools\sf-config\sf-platform\build.xml:27: +

+ +

Conditional execution

No conditions on target execution.

+ +

Description

+ + + + +

Property dependencies

+ + +

+ + + + + + + + + + + + + + + + +
Name Edit status
User editable properties
build.drive recommended
Internal properties
build.id discouraged
+

+ +

+ + +

Target dependencies

+ sf-gen-buildinfo-txt dependencies + + + + +

+ + +

Source code

+    <target name="sf-gen-buildinfo-txt">
+    <mkdir dir="${build.drive}/epoc32/data/"/> 
+    <delete file="${build.drive}/epoc32/data/BuildInfo.txt"/>
+    <echo file="${build.drive}/epoc32/data/BuildInfo.txt" append="true" message="DeviceFamily               100 ${line.separator}"/>
+    <echo file="${build.drive}/epoc32/data/BuildInfo.txt" append="true" message="DeviceFamilyRev            0x900 ${line.separator}"/>
+    <echo file="${build.drive}/epoc32/data/BuildInfo.txt" append="true" message="ManufacturerSoftwareBuild  ${build.id}_Symbian_OS_v${sf.spec.sbs.variant} ${line.separator}"/>
+  </target>
+

+ + +

+ + + + + + + + + + + + + +

+ + + + + + + + + + + +

overview

deprecated

properties-table

index

help

+Helium API + +

+ prev + next

+ frames + no frames + + + + + +

+ + + Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. License: http://www.eclipse.org/legal/epl-v10.html + + + + + diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-generate-source-spec.dot.png Binary file doc/api/helium/target-sf-generate-source-spec.dot.png has changed diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-generate-source-spec.html --- a/doc/api/helium/target-sf-generate-source-spec.html Tue Oct 06 17:31:14 2009 +0100 +++ b/doc/api/helium/target-sf-generate-source-spec.html Thu Oct 08 19:36:20 2009 +0100 @@ -82,7 +82,7 @@

Target sf-generate-source-spec

Location

D:\maintools\sf-config\common\build.xml:150: +

d:\maintools\sf-config\common\build.xml:157:

Conditional execution

@@ -141,7 +141,6 @@ style="border-style: none"/> - @@ -151,8 +150,7 @@

Source code

-    <target name="sf-generate-source-spec" depends="sf-parse-project-config">
-
+    <target name="sf-generate-source-spec">
         <!-- Generate the sources.csv if hg cache is activated -->
         <if><istrue value="${sf.spec.sourcesync.usecache}"/>
             <then>
diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-get-source.dot.png
Binary file doc/api/helium/target-sf-get-source.dot.png has changed
diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-get-source.html
--- a/doc/api/helium/target-sf-get-source.html	Tue Oct 06 17:31:14 2009 +0100
+++ b/doc/api/helium/target-sf-get-source.html	Thu Oct 08 19:36:20 2009 +0100
@@ -82,7 +82,7 @@
 Target sf-get-source
 
 Location
-    D:\maintools\sf-config\common\build.xml:416:  
+
    d:\maintools\sf-config\common\build.xml:426:  
 
 
 Conditional execution        
@@ -126,7 +126,6 @@
 
 
 
-
 
 
 
diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-getenv-tools.dot.png
Binary file doc/api/helium/target-sf-getenv-tools.dot.png has changed
diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-getenv-tools.html
--- a/doc/api/helium/target-sf-getenv-tools.html	Tue Oct 06 17:31:14 2009 +0100
+++ b/doc/api/helium/target-sf-getenv-tools.html	Thu Oct 08 19:36:20 2009 +0100
@@ -82,7 +82,7 @@
 Target sf-getenv-tools
 
 Location
-    D:\maintools\sf-config\common\build.xml:291:  
+
    d:\maintools\sf-config\common\build.xml:301:  
 
 
 Conditional execution        
diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-getenvs.dot.png
Binary file doc/api/helium/target-sf-getenvs.dot.png has changed
diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-getenvs.html
--- a/doc/api/helium/target-sf-getenvs.html	Tue Oct 06 17:31:14 2009 +0100
+++ b/doc/api/helium/target-sf-getenvs.html	Thu Oct 08 19:36:20 2009 +0100
@@ -82,7 +82,7 @@
 Target sf-getenvs
 
 Location
-    D:\maintools\sf-config\common\build.xml:257:  
+
    d:\maintools\sf-config\common\build.xml:267:  
 
 
 Conditional execution        
diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-intersect-dir.dot.png
Binary file doc/api/helium/target-sf-intersect-dir.dot.png has changed
diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-intersect-dir.html
--- a/doc/api/helium/target-sf-intersect-dir.html	Tue Oct 06 17:31:14 2009 +0100
+++ b/doc/api/helium/target-sf-intersect-dir.html	Thu Oct 08 19:36:20 2009 +0100
@@ -82,7 +82,7 @@
 Target sf-intersect-dir
 
 Location
-    D:\maintools\sf-config\common\build.xml:349:  
+
    d:\maintools\sf-config\common\build.xml:359:  
 
 
 Conditional execution        
diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-list-dir.dot.png
Binary file doc/api/helium/target-sf-list-dir.dot.png has changed
diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-list-dir.html
--- a/doc/api/helium/target-sf-list-dir.html	Tue Oct 06 17:31:14 2009 +0100
+++ b/doc/api/helium/target-sf-list-dir.html	Thu Oct 08 19:36:20 2009 +0100
@@ -82,7 +82,7 @@
 Target sf-list-dir
 
 Location
-    D:\maintools\sf-config\common\build.xml:313:  
+
    d:\maintools\sf-config\common\build.xml:323:  
 
 
 Conditional execution        
diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-make-junction.dot.png
Binary file doc/api/helium/target-sf-make-junction.dot.png has changed
diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-make-junction.html
--- a/doc/api/helium/target-sf-make-junction.html	Tue Oct 06 17:31:14 2009 +0100
+++ b/doc/api/helium/target-sf-make-junction.html	Thu Oct 08 19:36:20 2009 +0100
@@ -82,7 +82,7 @@
 Target sf-make-junction
 
 Location
-    D:\maintools\sf-config\common\build.test.xml:13:  
+
    d:\maintools\sf-config\common\build.test.xml:16:  
 
 
 Conditional execution        
diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-model-from-project.dot.png
Binary file doc/api/helium/target-sf-model-from-project.dot.png has changed
diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-model-from-project.html
--- a/doc/api/helium/target-sf-model-from-project.html	Tue Oct 06 17:31:14 2009 +0100
+++ b/doc/api/helium/target-sf-model-from-project.html	Thu Oct 08 19:36:20 2009 +0100
@@ -82,7 +82,7 @@
 Target sf-model-from-project
 
 Location
-    D:\maintools\sf-config\common\build.xml:396:  
+
    d:\maintools\sf-config\common\build.xml:406:  
 
 
 Conditional execution        
diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-os-compile.dot.png
Binary file doc/api/helium/target-sf-os-compile.dot.png has changed
diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-os-compile.html
--- a/doc/api/helium/target-sf-os-compile.html	Tue Oct 06 17:31:14 2009 +0100
+++ b/doc/api/helium/target-sf-os-compile.html	Thu Oct 08 19:36:20 2009 +0100
@@ -82,7 +82,7 @@
 Target sf-os-compile
 
 Location
-    D:\maintools\sf-config\sf-platform\build.xml:147:  
+
    d:\maintools\sf-config\sf-platform\build.xml:162:  
 
 
 Conditional execution        
@@ -279,7 +279,7 @@
 				</antcall>
 			</else>
 		</if>
-		<if><isset property="sf.os.compile.iterate"/>
+		<if><istrue value="${sf.os.compile.iterate}"/>
       <then>
         <for list="${sf.spec.sbs.config}" delimiter="," param="sf.spec.sbs.splitconfig">
           <sequential>
diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-package-binary.dot.png
Binary file doc/api/helium/target-sf-package-binary.dot.png has changed
diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-package-binary.html
--- a/doc/api/helium/target-sf-package-binary.html	Tue Oct 06 17:31:14 2009 +0100
+++ b/doc/api/helium/target-sf-package-binary.html	Thu Oct 08 19:36:20 2009 +0100
@@ -82,7 +82,7 @@
 Target sf-package-binary
 
 Location
-    D:\maintools\sf-config\common\build.postbuild.xml:189:  
+
    d:\maintools\sf-config\common\build.postbuild.xml:198:  
 
 
 Conditional execution        
@@ -149,10 +149,13 @@
 
 
-
-
-
-
+
+
+
+
+
+
+
 
 
 
@@ -199,6 +202,11 @@
                 <arg value="epoc32\release\armv5\"/>
             </exec>
         </parallel>
+        <!-- Generate release_metadata entries for the above zips -->
+        <antcall target="sf-zip-content">
+            <param name="zip.config.file" value="${sf.common.config.dir}/generated/zip.cfg.xml.ftl"/>
+            <param name="zip.target.name" value="bin-just-metadata"/>
+        </antcall>
     </target>

diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-package-postbuild-rnd.dot.png Binary file doc/api/helium/target-sf-package-postbuild-rnd.dot.png has changed diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-package-postbuild-rnd.html --- a/doc/api/helium/target-sf-package-postbuild-rnd.html Tue Oct 06 17:31:14 2009 +0100 +++ b/doc/api/helium/target-sf-package-postbuild-rnd.html Thu Oct 08 19:36:20 2009 +0100 @@ -82,7 +82,7 @@

Target sf-package-postbuild-rnd

Location

D:\maintools\sf-config\common\build.postbuild.xml:230: +

d:\maintools\sf-config\common\build.postbuild.xml:244:

Conditional execution

@@ -96,17 +96,6 @@

Target external Dependency

- - - - - - - -
Name
perl
-

Property dependencies

@@ -120,15 +109,9 @@ User editable properties - - build.driverecommended - Internal properties - - build.log.dirdiscouraged -

@@ -140,9 +123,11 @@ sf-package-postbuild-rnd dependencies

- - - + + + + +

@@ -151,19 +136,10 @@

Source code

     <target name="sf-package-postbuild-rnd" depends="sf-preprocess-package-config">
-
-        <!-- zip any RnD _includefile.txt files generated during source packaging -->
-        <exec executable="perl" dir="${build.drive}/" failonerror="false" output="${build.log.dir}/zip_postbuild.log">
-            <arg value="${sf.common.config.dir}/tools/zip_includefiles.pl"/>
-        </exec>
-        <!-- cleanup my moving includefiles to logs and zips to zips\release -->
-        <move todir="${build.log.dir}">
-            <fileset dir="${build.drive}"><include name="*_includefile.txt"/></fileset>
-        </move>
-        <move todir="${build.drive}/output/zips/release">
-            <fileset dir="${build.drive}"><include name="bin*.zip"/></fileset>
-        </move>
-        <!-- TODO: merge with release_metadata.xml ? -->
+        <antcall target="sf-zip-content">
+            <param name="zip.config.file" value="${sf.common.config.dir}/generated/zip.cfg.xml.ftl"/>
+            <param name="zip.target.name" value="rnd-postbuild"/>
+        </antcall>
     </target>

diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-package-source.dot.png Binary file doc/api/helium/target-sf-package-source.dot.png has changed diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-package-source.html --- a/doc/api/helium/target-sf-package-source.html Tue Oct 06 17:31:14 2009 +0100 +++ b/doc/api/helium/target-sf-package-source.html Thu Oct 08 19:36:20 2009 +0100 @@ -82,7 +82,7 @@

Target sf-package-source

Location

D:\maintools\sf-config\common\build.xml:470: +

d:\maintools\sf-config\common\build.xml:470:

Conditional execution

@@ -136,16 +136,30 @@

Source code

     <target name="sf-package-source" depends="sf-preprocess-package-config">
-        <!-- Firstly zip up src & rnd by package -->
+        <!-- Firstly zip up rnd by package -->
+        <antcall target="sf-zip-content">
+            <param name="zip.config.file" value="${sf.common.config.dir}/generated/zip.cfg.xml.ftl"/>
+            <param name="zip.target.name" value="rnd"/>
+        </antcall>
         <antcall target="sf-zip-content">
             <param name="zip.config.file" value="${sf.common.config.dir}/generated/zip.cfg.xml.ftl"/>
-            <param name="zip.target.name" value="src"/>
+            <param name="zip.target.name" value="rnd-internal"/>
         </antcall>
-        <!-- Then zip up src zips by layer -->
-        <antcall target="sf-zip-content">
-            <param name="zip.config.file" value="${sf.common.config.dir}/generated/zip.cfg.xml.ftl"/>
-            <param name="zip.target.name" value="src-by-layer"/>
-        </antcall>
+        <if>
+            <istrue value="${sf.spec.package.src.enable}"/>
+            <then>
+                <echo message="INFO Packaging Source Repos"/>
+                <antcall target="sf-zip-content">
+                    <param name="zip.config.file" value="${sf.common.config.dir}/generated/zip.cfg.xml.ftl"/>
+                    <param name="zip.target.name" value="src"/>
+                </antcall>
+                <!-- Then zip up src zips by layer -->
+                <antcall target="sf-zip-content">
+                    <param name="zip.config.file" value="${sf.common.config.dir}/generated/zip.cfg.xml.ftl"/>
+                    <param name="zip.target.name" value="src-by-layer"/>
+                </antcall>
+            </then>
+        </if>
     </target>

diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-package-tools.dot.png Binary file doc/api/helium/target-sf-package-tools.dot.png has changed diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-package-tools.html --- a/doc/api/helium/target-sf-package-tools.html Tue Oct 06 17:31:14 2009 +0100 +++ b/doc/api/helium/target-sf-package-tools.html Thu Oct 08 19:36:20 2009 +0100 @@ -82,7 +82,7 @@

Target sf-package-tools

Location

D:\maintools\sf-config\common\build.postbuild.xml:246: +

d:\maintools\sf-config\common\build.postbuild.xml:251:

Conditional execution

@@ -143,9 +143,12 @@ sf-package-tools dependencies

- - - + + + + + +

@@ -154,15 +157,17 @@

Source code

     <target name="sf-package-tools" depends="sf-preprocess-package-config">
-        <echo message="Packaging epoc32 tools - Temporary method"/>
         <exec executable="7za" dir="${build.drive}" output="${build.log.dir}/zip_${build.id}_tools_epoc32.log">
             <arg value="a"/>
             <arg value="-tzip"/>
             <arg value="-x@${build.log.dir}/rnd_excludefile.txt"/>
-<!--            <arg value="-x@${build.log.dir}/*_includefile.txt"/> -->
             <arg value="${build.drive}/output/zips/release/tools_epoc.zip"/> 
             <arg value="epoc32/tools"/>
         </exec>
+        <antcall target="sf-zip-content">
+            <param name="zip.config.file" value="${sf.common.config.dir}/generated/zip.cfg.xml.ftl"/>
+            <param name="zip.target.name" value="tools"/>
+        </antcall>
     </target>

diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-package-validate.dot.png Binary file doc/api/helium/target-sf-package-validate.dot.png has changed diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-package-validate.html --- a/doc/api/helium/target-sf-package-validate.html Tue Oct 06 17:31:14 2009 +0100 +++ b/doc/api/helium/target-sf-package-validate.html Thu Oct 08 19:36:20 2009 +0100 @@ -82,7 +82,7 @@

Target sf-package-validate

Location

D:\maintools\sf-config\common\build.postbuild.xml:258: +

d:\maintools\sf-config\common\build.postbuild.xml:265:

Conditional execution

@@ -140,8 +140,9 @@ sf-package-validate dependencies

- - + + +

diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-platform-bootstrap-gt.dot.png Binary file doc/api/helium/target-sf-platform-bootstrap-gt.dot.png has changed diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-platform-bootstrap-gt.html --- a/doc/api/helium/target-sf-platform-bootstrap-gt.html Tue Oct 06 17:31:14 2009 +0100 +++ b/doc/api/helium/target-sf-platform-bootstrap-gt.html Thu Oct 08 19:36:20 2009 +0100 @@ -82,7 +82,7 @@

Target sf-platform-bootstrap-gt

Location

D:\maintools\sf-config\sf-platform\build.xml:27: +

d:\maintools\sf-config\sf-platform\build.xml:35:

Conditional execution

@@ -138,8 +138,15 @@ <target name="sf-platform-bootstrap-gt"> <echo>[SF-platform-bootstrap-gt]</echo>  - <copy file="${build.drive}/${sf.spec.bldmefirst.gt.hrh}" tofile="${build.drive}/epoc32/include/variant/Symbian_OS.hrh" failonerror="true" verbose="true"/> + <copy todir="${build.drive}/epoc32/include/variant/" failonerror="true" verbose="true"> + <fileset dir="${build.drive}/${sf.spec.bldmefirst.gt.hrh}" includes="*.hrh"/> + </copy> <copy file="${build.drive}/${sf.spec.bldmefirst.gt.variant}" tofile="${build.drive}/epoc32/tools/variant/variant.cfg" failonerror="true" verbose="true" preservelastmodified="true"/> + <if><isset property="sf.spec.bldmefirst.gt.hrh.os"/> + <then> + <copy file="${build.drive}/${sf.spec.bldmefirst.gt.hrh.os}" tofile="${build.drive}/epoc32/include/variant/Symbian_OS.hrh" failonerror="false" overwrite="true" verbose="true" preservelastmodified="true"/> + </then> + </if> </target> diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-platform-bootstrap-s60.dot.png Binary file doc/api/helium/target-sf-platform-bootstrap-s60.dot.png has changed diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-platform-bootstrap-s60.html --- a/doc/api/helium/target-sf-platform-bootstrap-s60.html Tue Oct 06 17:31:14 2009 +0100 +++ b/doc/api/helium/target-sf-platform-bootstrap-s60.html Thu Oct 08 19:36:20 2009 +0100 @@ -82,7 +82,7 @@

Target sf-platform-bootstrap-s60

Location

D:\maintools\sf-config\sf-platform\build.xml:34: +

d:\maintools\sf-config\sf-platform\build.xml:49:

Conditional execution

diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-platform-bootstrap.dot.png Binary file doc/api/helium/target-sf-platform-bootstrap.dot.png has changed diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-platform-bootstrap.html --- a/doc/api/helium/target-sf-platform-bootstrap.html Tue Oct 06 17:31:14 2009 +0100 +++ b/doc/api/helium/target-sf-platform-bootstrap.html Thu Oct 08 19:36:20 2009 +0100 @@ -82,7 +82,7 @@

Target sf-platform-bootstrap

Location

D:\maintools\sf-config\sf-platform\build.xml:25: +

d:\maintools\sf-config\sf-platform\build.xml:25:

Conditional execution

@@ -123,10 +123,11 @@ sf-platform-bootstrap dependencies

- - - - + + + + +

@@ -134,7 +135,7 @@

Source code

-    <target name="sf-platform-bootstrap" depends="sf-platform-bootstrap-gt,sf-platform-bootstrap-s60"/>
+    <target name="sf-platform-bootstrap" depends="sf-gen-buildinfo-txt,sf-platform-bootstrap-gt,sf-platform-bootstrap-s60"/>

diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-postbuild.dot.png Binary file doc/api/helium/target-sf-postbuild.dot.png has changed diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-postbuild.html --- a/doc/api/helium/target-sf-postbuild.html Tue Oct 06 17:31:14 2009 +0100 +++ b/doc/api/helium/target-sf-postbuild.html Thu Oct 08 19:36:20 2009 +0100 @@ -82,7 +82,7 @@

Target sf-postbuild

Location

D:\maintools\sf-config\common\build.postbuild.xml:3: +

d:\maintools\sf-config\common\build.postbuild.xml:3:

Conditional execution

@@ -123,39 +123,50 @@ sf-postbuild dependencies

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

@@ -166,38 +177,50 @@ <target name="sf-postbuild"> <echo>[SF-POSTBUILD]</echo> <parallel> -  - <if> - <istrue value="${sf.spec.tagafterbuild.enable}"/> - <then> - <echo message="Apply tag to the source code used in this build"/> - <runtarget target="sf-tag-hg-code"/> - </then> - </if> +  + <if> + <istrue value="${sf.spec.tagafterbuild.enable}"/> + <then> + <echo message="Apply tag to the source code used in this build"/> + <runtarget target="sf-tag-hg-code"/> + </then> + </if> + +  + <if> + <istrue value="${sf.spec.md5.enable}"/> + <then> + <echo message="INFO Creating MD5s"/> + <runtarget target="sf-run-evalid"/> + </then> + </if> + +  + <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-run-analysis"/> - <if> - <istrue value="${sf.spec.md5.enable}"/> - <then> - <echo message="INFO Creating MD5s"/> - <runtarget target="sf-run-evalid"/> - </then> - </if> - <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-run-analysis"/> - + <if> + <istrue value="${sf.spec.publish.enable}"/> + <then> +  + <runtarget target="sf-compare-to-baseline"/> + </then> + </if> </parallel> +  <if><istrue value="${sf.spec.test.sendpkg.enable}"/> <then> <runtarget target="sf-build-smoketestpkg"/> @@ -205,17 +228,17 @@ </then> </if> - - <runtarget target="sf-zip-logs"/> - -  +  <if><istrue value="${sf.spec.bccheck.enable}"/> <then> <runtarget target="sf-bc-check"/> </then> </if> -  +  + <runtarget target="sf-zip-logs"/> + +  <if> <istrue value="${sf.spec.publish.enable}"/> <then> diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-prebuild-announce.dot.png Binary file doc/api/helium/target-sf-prebuild-announce.dot.png has changed diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-prebuild-announce.html --- a/doc/api/helium/target-sf-prebuild-announce.html Tue Oct 06 17:31:14 2009 +0100 +++ b/doc/api/helium/target-sf-prebuild-announce.html Thu Oct 08 19:36:20 2009 +0100 @@ -82,7 +82,7 @@

Target sf-prebuild-announce

Location

D:\maintools\sf-config\common\build.xml:202: +

d:\maintools\sf-config\common\build.xml:208:

Conditional execution

diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-prebuild-noprep.dot.png Binary file doc/api/helium/target-sf-prebuild-noprep.dot.png has changed diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-prebuild-noprep.html --- a/doc/api/helium/target-sf-prebuild-noprep.html Tue Oct 06 17:31:14 2009 +0100 +++ b/doc/api/helium/target-sf-prebuild-noprep.html Thu Oct 08 19:36:20 2009 +0100 @@ -82,7 +82,7 @@

Target sf-prebuild-noprep

Location

D:\maintools\sf-config\common\build.xml:200: +

d:\maintools\sf-config\common\build.xml:206:

Conditional execution

@@ -123,26 +123,26 @@ sf-prebuild-noprep dependencies

- - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + +

@@ -150,7 +150,7 @@

Source code

-    <target name="sf-prebuild-noprep" depends="sf-prebuild-announce,sf-diamonds-tag-build,sf-record-proj-conf-bom,sf-getenvs,sf-syncsource,sf-diamondize-bom"/>
+    <target name="sf-prebuild-noprep" depends="sf-prebuild-announce,sf-diamonds-connect,sf-diamonds-tag-build,sf-record-proj-conf-bom,sf-getenvs,sf-syncsource,sf-diamondize-bom"/>

diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-prebuild.dot.png Binary file doc/api/helium/target-sf-prebuild.dot.png has changed diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-prebuild.html --- a/doc/api/helium/target-sf-prebuild.html Tue Oct 06 17:31:14 2009 +0100 +++ b/doc/api/helium/target-sf-prebuild.html Thu Oct 08 19:36:20 2009 +0100 @@ -82,7 +82,7 @@

Target sf-prebuild

Location

D:\maintools\sf-config\common\build.xml:199: +

d:\maintools\sf-config\common\build.xml:205:

Conditional execution

@@ -123,28 +123,31 @@ sf-prebuild dependencies

- - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + +

diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-prep.dot.png Binary file doc/api/helium/target-sf-prep.dot.png has changed diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-prep.html --- a/doc/api/helium/target-sf-prep.html Tue Oct 06 17:31:14 2009 +0100 +++ b/doc/api/helium/target-sf-prep.html Thu Oct 08 19:36:20 2009 +0100 @@ -82,7 +82,7 @@

Target sf-prep

Location

D:\maintools\sf-config\common\build.xml:72: +

d:\maintools\sf-config\common\build.xml:75:

Conditional execution

@@ -131,9 +131,8 @@ - + -

@@ -158,14 +157,7 @@ <tempfile property="prep.dynamic.config" suffix="ant.xml" destdir="${temp.build.dir}"/> - <if> - <not><isset property="sf.suppress.buildenv.check"/></not> - <then> - <echo message="Checking build Environment. To suppress this check set property sf.suppress.buildenv.check to any value"/> - <runtarget target="sf-check-env"/> - </then> - </if> - + <runtarget target="sf-check-env"/> </target> diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-preprocess-package-config.dot.png Binary file doc/api/helium/target-sf-preprocess-package-config.dot.png has changed diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-preprocess-package-config.html --- a/doc/api/helium/target-sf-preprocess-package-config.html Tue Oct 06 17:31:14 2009 +0100 +++ b/doc/api/helium/target-sf-preprocess-package-config.html Thu Oct 08 19:36:20 2009 +0100 @@ -82,7 +82,7 @@

Target sf-preprocess-package-config

Location

D:\maintools\sf-config\common\build.xml:441: +

d:\maintools\sf-config\common\build.xml:446:

Conditional execution

@@ -105,6 +105,9 @@ perl + + perl +

@@ -154,24 +157,19 @@

     <target name="sf-preprocess-package-config">
         <mkdir dir="${sf.common.config.dir}/generated"/>
-            <if><istrue value="${sf.spec.package.src.enable}"/>
-            <then>
-                <echo message="INFO Packaging Source Repos"/>
-                <property name="sf-preprocess-package-config.arg" value=""/>
-            </then>
-            <else>
-                <echo message="INFO Packaging: Ignoring Source Repos"/>
-                <property name="sf-preprocess-package-config.arg" value="--nosource"/>
-            </else>
-            </if>
-
         <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="${sf.common.config.dir}/generated/zip.cfg.xml.ftl"/>
             <arg value="${build.log.dir}/rnd_excludefile.txt"/>
-            <arg value="${sf-preprocess-package-config.arg}"/>
+        </exec>
+        <exec executable="perl" failonerror="false" output="${build.log.dir}/summary/PreprocessPackageConfig_BRAG.xml" logError="true">
+            <arg value="${sf.common.config.dir}/tools/brag/logToBRAG.pl"/>
+            <arg value="--phase=Prebuild"/>
+            <arg value="--step=Preprocess package config"/>
+            <arg value="--rules=${sf.common.config.dir}/tools/brag/rules.PreprocessPackageConfig.tsv"/>
+            <arg value="${build.log.dir}/zipconfig.log"/>
         </exec>
     </target>

diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-publish.dot.png Binary file doc/api/helium/target-sf-publish.dot.png has changed diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-publish.html --- a/doc/api/helium/target-sf-publish.html Tue Oct 06 17:31:14 2009 +0100 +++ b/doc/api/helium/target-sf-publish.html Thu Oct 08 19:36:20 2009 +0100 @@ -82,7 +82,7 @@

Target sf-publish

Location

D:\maintools\sf-config\common\build.postbuild.xml:504: +

d:\maintools\sf-config\common\build.postbuild.xml:622:

Conditional execution

@@ -116,7 +116,7 @@ Internal properties - build.log.dirdiscouraged + build.output.dirnever

@@ -129,9 +129,12 @@ sf-publish dependencies

- - - + + + + + +

@@ -141,7 +144,7 @@

     <target name="sf-publish" depends="prep-publish">
         <copy todir="${publish.dir}" preservelastmodified="true" failonerror="false">
-           <fileset dir="${build.log.dir}"><include name="*.zip"/></fileset>
+           <fileset dir="${build.output.dir}/zips/release/"><include name="build_*.zip"/></fileset>
         </copy>
     </target>

diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-record-proj-conf-bom.dot.png Binary file doc/api/helium/target-sf-record-proj-conf-bom.dot.png has changed diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-record-proj-conf-bom.html --- a/doc/api/helium/target-sf-record-proj-conf-bom.html Tue Oct 06 17:31:14 2009 +0100 +++ b/doc/api/helium/target-sf-record-proj-conf-bom.html Thu Oct 08 19:36:20 2009 +0100 @@ -82,7 +82,7 @@

Target sf-record-proj-conf-bom

Location

D:\maintools\sf-config\common\build.xml:221: +

d:\maintools\sf-config\common\build.xml:239:

Conditional execution

@@ -114,12 +114,6 @@ hg - - hg - - - hg -

@@ -152,8 +146,9 @@ sf-record-proj-conf-bom dependencies

- - + + +

@@ -170,31 +165,23 @@ <arg value="showconfig"/> <arg value="paths.default"/> </exec> - <exec executable="hg" dir="${sf.config.dir}" outputproperty="sf.job.bom.config.rev"> - <arg value="identify"/> - <arg value="-n"/> - </exec> + <propertyregex input="${sf.job.bom.config.repo}" regexp="\\" replace="/" global="true" property="sf.job.bom.config.repo" override="true"/> <exec executable="hg" dir="${sf.config.dir}" outputproperty="sf.job.bom.config.checksum"> <arg value="identify"/> <arg value="-i"/> </exec> - <echo message="dir ${sf.config.dir} : revision ${sf.job.bom.config.rev}:${sf.job.bom.config.checksum}"/> - <echo message="${sf.job.bom.config.repo},sf-config,${sf.job.bom.config.rev}:${sf.job.bom.config.checksum}" file="${build.drive}/output/logs/BOM/config.csv"/> + <echo message="${sf.job.bom.config.repo},sf-config,${sf.job.bom.config.checksum}" file="${build.drive}/output/logs/BOM/config.csv"/> <exec executable="hg" dir="${sf.project.location}" outputproperty="sf.job.bom.project.repo"> <arg value="showconfig"/> <arg value="paths.default"/> </exec> - <exec executable="hg" dir="${sf.project.location}" outputproperty="sf.job.bom.project.rev"> - <arg value="identify"/> - <arg value="-n"/> - </exec> + <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="dir ${sf.project.location} : revision ${sf.job.bom.project.rev}:${sf.job.bom.project.checksum}"/> - <echo message="${sf.job.bom.project.repo},build/config,${sf.job.bom.project.rev}:${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> diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-run-analysis-ant.dot.png Binary file doc/api/helium/target-sf-run-analysis-ant.dot.png has changed diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-run-analysis-ant.html --- a/doc/api/helium/target-sf-run-analysis-ant.html Tue Oct 06 17:31:14 2009 +0100 +++ b/doc/api/helium/target-sf-run-analysis-ant.html Thu Oct 08 19:36:20 2009 +0100 @@ -82,7 +82,7 @@

Target sf-run-analysis-ant

Location

D:\maintools\sf-config\common\build.postbuild.xml:286: +

d:\maintools\sf-config\common\build.postbuild.xml:295:

Conditional execution

diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-run-analysis-diamonds.dot.png Binary file doc/api/helium/target-sf-run-analysis-diamonds.dot.png has changed diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-run-analysis-diamonds.html --- a/doc/api/helium/target-sf-run-analysis-diamonds.html Tue Oct 06 17:31:14 2009 +0100 +++ b/doc/api/helium/target-sf-run-analysis-diamonds.html Thu Oct 08 19:36:20 2009 +0100 @@ -82,7 +82,7 @@

Target sf-run-analysis-diamonds

Location

D:\maintools\sf-config\common\build.postbuild.xml:469: +

d:\maintools\sf-config\common\build.postbuild.xml:487:

Conditional execution

@@ -96,6 +96,17 @@

Target external Dependency

+ + + + + + + +
Name
python
+

Property dependencies

@@ -118,6 +129,12 @@ build.log.dirdiscouraged + + diamonds.build.idnever + + + diamonds.hostdiscouraged +

@@ -146,6 +163,16 @@ files: csv(${build.drive}/output/logs/analysis/tmp_yarp_files.csv,{separator:',',headers:[name,path,localpath]}) </data> </fmpp> +  + <exec executable="python"> + <arg value="${sf.common.config.dir}/tools/brag/send_xml_to_diamonds.py"/> + <arg value="-s"/> + <arg value="${diamonds.host}"/> + <arg value="-u"/> + <arg value="${diamonds.build.id}"/> + <arg value="-f"/> + <arg value="${build.log.dir}/sf-run-analysis.xml"/> + </exec> </target> diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-run-analysis-list.dot.png Binary file doc/api/helium/target-sf-run-analysis-list.dot.png has changed diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-run-analysis-list.html --- a/doc/api/helium/target-sf-run-analysis-list.html Tue Oct 06 17:31:14 2009 +0100 +++ b/doc/api/helium/target-sf-run-analysis-list.html Thu Oct 08 19:36:20 2009 +0100 @@ -82,7 +82,7 @@

Target sf-run-analysis-list

Location

D:\maintools\sf-config\common\build.postbuild.xml:426: +

d:\maintools\sf-config\common\build.postbuild.xml:443:

Conditional execution

diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-run-analysis-missing-files.dot.png Binary file doc/api/helium/target-sf-run-analysis-missing-files.dot.png has changed diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-run-analysis-missing-files.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/doc/api/helium/target-sf-run-analysis-missing-files.html Thu Oct 08 19:36:20 2009 +0100 @@ -0,0 +1,215 @@ + + + + + + + + + + + + + + + + + Target sf-run-analysis-missing-files + + + + + + + + + + + + + + + + + +

+ + + + + + + + + + + +

overview

deprecated

properties-table

index

help

+Helium API + +

+ prev + next

+ frames + no frames + + + + + +

+ + +

+ + + +

Target sf-run-analysis-missing-files

+ +

Location

d:\maintools\sf-config\common\build.postbuild.xml:629: +

+ +

Conditional execution

Target is run if property defined: sf.spec.splitbuild

+ +

Description

TODO: Make this work for package builds once we have sysmodel story worked out

+ + + + +

Property dependencies

+ + +

+ + + + + + + + + + +
Name Edit status
User editable properties
Internal properties
+

+ +

+ + +

Target dependencies

+ sf-run-analysis-missing-files dependencies + + + + + + +

+ + +

Source code

+    <target name="sf-run-analysis-missing-files" if="sf.spec.splitbuild">
+    <!-- splitbuild is only set for Platform builds -->
+       <if><istrue value="${sf.spec.splitbuild}"/>
+       <then>
+            <if><istrue value="${sf.spec.os.skipbuild}"/>
+                <then><echo message="Skipping OS file check"/></then>
+                <else><runtarget target="sf-check-missing-os-files"/></else>
+            </if>
+
+            <if><istrue value="${sf.spec.s60.skipbuild}"/>
+                <then><echo message="Skipping S60 file check"/></then>
+                <else><runtarget target="sf-check-missing-s60-files"/></else>
+            </if>
+       </then>
+       <else>
+            <runtarget target="sf-check-missing-os-files"/>
+       </else>
+    </if>
+    </target>
+

+ + +

+ + + + + + + + + + + + + +

+ + + + + + + + + + + +

overview

deprecated

properties-table

index

help

+Helium API + +

+ prev + next

+ frames + no frames + + + + + +

+ + + Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. License: http://www.eclipse.org/legal/epl-v10.html + + + + + diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-run-analysis-raptor.dot.png Binary file doc/api/helium/target-sf-run-analysis-raptor.dot.png has changed diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-run-analysis-raptor.html --- a/doc/api/helium/target-sf-run-analysis-raptor.html Tue Oct 06 17:31:14 2009 +0100 +++ b/doc/api/helium/target-sf-run-analysis-raptor.html Thu Oct 08 19:36:20 2009 +0100 @@ -82,7 +82,7 @@

Target sf-run-analysis-raptor

Location

D:\maintools\sf-config\common\build.postbuild.xml:294: +

d:\maintools\sf-config\common\build.postbuild.xml:303:

Conditional execution

@@ -117,6 +117,9 @@ perl + + perl +

@@ -163,6 +166,7 @@

     <target name="sf-run-analysis-raptor">            
       <echo message="Preprocessing *_compile.log files"/>
+      <delete file="${build.log.dir}/analysis/${build.id}_preprocess.log"/>
       <for param="logfile">
         <path>
           <fileset dir="${build.log.dir}">
@@ -171,11 +175,12 @@
           </fileset>
         </path>
         <sequential>
-		  <propertyregex override="yes" property="preprocessedlogfile" input="@{logfile}" regexp=".*[\\/](.*)_compile\.log" replace="\1_compile_preprocessed.log"/>
-	      <echo message="Preprocessing @{logfile}..."/>
-          <exec executable="perl" dir="${sf.common.config.dir}/tools/raptor" failonerror="false" input="@{logfile}" output="${build.log.dir}/analysis/${preprocessedlogfile}" error="${build.log.dir}/analysis/${build.id}_preprocess.log" append="true">
+          <propertyregex override="yes" property="preprocessedlogfile" input="@{logfile}" regexp=".*[\\/](.*)_compile\.log" replace="\1_compile_preprocessed.log"/>
+          <echo message="Preprocessing @{logfile}..."/>
+          <exec executable="perl" dir="${sf.common.config.dir}/tools/raptor" failonerror="false" input="@{logfile}" output="${build.log.dir}/analysis/${preprocessedlogfile}" errorProperty="@{logfile}">
             <arg value="${sf.common.config.dir}/tools/raptor/preprocess_log.pl"/>
           </exec>
+	  <echo file="${build.log.dir}/analysis/${build.id}_preprocess.log" append="true" message="${@{logfile}}${line.separator}"/>
         </sequential>
       </for>
       
@@ -188,7 +193,6 @@
         </path>
         <sequential>
           <echo message="Extracting whatlog info from @{whatlogfile}..."/>
-          <echo message="Exec: [${sf.common.config.dir}/tools/raptor] perl ${sf.common.config.dir}/tools/raptor/parse.pl --releaseable --log=@{whatlogfile} --basedir=${build.log.dir} --append"/>
           <exec executable="perl" dir="${sf.common.config.dir}/tools/raptor" failonerror="false" output="${build.log.dir}/analysis/${build.id}_whatlog.log" append="true">
             <arg value="${sf.common.config.dir}/tools/raptor/parse.pl"/>
             <arg value="--releaseable"/>
@@ -209,7 +213,6 @@
         <sequential>
           <echo message="Extracting error info from @{raptorlogfile}..."/>
           <propertyregex override="yes" property="raptorconfig" input="@{raptorlogfile}" regexp=".*[\\/].*__(.*)\.whatlog_(single|multiple)_thread.*" replace="\1" casesensitive="false" defaultValue="noconfig"/>
-          <echo message="Exec: [${sf.common.config.dir}/tools/raptor] perl ${sf.common.config.dir}/tools/raptor/parse.pl --error --warning --unreciped --recipe --config=${raptorconfig} --log=@{raptorlogfile} --basedir=${build.log.dir}/raptorbits --append"/>
           <exec executable="perl" dir="${sf.common.config.dir}/tools/raptor" failonerror="false" output="${build.log.dir}/analysis/${build.id}_raptorparse.log" append="true">
             <arg value="${sf.common.config.dir}/tools/raptor/parse.pl"/>
             <arg value="--error"/>
@@ -219,12 +222,11 @@
             <arg value="--config=${raptorconfig}"/>
             <arg value="--log=@{raptorlogfile}"/>
             <arg value="--basedir=${build.log.dir}/raptorbits"/>
-            <arg value="--append"/>
           </exec>
         </sequential>
       </for>
       
-      <echo message="Exec: [${sf.common.config.dir}/tools/raptor] perl ${sf.common.config.dir}/tools/raptor/summarize.pl --raptorbitsdir=${build.log.dir}/raptorbits --outputdir=${build.log.dir}"/>
+      <echo message="Summarizing Raptor data"/>
       <exec executable="perl" dir="${sf.common.config.dir}/tools/raptor" failonerror="false" output="${build.log.dir}/analysis/${build.id}_raptorparse.log" append="true">
         <arg value="${sf.common.config.dir}/tools/raptor/summarize.pl"/>
         <arg value="--raptorbitsdir=${build.log.dir}/raptorbits"/>
@@ -244,6 +246,15 @@
           </exec>
         </sequential>
       </for>
+
+      <!-- Cook the raptor analysis further to produce something in the right format for the BRAG system -->
+      <exec executable="perl" output="${build.log.dir}/summary/Raptor_BRAG.xml" logError="yes">
+        <arg value="${sf.common.config.dir}/tools/brag/raptorToBRAG.pl"/>
+        <arg value="--raptorsummary"/>
+        <arg value="${build.log.dir}/raptorbits/summary.csv"/>
+      </exec>
+      <!-- And copy the XSL so the output can be transformed by a browser -->
+      <copy file="${sf.common.config.dir}/tools/brag/brag.xsl" toDir="${build.log.dir}/summary/"/>
     </target>

diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-run-analysis-whatlog-collisons.dot.png Binary file doc/api/helium/target-sf-run-analysis-whatlog-collisons.dot.png has changed diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-run-analysis-whatlog-collisons.html --- a/doc/api/helium/target-sf-run-analysis-whatlog-collisons.html Tue Oct 06 17:31:14 2009 +0100 +++ b/doc/api/helium/target-sf-run-analysis-whatlog-collisons.html Thu Oct 08 19:36:20 2009 +0100 @@ -82,7 +82,7 @@

Target sf-run-analysis-whatlog-collisons

Location

D:\maintools\sf-config\common\build.postbuild.xml:461: +

d:\maintools\sf-config\common\build.postbuild.xml:479:

Conditional execution

diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-run-analysis-whatlog-merge.dot.png Binary file doc/api/helium/target-sf-run-analysis-whatlog-merge.dot.png has changed diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-run-analysis-whatlog-merge.html --- a/doc/api/helium/target-sf-run-analysis-whatlog-merge.html Tue Oct 06 17:31:14 2009 +0100 +++ b/doc/api/helium/target-sf-run-analysis-whatlog-merge.html Thu Oct 08 19:36:20 2009 +0100 @@ -82,7 +82,7 @@

Target sf-run-analysis-whatlog-merge

Location

D:\maintools\sf-config\common\build.postbuild.xml:442: +

d:\maintools\sf-config\common\build.postbuild.xml:459:

Conditional execution

diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-run-analysis-whatlog-package.dot.png Binary file doc/api/helium/target-sf-run-analysis-whatlog-package.dot.png has changed diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-run-analysis-whatlog-package.html --- a/doc/api/helium/target-sf-run-analysis-whatlog-package.html Tue Oct 06 17:31:14 2009 +0100 +++ b/doc/api/helium/target-sf-run-analysis-whatlog-package.html Thu Oct 08 19:36:20 2009 +0100 @@ -82,7 +82,7 @@

Target sf-run-analysis-whatlog-package

Location

D:\maintools\sf-config\common\build.postbuild.xml:452: +

d:\maintools\sf-config\common\build.postbuild.xml:469:

Conditional execution

@@ -155,6 +155,7 @@ <arg value="${sf.spec.sourcesync.sourcespecdir}/${sf.spec.sourcesync.sourcespecfile}"/> <arg value="${build.id}_what_results.csv_results.csv"/> <arg value="${sf.project.location}/sysdefs/system_model_os.xml"/> + <arg value="${sf.project.location}/sysdefs/system_model_s60.xml"/> </exec> </target> diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-run-analysis-whatlog-summary.dot.png Binary file doc/api/helium/target-sf-run-analysis-whatlog-summary.dot.png has changed diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-run-analysis-whatlog-summary.html --- a/doc/api/helium/target-sf-run-analysis-whatlog-summary.html Tue Oct 06 17:31:14 2009 +0100 +++ b/doc/api/helium/target-sf-run-analysis-whatlog-summary.html Thu Oct 08 19:36:20 2009 +0100 @@ -82,7 +82,7 @@

Target sf-run-analysis-whatlog-summary

Location

D:\maintools\sf-config\common\build.postbuild.xml:412: +

d:\maintools\sf-config\common\build.postbuild.xml:429:

Conditional execution

diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-run-analysis-whatlog.dot.png Binary file doc/api/helium/target-sf-run-analysis-whatlog.dot.png has changed diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-run-analysis-whatlog.html --- a/doc/api/helium/target-sf-run-analysis-whatlog.html Tue Oct 06 17:31:14 2009 +0100 +++ b/doc/api/helium/target-sf-run-analysis-whatlog.html Thu Oct 08 19:36:20 2009 +0100 @@ -82,7 +82,7 @@

Target sf-run-analysis-whatlog

Location

D:\maintools\sf-config\common\build.postbuild.xml:434: +

d:\maintools\sf-config\common\build.postbuild.xml:451:

Conditional execution

diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-run-analysis-yarp.dot.png Binary file doc/api/helium/target-sf-run-analysis-yarp.dot.png has changed diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-run-analysis-yarp.html --- a/doc/api/helium/target-sf-run-analysis-yarp.html Tue Oct 06 17:31:14 2009 +0100 +++ b/doc/api/helium/target-sf-run-analysis-yarp.html Thu Oct 08 19:36:20 2009 +0100 @@ -82,7 +82,7 @@

Target sf-run-analysis-yarp

Location

D:\maintools\sf-config\common\build.postbuild.xml:379: +

d:\maintools\sf-config\common\build.postbuild.xml:396:

Conditional execution

diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-run-analysis.dot.png Binary file doc/api/helium/target-sf-run-analysis.dot.png has changed diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-run-analysis.html --- a/doc/api/helium/target-sf-run-analysis.html Tue Oct 06 17:31:14 2009 +0100 +++ b/doc/api/helium/target-sf-run-analysis.html Thu Oct 08 19:36:20 2009 +0100 @@ -82,7 +82,7 @@

Target sf-run-analysis

Location

D:\maintools\sf-config\common\build.postbuild.xml:270: +

d:\maintools\sf-config\common\build.postbuild.xml:277:

Conditional execution

@@ -126,18 +126,22 @@ sf-run-analysis dependencies

- + - - - - - - - + + + + + + + + + + +

@@ -152,13 +156,15 @@ <runtarget target="sf-run-analysis-raptor"/> <runtarget target="sf-run-analysis-yarp"/> <runtarget target="sf-run-analysis-whatlog-summary"/> + <runtarget target="sf-run-analysis-missing-files"/> </parallel> <if> <istrue value="${sf.spec.publish.enable}"/> <then> <runtarget target="sf-run-analysis-diamonds"/> </then> - </if> + </if> + <runtarget target="sf-brag-to-diamonds"/> </target> diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-run-evalid.dot.png Binary file doc/api/helium/target-sf-run-evalid.dot.png has changed diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-run-evalid.html --- a/doc/api/helium/target-sf-run-evalid.html Tue Oct 06 17:31:14 2009 +0100 +++ b/doc/api/helium/target-sf-run-evalid.html Thu Oct 08 19:36:20 2009 +0100 @@ -82,7 +82,7 @@

Target sf-run-evalid

Location

D:\maintools\sf-config\common\build.postbuild.xml:77: +

d:\maintools\sf-config\common\build.postbuild.xml:89:

Conditional execution

@@ -196,7 +196,7 @@ Internal properties - build.log.dirdiscouraged + build.output.dirnever

@@ -209,8 +209,9 @@ sf-run-evalid dependencies

- - + + +

@@ -322,12 +323,9 @@ </parallel>  - <property name="temp.md5.zip" value="${env.TEMP}/MD5_${sf.spec.job.name}_${build.number}.zip"/> - <echo message="INFO Packaging MD5s"/> - <zip destfile="${temp.md5.zip}"> + <zip destfile="${build.output.dir}/zips/release/build_md5.zip"> <zipfileset dir="${build.drive}/output/md5/" prefix="epoc32/relinfo"/> </zip> - <move file="${temp.md5.zip}" todir="${build.log.dir}" failonerror="false"/> </target> diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-run-sfl-licence-munging.dot.png Binary file doc/api/helium/target-sf-run-sfl-licence-munging.dot.png has changed diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-run-sfl-licence-munging.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/doc/api/helium/target-sf-run-sfl-licence-munging.html Thu Oct 08 19:36:20 2009 +0100 @@ -0,0 +1,218 @@ + + + + + + + + + + + + + + + + + Target sf-run-sfl-licence-munging + + + + + + + + + + + + + + + + + +

+ + + + + + + + + + + +

overview

deprecated

properties-table

index

help

+Helium API + +

+ prev + next

+ frames + no frames + + + + + +

+ + +

+ + + +

Target sf-run-sfl-licence-munging

+ +

Location

d:\maintools\sf-config\common\build.postbuild.xml:743: +

+ +

Conditional execution

Target is run if property defined: sf-utilities-available

+ +

Description

+ + +

Target external Dependency

+ + + + + + + +
Name
perl
+

+ + +

Property dependencies

+ + +

+ + + + + + + + + + + + + + + + +
Name Edit status
User editable properties
build.drive recommended
Internal properties
build.log.dir discouraged
+

+ +

+ + +

Target dependencies

+ sf-run-sfl-licence-munging dependencies + + + + + +

+ + +

Source code

+    <target name="sf-run-sfl-licence-munging" depends="sf-check-utilities-dir" if="sf-utilities-available">    
+        <echo message="Running SFL Licence Munging writing log to ${build.log.dir}"/>
+        <exec executable="perl" dir="${build.drive}" failonerror="false" output="${build.log.dir}/postbuild_sfl-licence_munging_results.log">
+          <arg value="${build.drive}/utilities/williamr/convert_to_eula.pl"/>
+        </exec>
+    </target>
+

+ + +

+ + + + + + + + + + + + + +

+ + + + + + + + + + + +

overview

deprecated

properties-table

index

help

+Helium API + +

+ prev + next

+ frames + no frames + + + + + +

+ + + Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. License: http://www.eclipse.org/legal/epl-v10.html + + + + + diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-s60-compile.dot.png Binary file doc/api/helium/target-sf-s60-compile.dot.png has changed diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-s60-compile.html --- a/doc/api/helium/target-sf-s60-compile.html Tue Oct 06 17:31:14 2009 +0100 +++ b/doc/api/helium/target-sf-s60-compile.html Thu Oct 08 19:36:20 2009 +0100 @@ -82,7 +82,7 @@

Target sf-s60-compile

Location

D:\maintools\sf-config\sf-platform\build.xml:363: +

d:\maintools\sf-config\sf-platform\build.xml:378:

Conditional execution

diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-s60-create-cenrep.dot.png Binary file doc/api/helium/target-sf-s60-create-cenrep.dot.png has changed diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-s60-create-cenrep.html --- a/doc/api/helium/target-sf-s60-create-cenrep.html Tue Oct 06 17:31:14 2009 +0100 +++ b/doc/api/helium/target-sf-s60-create-cenrep.html Thu Oct 08 19:36:20 2009 +0100 @@ -82,7 +82,7 @@

Target sf-s60-create-cenrep

Location

D:\maintools\sf-config\sf-platform\build.xml:482: +

d:\maintools\sf-config\sf-platform\build.xml:497:

Conditional execution

diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-send-testpkg.dot.png Binary file doc/api/helium/target-sf-send-testpkg.dot.png has changed diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-send-testpkg.html --- a/doc/api/helium/target-sf-send-testpkg.html Tue Oct 06 17:31:14 2009 +0100 +++ b/doc/api/helium/target-sf-send-testpkg.html Thu Oct 08 19:36:20 2009 +0100 @@ -82,7 +82,7 @@

Target sf-send-testpkg

Location

D:\maintools\sf-config\common\build.test.xml:175: +

d:\maintools\sf-config\common\build.test.xml:178:

Conditional execution

@@ -140,11 +140,13 @@ sf-send-testpkg dependencies

- - - - - + + + + + + +

@@ -152,7 +154,7 @@

Source code

-    <target name="sf-send-testpkg" depends="sf-find-ATS-worker-root,sf-make-junction">
+    <target name="sf-send-testpkg" depends="sf-start-ats,sf-find-ATS-worker-root,sf-make-junction">
         <mkdir dir="${sf.spec.test.workerroot}/${sf.spec.test.package.droppath}"/>
         <echo message="Sending test package ${sf.spec.test.package.name} to ${sf.spec.test.host.name} path ${sf.spec.test.host.droppath}"/>
         <exec executable="perl" dir="${sf.common.config.dir}/tools/ats" failonerror="false" output="${build.log.dir}/ATS_${build.id}_testdrop.log">
@@ -225,5 +227,3 @@
 
 
 
-
-
diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-start-ats.dot.png
Binary file doc/api/helium/target-sf-start-ats.dot.png has changed
diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-start-ats.html
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/doc/api/helium/target-sf-start-ats.html	Thu Oct 08 19:36:20 2009 +0100
@@ -0,0 +1,210 @@
+
+
+
+
+
+
+
+    
+    
+    
+    
+    
+
+    
+    
+    
+    Target sf-start-ats
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  
+  
+
+  
+    
+    
+  
+  
+  
+  overview      deprecated      properties-table      index      help 
+ 
+Helium API
+
+

+ prev 
+ next 
+  frames   
+ no frames   
+
+ 
+
+
+
+
+
+
+    
+
+
+    
+Target sf-start-ats
+
+Location
+    d:\maintools\sf-config\common\build.test.xml:191:  
+
+
+Conditional execution        
+No conditions on target execution.
+
+
+Description
+
+
+
+

+
+
+Target external Dependency
+ 
+
+    
+        
+    
+        
+                    
+            
+Name
${ats.drive}/start.cmd
+
+
+
+Property dependencies
+
+
+ 
+
+    
+        
+    
+    
+        
+    
+    
+        
+    
+Name Edit status
User editable properties
Internal properties
+
+
+
+
+
+Target dependencies
+
+
+
+
+
+
+
+
+
+
+Source code
++    <target name="sf-start-ats">        			
+	    <exec executable="${ats.drive}/start.cmd" dir="${ats.drive}" failonerror="false" spawn="true" vmlauncher="false"/>
+		<echo message="Waiting for 10 seconds to start the ATS Worker......."/>
+		<sleep seconds="10"/>
+    </target>
+
+
+
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  
+  
+
+  
+    
+    
+  
+  
+  
+  overview      deprecated      properties-table      index      help 
+ 
+Helium API
+
+

+ prev 
+ next 
+  frames   
+ no frames   
+
+ 
+
+
+
+
+
+
+    Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. License: http://www.eclipse.org/legal/epl-v10.html
+ 
+
+
+
+
diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-summary.dot.png
Binary file doc/api/helium/target-sf-summary.dot.png has changed
diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-summary.html
--- a/doc/api/helium/target-sf-summary.html	Tue Oct 06 17:31:14 2009 +0100
+++ b/doc/api/helium/target-sf-summary.html	Thu Oct 08 19:36:20 2009 +0100
@@ -82,7 +82,7 @@
 Target sf-summary
 
 Location
-    D:\maintools\sf-config\common\build.xml:126:  
+
    d:\maintools\sf-config\common\build.xml:135:  
 
 
 Conditional execution        
diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-syncsource.dot.png
Binary file doc/api/helium/target-sf-syncsource.dot.png has changed
diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-syncsource.html
--- a/doc/api/helium/target-sf-syncsource.html	Tue Oct 06 17:31:14 2009 +0100
+++ b/doc/api/helium/target-sf-syncsource.html	Thu Oct 08 19:36:20 2009 +0100
@@ -82,7 +82,7 @@
 Target sf-syncsource
 
 Location
-    D:\maintools\sf-config\common\build.xml:298:  
+
    d:\maintools\sf-config\common\build.xml:308:  
 
 
 Conditional execution        
@@ -128,14 +128,13 @@
 
 
 
-
-
+
+
 
 
-
-
-
-
+
+
+
 
 
 
diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-tag-hg-code.dot.png
Binary file doc/api/helium/target-sf-tag-hg-code.dot.png has changed
diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-tag-hg-code.html
--- a/doc/api/helium/target-sf-tag-hg-code.html	Tue Oct 06 17:31:14 2009 +0100
+++ b/doc/api/helium/target-sf-tag-hg-code.html	Thu Oct 08 19:36:20 2009 +0100
@@ -82,7 +82,7 @@
 Target sf-tag-hg-code
 
 Location
-    D:\maintools\sf-config\common\build.postbuild.xml:65:  
+
    d:\maintools\sf-config\common\build.postbuild.xml:77:  
 
 
 Conditional execution        
diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-test-bc-check.dot.png
Binary file doc/api/helium/target-sf-test-bc-check.dot.png has changed
diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-test-bc-check.html
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/doc/api/helium/target-sf-test-bc-check.html	Thu Oct 08 19:36:20 2009 +0100
@@ -0,0 +1,223 @@
+
+
+
+
+
+
+
+    
+    
+    
+    
+    
+
+    
+    
+    
+    Target sf-test-bc-check
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  
+  
+
+  
+    
+    
+  
+  
+  
+  overview      deprecated      properties-table      index      help 
+ 
+Helium API
+
+

+ prev 
+ next 
+  frames   
+ no frames   
+
+ 
+
+
+
+
+
+
+    
+
+
+    
+Target sf-test-bc-check
+
+Location
+    d:\maintools\sf-config\common\build.test.xml:5:  
+
+
+Conditional execution        
+No conditions on target execution.
+
+
+Description
+
+
+
+

+
+
+
+
+Property dependencies
+
+
+ 
+
+    
+        
+    
+    
+        
+    
+    
+        
+    
+Name Edit status
User editable properties
Internal properties
+
+
+
+
+
+Target dependencies
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Source code
++    <target name="sf-test-bc-check" depends="sf-prebuild,sf-bc-check,sf-zip-logs,sf-publish"/>
+
+
+
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  
+  
+
+  
+    
+    
+  
+  
+  
+  overview      deprecated      properties-table      index      help 
+ 
+Helium API
+
+

+ prev 
+ next 
+  frames   
+ no frames   
+
+ 
+
+
+
+
+
+
+    Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. License: http://www.eclipse.org/legal/epl-v10.html
+ 
+
+
+
+
diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-test-smoketest.dot.png
Binary file doc/api/helium/target-sf-test-smoketest.dot.png has changed
diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-test-smoketest.html
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/doc/api/helium/target-sf-test-smoketest.html	Thu Oct 08 19:36:20 2009 +0100
@@ -0,0 +1,223 @@
+
+
+
+
+
+
+
+    
+    
+    
+    
+    
+
+    
+    
+    
+    Target sf-test-smoketest
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  
+  
+
+  
+    
+    
+  
+  
+  
+  overview      deprecated      properties-table      index      help 
+ 
+Helium API
+
+

+ prev 
+ next 
+  frames   
+ no frames   
+
+ 
+
+
+
+
+
+
+    
+
+
+    
+Target sf-test-smoketest
+
+Location
+    d:\maintools\sf-config\common\build.test.xml:4:  
+
+
+Conditional execution        
+No conditions on target execution.
+
+
+Description
+
+
+
+

+
+
+
+
+Property dependencies
+
+
+ 
+
+    
+        
+    
+    
+        
+    
+    
+        
+    
+Name Edit status
User editable properties
Internal properties
+
+
+
+
+
+Target dependencies
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Source code
++    <target name="sf-test-smoketest" depends="sf-prebuild,sf-build-smoketestpkg,sf-send-testpkg,sf-zip-logs,sf-publish"/>
+
+
+
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  
+  
+
+  
+    
+    
+  
+  
+  
+  overview      deprecated      properties-table      index      help 
+ 
+Helium API
+
+

+ prev 
+ next 
+  frames   
+ no frames   
+
+ 
+
+
+
+
+
+
+    Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. License: http://www.eclipse.org/legal/epl-v10.html
+ 
+
+
+
+
diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-truclean.dot.png
Binary file doc/api/helium/target-sf-truclean.dot.png has changed
diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-truclean.html
--- a/doc/api/helium/target-sf-truclean.html	Tue Oct 06 17:31:14 2009 +0100
+++ b/doc/api/helium/target-sf-truclean.html	Thu Oct 08 19:36:20 2009 +0100
@@ -82,7 +82,7 @@
 Target sf-truclean
 
 Location
-    D:\maintools\sf-config\common\build.xml:376:  
+
    d:\maintools\sf-config\common\build.xml:386:  
 
 
 Conditional execution        
diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-unpack-rnd.dot.png
Binary file doc/api/helium/target-sf-unpack-rnd.dot.png has changed
diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-unpack-rnd.html
--- a/doc/api/helium/target-sf-unpack-rnd.html	Tue Oct 06 17:31:14 2009 +0100
+++ b/doc/api/helium/target-sf-unpack-rnd.html	Thu Oct 08 19:36:20 2009 +0100
@@ -82,7 +82,7 @@
 Target sf-unpack-rnd
 
 Location
-    D:\maintools\sf-config\common\build.xml:484:  
+
    d:\maintools\sf-config\common\build.xml:498:  
 
 
 Conditional execution        
@@ -91,7 +91,7 @@
 
 Description
 
-
unpack rnd zips if available

+Unpack the rnd zips ready to be used in the build

 
 

 
@@ -154,11 +154,20 @@
      <target name="sf-unpack-rnd">
         <echo message="Unpacking any available RnD binaries"/>
-        <exec executable="7za" dir="${build.drive}" output="${build.log.dir}/unzip_${build.id}_binaries_rnd.log">
-        <arg value="x"/>
-        <arg value="-y"/> <!-- Need to unpack in overwrite mode, due to TEF -->
-        <arg value="${build.drive}/output/zips/bin*.zip"/>
-        </exec>
+        <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>
+            <sequential>
+                <exec executable="7za" dir="${build.drive}" output="${build.log.dir}/unzip_${build.id}_binaries_rnd.log" append="true">
+                    <arg value="x"/>
+                    <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>
     </target>
 
 
diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-zip-content.dot.png
Binary file doc/api/helium/target-sf-zip-content.dot.png has changed
diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-zip-content.html
--- a/doc/api/helium/target-sf-zip-content.html	Tue Oct 06 17:31:14 2009 +0100
+++ b/doc/api/helium/target-sf-zip-content.html	Thu Oct 08 19:36:20 2009 +0100
@@ -82,7 +82,7 @@
 Target sf-zip-content
 
 Location
-    D:\maintools\sf-config\common\build.xml:464:  
+
    d:\maintools\sf-config\common\build.xml:464:  
 
 
 Conditional execution        
@@ -132,9 +132,12 @@
 
 
-
-
-
+
+
+
+
+
+
 
 
 
diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-zip-logs.dot.png
Binary file doc/api/helium/target-sf-zip-logs.dot.png has changed
diff -r 3c858aa7a023 -r 56a1d97e7c73 doc/api/helium/target-sf-zip-logs.html
--- a/doc/api/helium/target-sf-zip-logs.html	Tue Oct 06 17:31:14 2009 +0100
+++ b/doc/api/helium/target-sf-zip-logs.html	Thu Oct 08 19:36:20 2009 +0100
@@ -82,7 +82,7 @@
 Target sf-zip-logs
 
 Location
-    D:\maintools\sf-config\common\build.postbuild.xml:480:  
+
    d:\maintools\sf-config\common\build.postbuild.xml:601:  
 
 
 Conditional execution        
@@ -91,7 +91,7 @@
 
 Description
 
-
package all logs into zipfile before publish

+package all logs into zipfile for publishing

 
 

 
@@ -116,10 +116,7 @@
         Internal properties
     
                     
-                        build.iddiscouraged
-                    
-                    
-                        build.log.dirdiscouraged
+                        build.output.dirnever
                     
 
 
@@ -132,8 +129,11 @@
 
 
-
-
+
+
+
+
+
 
 
 
@@ -145,22 +145,19 @@
         <if>
             <istrue value="${sf.spec.logs.zip.enable}"/>
             <then>
-                <property name="temp.log.dir" value="${env.TEMP}/${build.id}_output_logs"/>
-                <echo message="Zip log requested, zipping logs..."/>
-                <mkdir dir="${temp.log.dir}"/>
-                <zip destfile="${temp.log.dir}/build_logs.zip" basedir="${build.drive}"> 
+                <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/BOM/**"/>
                     <exclude name="output/logs/deliverables/**"/>
                     <exclude name="output/logs/releaseables/**"/>
                 </zip>
-                <zip destfile="${temp.log.dir}/build_BOM.zip">
+                <!-- workaround for the time when when 'sf-run-analysis-raptor' has not been run -->
+                <mkdir dir="${build.drive}/output/logs/releaseables"/> 
+                <zip destfile="${build.output.dir}/zips/release/build_BOM.zip">
                     <zipfileset dir="${build.drive}/output/logs/BOM" prefix="build_info/logs/BOM"/>
                     <zipfileset dir="${build.drive}/output/logs/releaseables" prefix="build_info/logs/releaseables"/>
                 </zip>
-                <move todir="${build.log.dir}">
-                    <fileset dir="${temp.log.dir}"/>
-                </move>
             </then>
         </if>
     </target>