# HG changeset patch
# User Jon Chatten
# Date 1284383044 -3600
# Node ID 8dd670a9f34fbb4305257da71bbb4ae5e2602806
# Parent ac0bbc1e5d7930fb5a3099db97e3eb9efdbc6abb
sbs version 2.15.2
diff -r ac0bbc1e5d79 -r 8dd670a9f34f sbsv2/raptor/RELEASE-NOTES.html
--- a/sbsv2/raptor/RELEASE-NOTES.html Mon Sep 13 13:11:19 2010 +0800
+++ b/sbsv2/raptor/RELEASE-NOTES.html Mon Sep 13 14:04:04 2010 +0100
@@ -6,6 +6,22 @@
Release Notes for Symbian Build System v2
+version 2.15.2
+
+Engineering Changes
+
+
+Defect Fixes
+
+
version 2.15.1
Defect Fixes
diff -r ac0bbc1e5d79 -r 8dd670a9f34f sbsv2/raptor/bin/annofile.py
--- a/sbsv2/raptor/bin/annofile.py Mon Sep 13 13:11:19 2010 +0800
+++ b/sbsv2/raptor/bin/annofile.py Mon Sep 13 14:04:04 2010 +0100
@@ -24,6 +24,7 @@
def __init__(self, name, maxagents=30):
self.name = name
self.overallAggregateTime = 0
+ self.duration = 0
self.inJob = False
self.inMetricDuration = False
self.jobType = ''
diff -r ac0bbc1e5d79 -r 8dd670a9f34f sbsv2/raptor/bin/createvmap.py
--- a/sbsv2/raptor/bin/createvmap.py Mon Sep 13 13:11:19 2010 +0800
+++ b/sbsv2/raptor/bin/createvmap.py Mon Sep 13 14:04:04 2010 +0100
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
+# Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
# All rights reserved.
# This component and the accompanying materials are made available
# under the terms of the License "Eclipse Public License v1.0"
@@ -24,6 +24,11 @@
import traceback
from optparse import OptionParser
+# Need to find the raptor utilities.
+sys.path.append(os.path.join(os.environ['SBS_HOME'],"python"))
+from raptor_utilities import expand_command_options
+
+
# the script will exit with 0 if there are no errors
global exitCode
exitCode = 0
@@ -184,7 +189,18 @@
parser.add_option("-u","--userinc",action="append",dest="user_include",help="User Include Folders")
parser.add_option("-x","--systeminc",action="append",dest="system_include",help="System Include Folders")
- (options, leftover_args) = parser.parse_args(sys.argv[1:])
+
+ # The following allows the use of the --command option.
+ # The add_option() is redundant since --command is
+ # expanded well before it can take effect but it does
+ # allow us to print out a useful help message.
+ parser.add_option("--command",action="store",
+ dest="preinclude",
+ help="""Specify a command file with more commandline options
+ in it (for very large components)""")
+ expanded_args = expand_command_options(sys.argv[1:])
+
+ (options, leftover_args) = parser.parse_args(expanded_args)
if leftover_args:
for invalids in leftover_args:
diff -r ac0bbc1e5d79 -r 8dd670a9f34f sbsv2/raptor/bin/install_raptor.sh
--- a/sbsv2/raptor/bin/install_raptor.sh Mon Sep 13 13:11:19 2010 +0800
+++ b/sbsv2/raptor/bin/install_raptor.sh Mon Sep 13 14:04:04 2010 +0100
@@ -50,6 +50,12 @@
echo "You DON'T appear to have the ncurses dev libraries - please install them (ncurses-dev or ncurses-devel)"
fi
+if [ -f "/usr/include/bzlib.h" ]; then
+ echo "You appear to have the bzip2 dev libraries"
+else
+ echo "You DON'T appear to have the bzip2 dev libraries - please install them (bzip2-dev or bzip2-devel)"
+fi
+
echo "Do you wish to continue (Y or y for 'yes' anything else for no)?"
read X
diff -r ac0bbc1e5d79 -r 8dd670a9f34f sbsv2/raptor/bin/sbs_index.py
--- a/sbsv2/raptor/bin/sbs_index.py Mon Sep 13 13:11:19 2010 +0800
+++ b/sbsv2/raptor/bin/sbs_index.py Mon Sep 13 14:04:04 2010 +0100
@@ -6,20 +6,16 @@
# under the terms of the License "Symbian Foundation License v1.0"
# which accompanies this distribution, and is available
# at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
-#
-# Initial Contributors:
-# Nokia Corporation - initial contribution.
-#
-# Contributors:
-#
-# Description:
-#
-# Tie together a set of HTML build summaries by creating a single index page
-# which shows the total number of Errors, Warnings etc. across all the parts
-# of the build and links to the individual summaries.
+
+'''
+Tie together a set of HTML build summaries by creating a single index page
+which shows the total number of Errors, Warnings etc. across all the parts
+of the build and links to the individual summaries.
+'''
import os
import sys
+import time
# get the absolute path to this script
script = os.path.abspath(sys.argv[0])
@@ -104,8 +100,13 @@
for row in reader:
type = int(row[0])
style = row[1]
- count = int(row[2])
- if count == 0 or filter_html.Records.SUBDIRS[type] == style:
+
+ if style == 'time':
+ count = float(row[2])
+ else:
+ count = int(row[2])
+
+ if count == 0 or filter_html.Records.CLASSES[type] == style:
grandtotal[type] += count
columns.append((style,count))
else:
@@ -119,7 +120,11 @@
linkname = os.path.relpath(os.path.join(linktext, "index.html"), indexdir)
index.write('| %s | ' % (linkname, linktext))
for (style, count) in columns:
- index.write('%d | ' % (style, count))
+ if style == 'time':
+ n = time.strftime("%H:%M:%S", time.gmtime(count + 0.5))
+ else:
+ n = str(count)
+ index.write('%s | ' % (style, n))
index.write("
")
except:
sys.stderr.write("error: cannot write index file %s\n" % indexfile)
@@ -129,10 +134,16 @@
try:
index.write('| |
| total | ')
for i, count in enumerate(grandtotal):
+ style = filter_html.Records.CLASSES[i]
+ if style == 'time':
+ n = time.strftime("%H:%M:%S", time.gmtime(count + 0.5))
+ else:
+ n = str(count)
+
if count == 0:
index.write('0 | ')
else:
- index.write('%d | ' % (filter_html.Records.SUBDIRS[i], count))
+ index.write('%s | ' % (style, n))
index.write("
")
index.write("