Merge branch 'release/debian/3.1.0+repack-1'debian/3.1.0+repack-1

1 files changed, 8 insertions, 4 deletions

diff --git a/src/script/scons.bat b/src/script/scons.bat
index f759e43..75e2a49 100644
--- a/src/script/scons.bat
+++ b/src/script/scons.bat
@@ -1,11 +1,11 @@
-@REM Copyright (c) 2001 - 2017 The SCons Foundation

-@REM src/script/scons.bat rel_3.0.0:4395:8972f6a2f699 2017/09/18 12:59:24 bdbaddog

+@REM Copyright (c) 2001 - 2019 The SCons Foundation

+@REM src/script/scons.bat e724ae812eb96f4858a132f5b8c769724744faf6 2019-07-21 00:04:47 bdeegan

 @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-3.0.0'), join(sys.prefix, 'Lib', 'site-packages', 'scons'), join(sys.prefix, 'scons-3.0.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-3.1.0'), join(sys.prefix, 'Lib', 'site-packages', 'scons'), join(sys.prefix, 'scons-3.1.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

 

@@ -16,10 +16,14 @@ goto endscons
 :WinNT

 setlocal

 @REM ensure the script will be executed with the Python it was installed for

-set path=%~dp0;%~dp0..;%path%

+pushd %~dp0..

+set path=%~dp0;%CD%;%path%

+popd

 @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

+@REM Handle when running from wheel where the script has no .py extension

+if not exist "%scriptname%" set scriptname=%~dp0%~n0

 python "%scriptname%" %*

 endlocal & set SCONS_ERRORLEVEL=%ERRORLEVEL%