# HG changeset patch
# User timothy.murphy@nokia.com
# Date 1267698525 0
# Node ID fad68f1948078ae81080591134f7ef5cfcd086e7
# Parent  2257b1af191f718602953cd0055a2eb876f5e464# Parent  962ef461eccd28ce49f40ee8cf5180856f1b7e03
Merge

diff -r 962ef461eccd -r fad68f194807 sbsv2/raptor/bin/sbs
--- a/sbsv2/raptor/bin/sbs	Thu Mar 04 10:27:43 2010 +0000
+++ b/sbsv2/raptor/bin/sbs	Thu Mar 04 10:28:45 2010 +0000
@@ -91,6 +91,7 @@
 		__PYTHON__=$SBS_PYTHON
 	elif [ -f "$__LOCAL_PYTHON__" ]; then
 		__PYTHON__=$__LOCAL_PYTHON__
+		export SBS_PYTHON=$__PYTHON__
 		export PYTHONPATH=
 	else
 		__PYTHON__=python.exe
diff -r 962ef461eccd -r fad68f194807 sbsv2/raptor/bin/sbs.bat
--- a/sbsv2/raptor/bin/sbs.bat	Thu Mar 04 10:27:43 2010 +0000
+++ b/sbsv2/raptor/bin/sbs.bat	Thu Mar 04 10:28:45 2010 +0000
@@ -45,6 +45,7 @@
 
 :localpython
 @SET __PYTHON__=%__LOCAL_PYTHON__%
+@SET SBS_PYTHON=%__PYTHON__%
 @SET PYTHONPATH=
 
 :sbspythonpath
@@ -73,7 +74,7 @@
 
 @REM Tell CYGWIN not to map unix security attributes to windows to
 @REM prevent raptor from potentially creating read-only files:
-@set CYGWIN=nontsec nosmbntsec
+@SET CYGWIN=nontsec nosmbntsec
 
 @REM Run Raptor with all the arguments.
 @%__PYTHON__% %SBS_HOME%\python\raptor_start.py %*
diff -r 962ef461eccd -r fad68f194807 sbsv2/raptor/lib/config/locations.xml
--- a/sbsv2/raptor/lib/config/locations.xml	Thu Mar 04 10:27:43 2010 +0000
+++ b/sbsv2/raptor/lib/config/locations.xml	Thu Mar 04 10:28: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)/python264/python.exe' type='tool'/>
+		<env name='SBS_PYTHON' default='python.exe' type='tool'/>
 	</var>
 
 	<var name="default.locations" extends="hostplatform.locations">