# HG changeset patch
# User DarioS@UK-DarioS.symbian.int
# Date 1239810361 -3600
# Node ID 2771e394c9bdae2a59441873b308e72bfc2378bf
# Parent 6066a7d39270ed37bb6911a2671b71d0f016e01b# Parent 54444a2ae2db4332186dbf7ed5ec10083604ff98
Catchup from main repo
diff -r 54444a2ae2db -r 2771e394c9bd common/build.xml
--- a/common/build.xml Wed Apr 15 14:15:35 2009 +0100
+++ b/common/build.xml Wed Apr 15 16:46:01 2009 +0100
@@ -1,199 +1,299 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- [SF-PREP]
-
-
-
-
- [SF-BUILD-ALL]
-
-
-
- [SF-BUILD]
-
-
-
-
-
-
-
-
-
-
-
-
-
- ant: antProperties()
- data: csv(${sf.project.location}/${sf.spec.sourcesync.sourcespecfile}, {separator:','})
-
-
-
-
-
- [SF-PREBUILD]
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- [SF-POSTBUILD]
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- [SF-BUILD-NOPREP]
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ [SF-PREP]
+
+
+
+
+ [SF-BUILD-ALL]
+
+
+
+ [SF-BUILD]
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ant: antProperties()
+ data: csv(${sf.project.location}/${sf.spec.sourcesync.sourcespecfile}, {separator:','})
+
+
+
+
+
+ [SF-PREBUILD]
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ [SF-POSTBUILD]
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ [SF-BUILD-NOPREP]
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ant: antProperties()
+ data: csv(${sf.project.location}/${sf.spec.sourcesync.sourcespecfile}, {separator:','})
+
+
+
+
+
+
+
+
+ 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})
+ sources: csv(${build.drive}/output/logs/BOM/sources.csv,{separator:',',headers:[loc,dst,rev]})
+
+
+
+
+
+
+
+
diff -r 54444a2ae2db -r 2771e394c9bd common/common_props.ant.xml
--- a/common/common_props.ant.xml Wed Apr 15 14:15:35 2009 +0100
+++ b/common/common_props.ant.xml Wed Apr 15 16:46:01 2009 +0100
@@ -8,7 +8,7 @@
-
+
@@ -45,8 +45,8 @@
-
-
+
+
diff -r 54444a2ae2db -r 2771e394c9bd common/templates/build-info.xml.ftl
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/common/templates/build-info.xml.ftl Wed Apr 15 16:46:01 2009 +0100
@@ -0,0 +1,29 @@
+
+
+
+
+ Config
+ <#list config as c>
+ ${c.loc}#${c.rev}
+
+
+
+ Project
+ <#list project as p>
+ ${p.loc}#${p.rev}
+
+
+
+ Baseline
+ <#list baseline as b>
+ ${b}
+
+
+
+ Sources
+ <#list sources as s>
+ ${s.loc}#${s.rev}
+
+
+
+
diff -r 54444a2ae2db -r 2771e394c9bd common/templates/source-spec.ant.xml.ftl
--- a/common/templates/source-spec.ant.xml.ftl Wed Apr 15 14:15:35 2009 +0100
+++ b/common/templates/source-spec.ant.xml.ftl Wed Apr 15 16:46:01 2009 +0100
@@ -6,6 +6,11 @@
<#assign dollar = "$"/>
<#assign count = 0 />
+
+
+
+
+
<#list data as pkg_detail>
<#if (count > 0) >
@@ -23,6 +28,23 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -37,7 +59,7 @@
${fileset}
-
+
${sync_list}
diff -r 54444a2ae2db -r 2771e394c9bd common/templates/tag-hg-code.ant.xml.ftl
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/common/templates/tag-hg-code.ant.xml.ftl Wed Apr 15 16:46:01 2009 +0100
@@ -0,0 +1,37 @@
+
+
+
+<#assign target_depends = "" />
+<#assign count = 0 />
+
+<#list data as pkg_detail>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <#if (count == 0) >
+ <#assign target_depends = "${target_depends}" + "sf-tag-hg-code-${count}" />
+
+ <#if (count > 0) >
+ <#assign target_depends ="${target_depends}" + ","+"sf-tag-hg-code-${count}"/>
+
+
+ <#assign count = count + 1 />
+
+
+
+
+
\ No newline at end of file