--- a/sbsv2/raptor/RELEASE-NOTES.txt Wed Feb 17 12:58:38 2010 +0000
+++ b/sbsv2/raptor/RELEASE-NOTES.txt Wed Feb 17 16:53:22 2010 +0000
@@ -3,14 +3,26 @@
next version
Defect Fixes:
-- SF Bug 1569 - excessive recompilation in incremental tracecompiler builds
-- Better error messages for make-engine selection. e.g. "sbs -e arm" will now produce a useful error message rather than a traceback. "arm" is a real variant but it's not a make engine. In the past sbs would have tried to use it and would have failed with a complicated traceback. Also doesn't traceback for non-existent make engines.
-- sbs_filter chose wrong embedded default python version. Set to 2.6.4 now.
-- FilterCheck did not check files when run from sbs_filter
- DPDEF142718 Incremental rebuild fails if dependent files deleted
--no-depend-generate added to suppress the generation and processing of dependency files
.DEFAULT target introduced for all non --no-depend-generate and/or --no-depend-include builds
+
+version 2.12.2
+
+Defect Fixes:
+- SF Bug 1569 - excessive recompilation in incremental tracecompiler builds
+- Better error messages for make-engine selection.
+ e.g. "sbs -e arm" will now produce a useful error message rather than
+ a traceback. "arm" is a real variant but it's not a make engine. In
+ the past sbs would have tried to use it and would have failed with a
+ complicated traceback. Also doesn't traceback for non-existent make engines.
+- sbs_filter chose wrong embedded default python version. Set to 2.6.4 now.
+- FilterCheck did not check files when run from sbs_filter
+- Remove old references to python 2.5.2
+- Escape filenames with special XML characters inside <member> tags
+
+
version 2.12.1
Defect Fixes:
--- a/sbsv2/raptor/bin/sbs Wed Feb 17 12:58:38 2010 +0000
+++ b/sbsv2/raptor/bin/sbs Wed Feb 17 16:53:22 2010 +0000
@@ -67,8 +67,8 @@
__MINGW__=${SBS_MINGW:-$SBS_HOME/$HOSTPLATFORM_DIR/mingw}
__CYGWIN__=${SBS_CYGWIN:-$SBS_HOME/$HOSTPLATFORM_DIR/cygwin}
- __PYTHON__=${SBS_PYTHON:-$SBS_HOME/$HOSTPLATFORM_DIR/python252/python.exe}
- export PYTHONPATH=${SBS_PYTHONPATH:-$SBS_HOME/$HOSTPLATFORM_DIR/python252}
+ __PYTHON__=${SBS_PYTHON:-$SBS_HOME/$HOSTPLATFORM_DIR/python264/python.exe}
+ export PYTHONPATH=${SBS_PYTHONPATH:-$SBS_HOME/$HOSTPLATFORM_DIR/python264}
# Command for unifying path strings. For example, "c:\some\path" and
# "/cygdrive/c/some/path" will both be converted into "c:/some/path".
--- a/sbsv2/raptor/python/raptor_meta.py Wed Feb 17 12:58:38 2010 +0000
+++ b/sbsv2/raptor/python/raptor_meta.py Wed Feb 17 16:53:22 2010 +0000
@@ -31,6 +31,7 @@
import generic_path
import subprocess
import zipfile
+from xml.sax.saxutils import escape
from mmpparser import *
import time
@@ -2901,7 +2902,7 @@
for file in files:
if not file.endswith('/'):
expfilename = str(generic_path.Join(destination, file))
- exportwhatlog += "<member>" + expfilename + "</member>\n"
+ exportwhatlog += "<member>" + escape(expfilename) + "</member>\n"
self.__Raptor.PrintXML("<clean bldinf='" + bldinf_filename + "' mmp='' config=''>\n")
self.__Raptor.PrintXML("<zipmarker>" + markerfilename + "</zipmarker>\n")
@@ -2946,7 +2947,7 @@
os.utime(expfilename,(accesstime, modifiedtime))
filecount += 1
- exportwhatlog+="<member>" + expfilename + "</member>\n"
+ exportwhatlog+="<member>" + escape(expfilename) + "</member>\n"
except IOError, e:
message = "Could not unzip %s to %s: file %s: %s" %(source, destination, expfilename, str(e))
if not self.__Raptor.keepGoing:
--- a/sbsv2/raptor/python/raptor_version.py Wed Feb 17 12:58:38 2010 +0000
+++ b/sbsv2/raptor/python/raptor_version.py Wed Feb 17 16:53:22 2010 +0000
@@ -16,7 +16,7 @@
# replace CHANGESET with the Hg changeset for ANY release
-version=(2,12,1,"2010-01-29","symbian build system","CHANGESET")
+version=(2,12,2,"2010-02-17","symbian build system","CHANGESET")
def numericversion():
"""Raptor version string"""
--- a/sbsv2/raptor/test/run Wed Feb 17 12:58:38 2010 +0000
+++ b/sbsv2/raptor/test/run Wed Feb 17 16:53:22 2010 +0000
@@ -28,7 +28,7 @@
SBS_HOME=${SBS_HOME//\\//}
__CYGWIN__=${SBS_CYGWIN:-$SBS_HOME/$HOSTPLATFORM_DIR/cygwin}
- __PYTHON__=${SBS_PYTHON:-$SBS_HOME/$HOSTPLATFORM_DIR/python252/python.exe}
+ __PYTHON__=${SBS_PYTHON:-$SBS_HOME/$HOSTPLATFORM_DIR/python264/python.exe}
# Unify paths.
--- a/sbsv2/raptor/test/smoke_suite/whatlog_cache.py Wed Feb 17 12:58:38 2010 +0000
+++ b/sbsv2/raptor/test/smoke_suite/whatlog_cache.py Wed Feb 17 16:53:22 2010 +0000
@@ -28,7 +28,7 @@
if 'SBS_PYTHON' in os.environ:
pythonRun = "$(SBS_PYTHON)"
else:
- pythonRun = "$(SBS_HOME)/win32/python252/python.exe"
+ pythonRun = "$(SBS_HOME)/win32/python264/python.exe"
# Build something using the .whatlog variant. Take the build log and give it to sbsv2cache.py, deducing
# the location of the generated cache file from the verbose output. If generated, dump the cache file to