+
-
+
diff -r 3215c239276a -r 4367a1b2db65 buildframework/helium/tools/common/templates/log/scan2.html.ftl
--- a/buildframework/helium/tools/common/templates/log/scan2.html.ftl Wed Jun 23 16:25:55 2010 +0300
+++ b/buildframework/helium/tools/common/templates/log/scan2.html.ftl Wed Jun 23 16:36:23 2010 +0300
@@ -44,7 +44,7 @@
| ${hours?string("00")}:${minutes?string("00")}:${seconds?string("00")} |
<#list priority_ids as priority>
- <#assign count = table_info['select count(data) as COUNT from metadata where priority_id in (select id from priority where priority like \'${priority}\') and logpath_id in (select id from logfiles where path like \'%${logfile}%\') and component_id = \'${component}\' '][0]['COUNT'] >
+ <#assign count = table_info['select count(data) as COUNT from metadata where priority_id in (select id from priority where priority like \'${priority}\') and logpath_id in (select id from logfiles where path like \'%${logfile}\') and component_id = \'${component}\' '][0]['COUNT'] >
<#if count > 0>
<#assign color = color_list['${priority}']>
${count} |
@@ -57,7 +57,7 @@
<#macro print_list_text priority component href_id>
-<#assign count = table_info['select count(data) as COUNT from metadata where component_id=\'${component}\' and priority_id in (select id from priority where priority like \'${priority}\') and logpath_id in (select id from logfiles where path like \'%${logfile}%\')'][0]['COUNT'] >
+<#assign count = table_info['select count(data) as COUNT from metadata where component_id=\'${component}\' and priority_id in (select id from priority where priority like \'${priority}\') and logpath_id in (select id from logfiles where path like \'%${logfile}\')'][0]['COUNT'] >
<#if count > 0>
<#if component_table?keys?seq_contains("${component}")>
<#if component_table["${component}"] != "general">
@@ -90,8 +90,8 @@
<#assign table_info = pp.loadData('com.nokia.helium.metadata.SQLFMPPLoader',
"${dbPath}") >
<#-- overall summary -->
-<#assign component_table = table_info['select id, component from component where logpath_id in (select id from logfiles where path like \'%${logfile}%\') ORDER BY component'] >
-<#assign general_id = table_info['select id from component where logpath_id in (select id from logfiles where path like \'%${logfile}%\') and component like \'%general%\''] >
+<#assign component_table = table_info['select id, component from component where logpath_id in (select id from logfiles where path like \'%${logfile}\') ORDER BY component'] >
+<#assign general_id = table_info['select id from component where logpath_id in (select id from logfiles where path like \'%${logfile}\') and component like \'%general%\''] >
${logfile}
@@ -114,7 +114,7 @@
<#assign priority_ids = color_list?keys>
<#list priority_ids as priority>
<@add_severity_count severity='${priority}'
- count = table_info['select count(data) as COUNT from metadata where priority_id in (select id from priority where priority like \'${priority}\') and logpath_id in (select id from logfiles where path like \'%${logfile}%\')'][0]['COUNT'] color=color_list['${priority}'] />
+ count = table_info['select count(data) as COUNT from metadata where priority_id in (select id from priority where priority like \'${priority}\') and logpath_id in (select id from logfiles where path like \'%${logfile}\')'][0]['COUNT'] color=color_list['${priority}'] />
@@ -136,6 +136,7 @@
<#assign c_id = 0>
<#if general_id?size > 0>
<@print_component_summary component="${general_id[0][\"id\"]}" href_c_id="${c_id}"/>
+<#assign c_id = c_id + 1>
<#assign component_ids = component_table?keys>
@@ -152,7 +153,7 @@
<#assign href_pid = 0>
<#list priority_ids as p_id>
-<#assign p_count = table_info['select count(data) as COUNT from metadata where priority_id in (select id from priority where priority like \'${p_id}\') and logpath_id in (select id from logfiles where path like \'%${logfile}%\')'][0]['COUNT'] >
+<#assign p_count = table_info['select count(data) as COUNT from metadata where priority_id in (select id from priority where priority like \'${p_id}\') and logpath_id in (select id from logfiles where path like \'%${logfile}\')'][0]['COUNT'] >
<#if p_count > 0>
@@ -165,8 +166,8 @@
<#list component_ids as component>
<#if component_table["${component}"] != "general">
<@print_list_text priority="${p_id}" component="${component}" href_id="${href_cid}${href_pid}" />
- <#assign href_cid = href_cid + 1>
+ <#assign href_cid = href_cid + 1>
<#assign href_pid = href_pid + 1>
diff -r 3215c239276a -r 4367a1b2db65 buildframework/helium/tools/common/templates/log/scan2_text.html.ftl
--- a/buildframework/helium/tools/common/templates/log/scan2_text.html.ftl Wed Jun 23 16:25:55 2010 +0300
+++ b/buildframework/helium/tools/common/templates/log/scan2_text.html.ftl Wed Jun 23 16:36:23 2010 +0300
@@ -44,7 +44,7 @@
${hours?string("00")}:${minutes?string("00")}:${seconds?string("00")} |
<#list priority_ids as priority>
- <#assign count = table_info['select count(data) as COUNT from metadata where priority_id in (select id from priority where priority like \'${priority}\') and logpath_id in (select id from logfiles where path like \'%${logfile}%\') and component_id = \'${component}\' '][0]['COUNT'] >
+ <#assign count = table_info['select count(data) as COUNT from metadata where priority_id in (select id from priority where priority like \'${priority}\') and logpath_id in (select id from logfiles where path like \'%${logfile}\') and component_id = \'${component}\' '][0]['COUNT'] >
<#if count > 0>
<#assign color = color_list['${priority}']>
${count} |
@@ -57,7 +57,7 @@
<#macro print_list_text priority component href_id>
-<#assign count = table_info['select count(data) as COUNT from metadata where component_id=\'${component}\' and priority_id in (select id from priority where priority like \'${priority}\') and logpath_id in (select id from logfiles where path like \'%${logfile}%\')'][0]['COUNT'] >
+<#assign count = table_info['select count(data) as COUNT from metadata where component_id=\'${component}\' and priority_id in (select id from priority where priority like \'${priority}\') and logpath_id in (select id from logfiles where path like \'%${logfile}\')'][0]['COUNT'] >
<#if count > 0>
<#if component_table?keys?seq_contains("${component}")>
<#if component_table["${component}"] != "general">
@@ -94,8 +94,8 @@
<#assign table_info = pp.loadData('com.nokia.helium.metadata.SQLFMPPLoader',
"${dbPath}") >
<#-- overall summary -->
-<#assign component_table = table_info['select id, component from component where logpath_id in (select id from logfiles where path like \'%${logfile}%\') ORDER BY component'] >
-<#assign general_id = table_info['select id from component where logpath_id in (select id from logfiles where path like \'%${logfile}%\') and component like \'%general%\''] >
+<#assign component_table = table_info['select id, component from component where logpath_id in (select id from logfiles where path like \'%${logfile}\') ORDER BY component'] >
+<#assign general_id = table_info['select id from component where logpath_id in (select id from logfiles where path like \'%${logfile}\') and component like \'%general%\''] >
${logfile}
@@ -119,7 +119,7 @@
<#assign priority_ids = color_list?keys>
<#list priority_ids as priority>
<@add_severity_count severity='${priority}'
- count = table_info['select count(data) as COUNT from metadata where priority_id in (select id from priority where priority like \'${priority}\') and logpath_id in (select id from logfiles where path like \'%${logfile}%\')'][0]['COUNT'] color=color_list['${priority}'] />
+ count = table_info['select count(data) as COUNT from metadata where priority_id in (select id from priority where priority like \'${priority}\') and logpath_id in (select id from logfiles where path like \'%${logfile}\')'][0]['COUNT'] color=color_list['${priority}'] />
@@ -158,7 +158,7 @@
<#assign href_pid = 0>
<#list priority_ids as p_id>
-<#assign p_count = table_info['select count(data) as COUNT from metadata where priority_id in (select id from priority where priority like \'${p_id}\') and logpath_id in (select id from logfiles where path like \'%${logfile}%\')'][0]['COUNT'] >
+<#assign p_count = table_info['select count(data) as COUNT from metadata where priority_id in (select id from priority where priority like \'${p_id}\') and logpath_id in (select id from logfiles where path like \'%${logfile}\')'][0]['COUNT'] >
<#if p_count > 0>
diff -r 3215c239276a -r 4367a1b2db65 buildframework/helium/tools/common/test/test_common.ant.xml
--- a/buildframework/helium/tools/common/test/test_common.ant.xml Wed Jun 23 16:25:55 2010 +0300
+++ b/buildframework/helium/tools/common/test/test_common.ant.xml Wed Jun 23 16:36:23 2010 +0300
@@ -263,12 +263,14 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
+
ERROR: an error
WARNING: a warning
diff -r 3215c239276a -r 4367a1b2db65 buildframework/helium/tools/compile/compile.ant.xml
--- a/buildframework/helium/tools/compile/compile.ant.xml Wed Jun 23 16:25:55 2010 +0300
+++ b/buildframework/helium/tools/compile/compile.ant.xml Wed Jun 23 16:36:23 2010 +0300
@@ -94,8 +94,15 @@
diff -r 3215c239276a -r 4367a1b2db65 buildframework/helium/tools/compile/compile.antlib.xml
--- a/buildframework/helium/tools/compile/compile.antlib.xml Wed Jun 23 16:25:55 2010 +0300
+++ b/buildframework/helium/tools/compile/compile.antlib.xml Wed Jun 23 16:36:23 2010 +0300
@@ -65,6 +65,8 @@
+
+
@@ -151,6 +153,8 @@
+
+
@@ -158,7 +162,7 @@
-
+
@@ -166,35 +170,11 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
diff -r 3215c239276a -r 4367a1b2db65 buildframework/helium/tools/compile/qt/templates/run-qmake.ant.xml.ftl
--- a/buildframework/helium/tools/compile/qt/templates/run-qmake.ant.xml.ftl Wed Jun 23 16:25:55 2010 +0300
+++ b/buildframework/helium/tools/compile/qt/templates/run-qmake.ant.xml.ftl Wed Jun 23 16:36:23 2010 +0300
@@ -34,6 +34,8 @@
+ <#if "${ant['build.system']?lower_case}" = 'sbs'>
+
<#if unit.@qmakeArgs[0]??>
<#else>
diff -r 3215c239276a -r 4367a1b2db65 buildframework/helium/tools/compile/qt/templates/run-qmake.mk.ftl
--- a/buildframework/helium/tools/compile/qt/templates/run-qmake.mk.ftl Wed Jun 23 16:25:55 2010 +0300
+++ b/buildframework/helium/tools/compile/qt/templates/run-qmake.mk.ftl Wed Jun 23 16:36:23 2010 +0300
@@ -28,8 +28,8 @@
<#list data["//unit/@proFile/.."] as unit>
##########################################################################
/${unit.@bldFile}/bld.inf: /${unit.@bldFile}/${unit.@proFile}
- @echo cd /${unit.@bldFile} ^&^& qmake -listgen <#if unit.@qmakeArgs[0]??>${unit.@qmakeArgs}<#else>${ant['qt.qmake.default.args']} ${unit.@proFile}
- cd /${unit.@bldFile} && qmake -listgen <#if unit.@qmakeArgs[0]??>${unit.@qmakeArgs}<#else>${ant['qt.qmake.default.args']} ${unit.@proFile}
+ @echo cd /${unit.@bldFile} ^&^& qmake -listgen <#if unit.@qmakeArgs[0]??>${unit.@qmakeArgs}<#else>${ant['qt.qmake.default.args']} <#if "${ant['build.system']?lower_case}" = 'sbs-ec'> -spec symbian-sbsv2 ${unit.@proFile}
+ -@cd /${unit.@bldFile} && qmake -listgen <#if unit.@qmakeArgs[0]??>${unit.@qmakeArgs}<#else>${ant['qt.qmake.default.args']} <#if "${ant['build.system']?lower_case}" = 'sbs-ec'> -spec symbian-sbsv2 ${unit.@proFile}
all:: /${unit.@bldFile}/bld.inf
diff -r 3215c239276a -r 4367a1b2db65 buildframework/helium/tools/compile/sbs/sbs.ant.xml
--- a/buildframework/helium/tools/compile/sbs/sbs.ant.xml Wed Jun 23 16:25:55 2010 +0300
+++ b/buildframework/helium/tools/compile/sbs/sbs.ant.xml Wed Jun 23 16:36:23 2010 +0300
@@ -116,11 +116,23 @@
-
+ statsLog="${sbs.log.file}.info.xml" />
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -131,7 +143,8 @@
-
+
+
@@ -140,7 +153,29 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -168,12 +203,13 @@
-
+
-
+
+
@@ -184,7 +220,7 @@
+ outputfile="${build.log.dir}/${base.sbs.log}.scan2.html">
macro: ${helium.dir}/tools/common/templates/macro
@@ -195,9 +231,13 @@
-
+
-
+
+
+
diff -r 3215c239276a -r 4367a1b2db65 buildframework/helium/tools/localisation/localisation-32.ant.xml
--- a/buildframework/helium/tools/localisation/localisation-32.ant.xml Wed Jun 23 16:25:55 2010 +0300
+++ b/buildframework/helium/tools/localisation/localisation-32.ant.xml Wed Jun 23 16:36:23 2010 +0300
@@ -376,10 +376,10 @@
-
+
-
+
Localising ${localisation.languages}
Localising using ${localisation.tool}.
diff -r 3215c239276a -r 4367a1b2db65 buildframework/helium/tools/preparation/bom/bom.ant.xml
--- a/buildframework/helium/tools/preparation/bom/bom.ant.xml Wed Jun 23 16:25:55 2010 +0300
+++ b/buildframework/helium/tools/preparation/bom/bom.ant.xml Wed Jun 23 16:36:23 2010 +0300
@@ -255,9 +255,17 @@
-
-
-
+
+
diff -r 3215c239276a -r 4367a1b2db65 buildframework/helium/tools/preparation/ci.ant.xml
--- a/buildframework/helium/tools/preparation/ci.ant.xml Wed Jun 23 16:25:55 2010 +0300
+++ b/buildframework/helium/tools/preparation/ci.ant.xml Wed Jun 23 16:36:23 2010 +0300
@@ -43,7 +43,8 @@
import threadpool
import subprocess
import sys
-
+from java.io import IOException
+
dir_path = str(attributes.get('dir-path'))
del_folder_drive = attributes.get('delete-folders-drive')
pool_size = attributes.get('pool-size')
@@ -70,24 +71,12 @@
# Delete all dirs based on config
for dir_ in delete_dirs:
try:
- if os.sep == '\\':
- fileutils.subst(del_folder_drive, dir_)
- self.log(str("substed for deleting folders"))
- self.log(str("Removing %s\\" % del_folder_drive))
- fileutils.rmtree("%s\\" % del_folder_drive)
- fileutils.unsubst(del_folder_drive)
- self.log(str("unsubsted substed for deleting folders"))
- else:
- self.log(str("Removing %s" % dir_))
- fileutils.rmtree(dir_)
- except Exception, e:
- if os.sep == '\\':
- try:
- fileutils.unsubst(del_folder_drive)
- self.log(str("unsubsted for deleling folders"))
- except Exception, e2:
- self.log(str("failed when unsubsting for failed deleting folders... process will continue anyway"))
- self.log(str("ERROR: %s" % e))
+ self.log(str("Removing %s" % dir_))
+ fileutils.rmtree(dir_)
+ except Exception, exc:
+ self.log(str("ERROR: %s" % exc))
+ except IOException, ioExc:
+ self.log(str("ERROR: %s" % ioExc))
# Delete all config files
for path_ in found_inputs:
diff -r 3215c239276a -r 4367a1b2db65 buildframework/helium/tools/preparation/synergy/ccmgetinput.ant.xml
--- a/buildframework/helium/tools/preparation/synergy/ccmgetinput.ant.xml Wed Jun 23 16:25:55 2010 +0300
+++ b/buildframework/helium/tools/preparation/synergy/ccmgetinput.ant.xml Wed Jun 23 16:36:23 2010 +0300
@@ -58,7 +58,8 @@
try:
configBuilder = configuration.NestedConfigurationBuilder(open(ant.get_property(r'${prep.delivery.conf.parsed}'), 'r'))
configSet = configBuilder.getConfiguration()
- builder = preparation.PreparationBuilder(configSet.getConfigurations(), ant.get_property(r'${ccm.user.login}'), ant.get_property(r'${ccm.user.password}'), cache=ant.get_property(r'${ccm.cache.xml}'))
+ password = ant.get_property(r'${ccm.user.password}')
+ builder = preparation.PreparationBuilder(configSet.getConfigurations(), ant.get_property(r'${ccm.user.login}'), password, cache=ant.get_property(r'${ccm.cache.xml}'))
builder.check()
builder.get_content()
builder.close()
diff -r 3215c239276a -r 4367a1b2db65 buildframework/helium/tools/preparation/test/test_synergy.ant.xml
--- a/buildframework/helium/tools/preparation/test/test_synergy.ant.xml Wed Jun 23 16:25:55 2010 +0300
+++ b/buildframework/helium/tools/preparation/test/test_synergy.ant.xml Wed Jun 23 16:36:23 2010 +0300
@@ -25,14 +25,27 @@
Testing targets related to Synergy
-
+
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
[python] INFO:ccm.extra:Using CachedSessionProvider.
[python] INFO:preparation.ccmgetinput:Get a session for databasexxx
[python] INFO:ccm:Database path set using the GSCM database.
@@ -86,19 +99,20 @@
[python] INFO:ccm.extra:Closing the CachedSessionProvider.
[python] INFO:ccm.extra:Cleaning up opened sessions.
-
+
+
-
+
-
+
-
+
-
+
diff -r 3215c239276a -r 4367a1b2db65 buildframework/helium/tools/publish/synergy.ant.xml
--- a/buildframework/helium/tools/publish/synergy.ant.xml Wed Jun 23 16:25:55 2010 +0300
+++ b/buildframework/helium/tools/publish/synergy.ant.xml Wed Jun 23 16:36:23 2010 +0300
@@ -28,7 +28,7 @@
-
+
@@ -40,7 +40,7 @@
macro: ${helium.dir}/tools/common/templates/macro
- bom: xml(${temp.build.dir}/${build.id}_bom.xml)
+ bom: xml(${build.log.dir}/${build.id}_bom.xml)
ant: antProperties()
diff -r 3215c239276a -r 4367a1b2db65 buildframework/helium/tools/rombuild/imaker.ant.xml
--- a/buildframework/helium/tools/rombuild/imaker.ant.xml Wed Jun 23 16:25:55 2010 +0300
+++ b/buildframework/helium/tools/rombuild/imaker.ant.xml Wed Jun 23 16:36:23 2010 +0300
@@ -108,6 +108,14 @@
output="${roms.log.dir}/${build.id}${imaker.rom.name}.roms.log" verbose="true">
+
+
+
+
+
+
+
@@ -131,6 +139,7 @@
+
diff -r 3215c239276a -r 4367a1b2db65 buildframework/helium/tools/rombuild/rombuild.ant.xml
--- a/buildframework/helium/tools/rombuild/rombuild.ant.xml Wed Jun 23 16:25:55 2010 +0300
+++ b/buildframework/helium/tools/rombuild/rombuild.ant.xml Wed Jun 23 16:36:23 2010 +0300
@@ -81,7 +81,7 @@
-
+
@@ -90,13 +90,13 @@
-
+
-
+
diff -r 3215c239276a -r 4367a1b2db65 buildframework/helium/tools/testing/ats/ats.ant.xml
--- a/buildframework/helium/tools/testing/ats/ats.ant.xml Wed Jun 23 16:25:55 2010 +0300
+++ b/buildframework/helium/tools/testing/ats/ats.ant.xml Wed Jun 23 16:36:23 2010 +0300
@@ -149,9 +149,13 @@
-
+
+
+
+
+