Merge tag 'upstream/2.3.0'

Upstream version 2.3.0

1 files changed, 4 insertions, 4 deletions

diff --git a/script/scons.bat b/script/scons.bat
index caef40f..ca307b9 100644
--- a/script/scons.bat
+++ b/script/scons.bat
@@ -1,11 +1,11 @@
-@REM Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 The SCons Foundation

-@REM src/script/scons.bat issue-2856:2676:d23b7a2f45e8 2012/08/05 15:38:28 garyo

+@REM Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation

+@REM src/script/scons.bat  2013/03/03 09:48:35 garyo

 @echo off

 set SCONS_ERRORLEVEL=

 if "%OS%" == "Windows_NT" goto WinNT

 

 @REM for 9x/Me you better not have more than 9 args

-python -c "from os.path import join; import sys; sys.path = [ join(sys.prefix, 'Lib', 'site-packages', 'scons-2.2.0'), join(sys.prefix, 'Lib', 'site-packages', 'scons'), join(sys.prefix, 'scons-2.2.0'), join(sys.prefix, 'scons')] + sys.path; import SCons.Script; SCons.Script.main()" %1 %2 %3 %4 %5 %6 %7 %8 %9

+python -c "from os.path import join; import sys; sys.path = [ join(sys.prefix, 'Lib', 'site-packages', 'scons-2.3.0'), join(sys.prefix, 'Lib', 'site-packages', 'scons'), join(sys.prefix, 'scons-2.3.0'), join(sys.prefix, 'scons')] + sys.path; import SCons.Script; SCons.Script.main()" %1 %2 %3 %4 %5 %6 %7 %8 %9

 @REM no way to set exit status of this script for 9x/Me

 goto endscons

 

@@ -19,7 +19,7 @@ setlocal
 set path=%~dp0;%~dp0..;%path%

 @REM try the script named as the .bat file in current dir, then in Scripts subdir

 set scriptname=%~dp0%~n0.py

-if not exist %scriptname% set scriptname=%~dp0Scripts\%~n0.py

+if not exist "%scriptname%" set scriptname=%~dp0Scripts\%~n0.py

 python "%scriptname%" %*

 endlocal & set SCONS_ERRORLEVEL=%ERRORLEVEL%