# HG changeset patch
# User timothy.murphy@nokia.com
# Date 1263945285 0
# Node ID d082b140eb980cd7d5301219c050339cb3b5776e
# Parent  72c10aee0d00517d8e04969b2793c62b43d036c3
Default embedded Python to 2.6.4 on Windows as on Linux.

diff -r 72c10aee0d00 -r d082b140eb98 sbsv2/raptor/RELEASE-NOTES.txt
--- a/sbsv2/raptor/RELEASE-NOTES.txt	Tue Jan 19 20:54:38 2010 +0000
+++ b/sbsv2/raptor/RELEASE-NOTES.txt	Tue Jan 19 23:54:45 2010 +0000
@@ -3,10 +3,14 @@
 
 Next version
 
-SF bug 1570: Adding then removing a capability can produce incorrect result: e.g. ALL TCB -TCB becomes ALL -TCB but it should be just ALL
+- Default to using Python 2.6.4 on windows (no change in compatibility with 
+  older versions of Python).
+- SF bug 1570: Adding then removing a capability can produce incorrect 
+  result: e.g. ALL TCB -TCB becomes ALL -TCB but it should be just ALL
 - Combine Linking and Postlinking into a single step
 - New 'Patchable Constants' target type: TARGETTYPE pdll
-- Support exit codes from next version of the trace compiler which will issue them
+- Support exit codes from next version of the trace compiler which will issue 
+  them
 - New sbs_filter script and batchfile to ease the use of sbs_filter.py.  
     Allows filters to be executed over a log after a build has been done.
     e.g.
diff -r 72c10aee0d00 -r d082b140eb98 sbsv2/raptor/bin/sbs.bat
--- a/sbsv2/raptor/bin/sbs.bat	Tue Jan 19 20:54:38 2010 +0000
+++ b/sbsv2/raptor/bin/sbs.bat	Tue Jan 19 23:54:45 2010 +0000
@@ -30,9 +30,9 @@
 
 @REM Use the python set by the environment if possible
 @SET __PYTHON__=%SBS_PYTHON%
-@IF "%__PYTHON__%"=="" SET __PYTHON__=%SBS_HOME%\win32\python252\python.exe
+@IF "%__PYTHON__%"=="" SET __PYTHON__=%SBS_HOME%\win32\python264\python.exe
 @SET PYTHONPATH=%SBS_PYTHONPATH%
-@IF "%PYTHONPATH%"=="" SET PYTHONPATH=%SBS_HOME%\win32\python252
+@IF "%PYTHONPATH%"=="" SET PYTHONPATH=%SBS_HOME%\win32\python264
 
 @REM Use the mingw set by the environment if possible
 @SET __MINGW__=%SBS_MINGW%
diff -r 72c10aee0d00 -r d082b140eb98 sbsv2/raptor/lib/config/locations.xml
--- a/sbsv2/raptor/lib/config/locations.xml	Tue Jan 19 20:54:38 2010 +0000
+++ b/sbsv2/raptor/lib/config/locations.xml	Tue Jan 19 23:54:45 2010 +0000
@@ -72,7 +72,7 @@
 		<env name='SBS_UNZIP' default="$(COREUTILSBINDIR)/unzip.exe" type='tool'/>
 		<env name='SBS_BVCPP' default="$(SBS_HOME)/$(HOSTPLATFORM_DIR)/bv/bin/cpp.exe" type='tool'/>
 		<env name='SBS_PERL' default='perl.exe' type='tool'/>
-		<env name='SBS_PYTHON' default='$(SBS_HOME)/$(HOSTPLATFORM_DIR)/python252/python.exe' type='tool'/>
+		<env name='SBS_PYTHON' default='$(SBS_HOME)/$(HOSTPLATFORM_DIR)/python264/python.exe' type='tool'/>
 	</var>
 
 	<var name="default.locations" extends="hostplatform.locations">