summaryrefslogtreecommitdiff
path: root/src/third_party
diff options
context:
space:
mode:
authorMathew Robinson <mathew.robinson@mongodb.com>2019-12-20 14:03:04 +0000
committerevergreen <evergreen@mongodb.com>2019-12-20 14:03:04 +0000
commite57b8036c94546a6494e81d46f552f1c23841eda (patch)
treed095897cb550a79ec2b18d1ff3605264ef33381f /src/third_party
parentf3595d8e69c0b76a8bbe18f319e6e0c8f861072e (diff)
downloadmongo-e57b8036c94546a6494e81d46f552f1c23841eda.tar.gz
SERVER-45198 Upgrade SCons to 3.1.2
Diffstat (limited to 'src/third_party')
-rwxr-xr-xsrc/third_party/scons-3.1.2/scons-3.1.2.bat (renamed from src/third_party/scons-3.1.1/scons-3.1.1.bat)4
-rw-r--r--src/third_party/scons-3.1.2/scons-LICENSE (renamed from src/third_party/scons-3.1.1/scons-LICENSE)2
-rw-r--r--src/third_party/scons-3.1.2/scons-README (renamed from src/third_party/scons-3.1.1/scons-README)0
-rwxr-xr-xsrc/third_party/scons-3.1.2/scons-configure-cache.py (renamed from src/third_party/scons-3.1.1/scons-configure-cache.py)8
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Action.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Action.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Builder.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Builder.py)17
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/CacheDir.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/CacheDir.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Conftest.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Conftest.py)4
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Debug.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Debug.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Defaults.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Defaults.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Environment.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Environment.py)220
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Errors.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Errors.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Executor.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Executor.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Job.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Job.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Memoize.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Memoize.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Node/Alias.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Node/Alias.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Node/FS.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Node/FS.py)27
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Node/Python.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Node/Python.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Node/__init__.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Node/__init__.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/PathList.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/PathList.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Platform/__init__.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Platform/__init__.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Platform/aix.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Platform/aix.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Platform/cygwin.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Platform/cygwin.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Platform/darwin.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Platform/darwin.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Platform/hpux.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Platform/hpux.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Platform/irix.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Platform/irix.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Platform/mingw.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Platform/mingw.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Platform/os2.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Platform/os2.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Platform/posix.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Platform/posix.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Platform/sunos.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Platform/sunos.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Platform/virtualenv.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Platform/virtualenv.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Platform/win32.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Platform/win32.py)60
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/SConf.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/SConf.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/SConsign.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/SConsign.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Scanner/C.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Scanner/C.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Scanner/D.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Scanner/D.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Scanner/Dir.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Scanner/Dir.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Scanner/Fortran.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Scanner/Fortran.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Scanner/IDL.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Scanner/IDL.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Scanner/LaTeX.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Scanner/LaTeX.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Scanner/Prog.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Scanner/Prog.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Scanner/RC.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Scanner/RC.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Scanner/SWIG.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Scanner/SWIG.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Scanner/__init__.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Scanner/__init__.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Script/Interactive.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Script/Interactive.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Script/Main.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Script/Main.py)11
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Script/SConsOptions.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Script/SConsOptions.py)24
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Script/SConscript.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Script/SConscript.py)26
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Script/__init__.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Script/__init__.py)5
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Subst.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Subst.py)4
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Taskmaster.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Taskmaster.py)8
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/386asm.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/386asm.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/DCommon.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/DCommon.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/FortranCommon.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/FortranCommon.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/GettextCommon.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/GettextCommon.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/JavaCommon.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/JavaCommon.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/MSCommon/__init__.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/MSCommon/__init__.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/MSCommon/arch.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/MSCommon/arch.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/MSCommon/common.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/MSCommon/common.py)60
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/MSCommon/netframework.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/MSCommon/netframework.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/MSCommon/sdk.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/MSCommon/sdk.py)32
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/MSCommon/vc.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/MSCommon/vc.py)129
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/MSCommon/vs.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/MSCommon/vs.py)6
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/PharLapCommon.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/PharLapCommon.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/__init__.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/__init__.py)4
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/aixc++.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/aixc++.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/aixcc.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/aixcc.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/aixcxx.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/aixcxx.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/aixf77.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/aixf77.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/aixlink.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/aixlink.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/applelink.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/applelink.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/ar.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/ar.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/as.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/as.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/bcc32.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/bcc32.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/c++.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/c++.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/cc.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/cc.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/clang.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/clang.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/clangCommon/__init__.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/clangCommon/__init__.py)0
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/clangxx.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/clangxx.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/cvf.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/cvf.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/cxx.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/cxx.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/cyglink.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/cyglink.py)0
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/default.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/default.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/dmd.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/dmd.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/docbook/__init__.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/docbook/__init__.py)0
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/dvi.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/dvi.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/dvipdf.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/dvipdf.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/dvips.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/dvips.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/f03.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/f03.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/f08.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/f08.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/f77.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/f77.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/f90.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/f90.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/f95.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/f95.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/filesystem.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/filesystem.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/fortran.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/fortran.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/g++.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/g++.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/g77.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/g77.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/gas.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/gas.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/gcc.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/gcc.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/gdc.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/gdc.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/gettext_tool.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/gettext_tool.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/gfortran.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/gfortran.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/gnulink.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/gnulink.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/gs.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/gs.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/gxx.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/gxx.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/hpc++.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/hpc++.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/hpcc.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/hpcc.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/hpcxx.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/hpcxx.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/hplink.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/hplink.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/icc.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/icc.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/icl.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/icl.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/ifl.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/ifl.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/ifort.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/ifort.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/ilink.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/ilink.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/ilink32.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/ilink32.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/install.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/install.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/intelc.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/intelc.py)6
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/ipkg.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/ipkg.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/jar.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/jar.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/javac.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/javac.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/javah.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/javah.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/latex.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/latex.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/ldc.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/ldc.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/lex.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/lex.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/link.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/link.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/linkloc.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/linkloc.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/m4.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/m4.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/masm.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/masm.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/midl.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/midl.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/mingw.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/mingw.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/msgfmt.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/msgfmt.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/msginit.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/msginit.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/msgmerge.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/msgmerge.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/mslib.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/mslib.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/mslink.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/mslink.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/mssdk.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/mssdk.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/msvc.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/msvc.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/msvs.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/msvs.py)8
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/mwcc.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/mwcc.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/mwld.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/mwld.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/nasm.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/nasm.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/packaging/__init__.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/packaging/__init__.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/packaging/ipk.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/packaging/ipk.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/packaging/msi.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/packaging/msi.py)4
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/packaging/rpm.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/packaging/rpm.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/packaging/src_tarbz2.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/packaging/src_tarbz2.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/packaging/src_targz.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/packaging/src_targz.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/packaging/src_tarxz.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/packaging/src_tarxz.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/packaging/src_zip.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/packaging/src_zip.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/packaging/tarbz2.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/packaging/tarbz2.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/packaging/targz.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/packaging/targz.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/packaging/tarxz.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/packaging/tarxz.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/packaging/zip.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/packaging/zip.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/pdf.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/pdf.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/pdflatex.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/pdflatex.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/pdftex.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/pdftex.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/qt.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/qt.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/rmic.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/rmic.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/rpcgen.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/rpcgen.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/rpm.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/rpm.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/rpmutils.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/rpmutils.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/sgiar.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/sgiar.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/sgic++.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/sgic++.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/sgicc.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/sgicc.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/sgicxx.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/sgicxx.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/sgilink.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/sgilink.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/sunar.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/sunar.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/sunc++.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/sunc++.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/suncc.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/suncc.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/suncxx.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/suncxx.py)39
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/sunf77.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/sunf77.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/sunf90.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/sunf90.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/sunf95.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/sunf95.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/sunlink.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/sunlink.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/swig.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/swig.py)4
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/tar.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/tar.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/tex.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/tex.py)6
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/textfile.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/textfile.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/tlib.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/tlib.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/wix.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/wix.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/xgettext.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/xgettext.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/yacc.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/yacc.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/zip.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/zip.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Util.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Util.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Variables/BoolVariable.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Variables/BoolVariable.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Variables/EnumVariable.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Variables/EnumVariable.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Variables/ListVariable.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Variables/ListVariable.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Variables/PackageVariable.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Variables/PackageVariable.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Variables/PathVariable.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Variables/PathVariable.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Variables/__init__.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Variables/__init__.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Warnings.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Warnings.py)20
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/__init__.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/__init__.py)8
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/__main__.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/__main__.py)0
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/compat/__init__.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/compat/__init__.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/compat/_scons_dbm.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/compat/_scons_dbm.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/cpp.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/cpp.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/dblite.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/dblite.py)0
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/exitfuncs.py (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/exitfuncs.py)2
-rw-r--r--src/third_party/scons-3.1.2/scons-local-3.1.2/scons-3.1.2.egg-info (renamed from src/third_party/scons-3.1.1/scons-local-3.1.1/scons-3.1.1.egg-info)2
-rwxr-xr-xsrc/third_party/scons-3.1.2/scons-time.py (renamed from src/third_party/scons-3.1.1/scons-time.py)26
-rwxr-xr-xsrc/third_party/scons-3.1.2/scons.bat (renamed from src/third_party/scons-3.1.1/scons.bat)4
-rwxr-xr-xsrc/third_party/scons-3.1.2/scons.py (renamed from src/third_party/scons-3.1.1/scons.py)8
-rwxr-xr-xsrc/third_party/scons-3.1.2/sconsign.py (renamed from src/third_party/scons-3.1.1/sconsign.py)8
203 files changed, 592 insertions, 532 deletions
diff --git a/src/third_party/scons-3.1.1/scons-3.1.1.bat b/src/third_party/scons-3.1.2/scons-3.1.2.bat
index a5b1b6e64ff..dc671889f63 100755
--- a/src/third_party/scons-3.1.1/scons-3.1.1.bat
+++ b/src/third_party/scons-3.1.2/scons-3.1.2.bat
@@ -1,11 +1,11 @@
@REM Copyright (c) 2001 - 2019 The SCons Foundation
-@REM src/script/scons.bat 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan
+@REM src/script/scons.bat bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 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.1.1'), join(sys.prefix, 'Lib', 'site-packages', 'scons'), join(sys.prefix, 'scons-3.1.1'), 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.2'), join(sys.prefix, 'Lib', 'site-packages', 'scons'), join(sys.prefix, 'scons-3.1.2'), 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
diff --git a/src/third_party/scons-3.1.1/scons-LICENSE b/src/third_party/scons-3.1.2/scons-LICENSE
index e7268d5e2dc..9f6ec757710 100644
--- a/src/third_party/scons-3.1.1/scons-LICENSE
+++ b/src/third_party/scons-3.1.2/scons-LICENSE
@@ -3,6 +3,8 @@
This copyright and license do not apply to any other software
with which this software may have been included.
+MIT License
+
Copyright (c) 2001 - 2019 The SCons Foundation
Permission is hereby granted, free of charge, to any person obtaining
diff --git a/src/third_party/scons-3.1.1/scons-README b/src/third_party/scons-3.1.2/scons-README
index 301b50684d1..301b50684d1 100644
--- a/src/third_party/scons-3.1.1/scons-README
+++ b/src/third_party/scons-3.1.2/scons-README
diff --git a/src/third_party/scons-3.1.1/scons-configure-cache.py b/src/third_party/scons-3.1.2/scons-configure-cache.py
index 8bce553fe3f..ee11943a0a8 100755
--- a/src/third_party/scons-3.1.1/scons-configure-cache.py
+++ b/src/third_party/scons-3.1.2/scons-configure-cache.py
@@ -37,15 +37,15 @@ import glob
import json
import os
-__revision__ = "src/script/scons-configure-cache.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/script/scons-configure-cache.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
-__version__ = "3.1.1"
+__version__ = "3.1.2"
-__build__ = "72ae09dc35ac2626f8ff711d8c4b30b6138e08e3"
+__build__ = "bee7caf9defd6e108fc2998a2520ddb36a967691"
__buildsys__ = "octodog"
-__date__ = "2019-08-08 14:50:06"
+__date__ = "2019-12-17 02:07:09"
__developer__ = "bdeegan"
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Action.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Action.py
index be4a5ff90cc..b4310f6e407 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Action.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Action.py
@@ -98,7 +98,7 @@ way for wrapping up the functions.
# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-__revision__ = "src/engine/SCons/Action.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Action.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import os
import pickle
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Builder.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Builder.py
index c3bdf5c6782..e4e521542cb 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Builder.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Builder.py
@@ -98,7 +98,7 @@ There are the following methods for internal use within this module:
# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-__revision__ = "src/engine/SCons/Builder.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Builder.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import collections
@@ -396,16 +396,13 @@ class BuilderBase(object):
self.env = env
self.single_source = single_source
if 'overrides' in overrides:
- SCons.Warnings.warn(SCons.Warnings.DeprecatedBuilderKeywordsWarning,
- "The \"overrides\" keyword to Builder() creation has been deprecated;\n" +\
- "\tspecify the items as keyword arguments to the Builder() call instead.")
- overrides.update(overrides['overrides'])
- del overrides['overrides']
+ msg = "The \"overrides\" keyword to Builder() creation has been removed;\n" +\
+ "\tspecify the items as keyword arguments to the Builder() call instead."
+ raise TypeError(msg)
if 'scanner' in overrides:
- SCons.Warnings.warn(SCons.Warnings.DeprecatedBuilderKeywordsWarning,
- "The \"scanner\" keyword to Builder() creation has been deprecated;\n"
- "\tuse: source_scanner or target_scanner as appropriate.")
- del overrides['scanner']
+ msg = "The \"scanner\" keyword to Builder() creation has been removed;\n" +\
+ "\tuse: source_scanner or target_scanner as appropriate."
+ raise TypeError(msg)
self.overrides = overrides
self.set_suffix(suffix)
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/CacheDir.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/CacheDir.py
index a1133aed82b..20a7df4b898 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/CacheDir.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/CacheDir.py
@@ -21,7 +21,7 @@
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/CacheDir.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/CacheDir.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
__doc__ = """
CacheDir support
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Conftest.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Conftest.py
index 1163aa36c09..c24adf8c3f5 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Conftest.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Conftest.py
@@ -290,6 +290,10 @@ char %s();""" % function_name
#include <assert.h>
%(hdr)s
+#if _MSC_VER && !__INTEL_COMPILER
+ #pragma function(%(name)s)
+#endif
+
int main(void) {
#if defined (__stub_%(name)s) || defined (__stub___%(name)s)
fail fail fail
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Debug.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Debug.py
index 12d07fdbaf7..ef7dfffe8fd 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Debug.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Debug.py
@@ -31,7 +31,7 @@ caller_trace()
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Debug.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Debug.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import os
import sys
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Defaults.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Defaults.py
index 63ba450b348..c39c4176475 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Defaults.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Defaults.py
@@ -33,7 +33,7 @@ from distutils.msvccompiler.
#
from __future__ import division
-__revision__ = "src/engine/SCons/Defaults.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Defaults.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import os
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Environment.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Environment.py
index 7a0954d38cc..c51df4009e3 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Environment.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Environment.py
@@ -31,7 +31,7 @@ Environment
# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-__revision__ = "src/engine/SCons/Environment.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Environment.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import copy
@@ -46,7 +46,7 @@ import SCons.Builder
import SCons.Debug
from SCons.Debug import logInstanceCreation
import SCons.Defaults
-import SCons.Errors
+from SCons.Errors import UserError, BuildError
import SCons.Memoize
import SCons.Node
import SCons.Node.Alias
@@ -75,11 +75,6 @@ CalculatorArgs = {}
semi_deepcopy = SCons.Util.semi_deepcopy
semi_deepcopy_dict = SCons.Util.semi_deepcopy_dict
-# Pull UserError into the global name space for the benefit of
-# Environment().SourceSignatures(), which has some import statements
-# which seem to mess up its ability to reference SCons directly.
-UserError = SCons.Errors.UserError
-
def alias_builder(env, target, source):
pass
@@ -154,7 +149,7 @@ def _set_BUILDERS(env, key, value):
env._dict[key] = bd
for k, v in value.items():
if not SCons.Builder.is_a_Builder(v):
- raise SCons.Errors.UserError('%s is not a Builder.' % repr(v))
+ raise UserError('%s is not a Builder.' % repr(v))
bd.update(value)
def _del_SCANNERS(env, key):
@@ -431,7 +426,7 @@ class SubstitutionEnvironment(object):
# efficient than calling another function or a method.
if key not in self._dict \
and not _is_valid_var.match(key):
- raise SCons.Errors.UserError("Illegal construction variable `%s'" % key)
+ raise UserError("Illegal construction variable `%s'" % key)
self._dict[key] = value
def get(self, key, default=None):
@@ -707,31 +702,34 @@ class SubstitutionEnvironment(object):
append_next_arg_to = None # for multi-word args
for arg in params:
if append_next_arg_to:
- if append_next_arg_to == 'CPPDEFINES':
- append_define(arg)
- elif append_next_arg_to == '-include':
- t = ('-include', self.fs.File(arg))
- dict['CCFLAGS'].append(t)
- elif append_next_arg_to == '-isysroot':
- t = ('-isysroot', arg)
- dict['CCFLAGS'].append(t)
- dict['LINKFLAGS'].append(t)
- elif append_next_arg_to == '-isystem':
- t = ('-isystem', arg)
- dict['CCFLAGS'].append(t)
- elif append_next_arg_to == '-iquote':
- t = ('-iquote', arg)
- dict['CCFLAGS'].append(t)
- elif append_next_arg_to == '-idirafter':
- t = ('-idirafter', arg)
- dict['CCFLAGS'].append(t)
- elif append_next_arg_to == '-arch':
- t = ('-arch', arg)
- dict['CCFLAGS'].append(t)
- dict['LINKFLAGS'].append(t)
- else:
- dict[append_next_arg_to].append(arg)
- append_next_arg_to = None
+ if append_next_arg_to == 'CPPDEFINES':
+ append_define(arg)
+ elif append_next_arg_to == '-include':
+ t = ('-include', self.fs.File(arg))
+ dict['CCFLAGS'].append(t)
+ elif append_next_arg_to == '-imacros':
+ t = ('-imacros', self.fs.File(arg))
+ dict['CCFLAGS'].append(t)
+ elif append_next_arg_to == '-isysroot':
+ t = ('-isysroot', arg)
+ dict['CCFLAGS'].append(t)
+ dict['LINKFLAGS'].append(t)
+ elif append_next_arg_to == '-isystem':
+ t = ('-isystem', arg)
+ dict['CCFLAGS'].append(t)
+ elif append_next_arg_to == '-iquote':
+ t = ('-iquote', arg)
+ dict['CCFLAGS'].append(t)
+ elif append_next_arg_to == '-idirafter':
+ t = ('-idirafter', arg)
+ dict['CCFLAGS'].append(t)
+ elif append_next_arg_to == '-arch':
+ t = ('-arch', arg)
+ dict['CCFLAGS'].append(t)
+ dict['LINKFLAGS'].append(t)
+ else:
+ dict[append_next_arg_to].append(arg)
+ append_next_arg_to = None
elif not arg[0] in ['-', '+']:
dict['LIBS'].append(self.fs.File(arg))
elif arg == '-dylib_file':
@@ -790,7 +788,7 @@ class SubstitutionEnvironment(object):
elif arg == '-mwindows':
dict['LINKFLAGS'].append(arg)
elif arg[:5] == '-std=':
- if arg[5:].find('++')!=-1:
+ if '++' in arg[5:]:
key='CXXFLAGS'
else:
key='CFLAGS'
@@ -798,7 +796,7 @@ class SubstitutionEnvironment(object):
elif arg[0] == '+':
dict['CCFLAGS'].append(arg)
dict['LINKFLAGS'].append(arg)
- elif arg in ['-include', '-isysroot', '-isystem', '-iquote', '-idirafter', '-arch']:
+ elif arg in ['-include', '-imacros', '-isysroot', '-isystem', '-iquote', '-idirafter', '-arch']:
append_next_arg_to = arg
else:
dict['CCFLAGS'].append(arg)
@@ -1430,14 +1428,6 @@ class Base(SubstitutionEnvironment):
if SCons.Debug.track_instances: logInstanceCreation(self, 'Environment.EnvironmentClone')
return clone
- def Copy(self, *args, **kw):
- global _warn_copy_deprecated
- if _warn_copy_deprecated:
- msg = "The env.Copy() method is deprecated; use the env.Clone() method instead."
- SCons.Warnings.warn(SCons.Warnings.DeprecatedCopyWarning, msg)
- _warn_copy_deprecated = False
- return self.Clone(*args, **kw)
-
def _changed_build(self, dependency, target, prev_ni, repo_node=None):
if dependency.changed_state(target, prev_ni, repo_node):
return 1
@@ -1493,8 +1483,14 @@ class Base(SubstitutionEnvironment):
self.copy_from_cache = copy_function
+
def Detect(self, progs):
"""Return the first available program in progs.
+
+ :param progs: one or more command names to check for
+ :type progs: str or list
+ :returns str: first name from progs that can be found.
+
"""
if not SCons.Util.is_List(progs):
progs = [ progs ]
@@ -1503,7 +1499,17 @@ class Base(SubstitutionEnvironment):
if path: return prog
return None
+
def Dictionary(self, *args):
+ """Return construction variables from an environment.
+
+ :param *args: (optional) variable names to look up
+ :returns: if args omitted, the dictionary of all constr. vars.
+ If one arg, the corresponding value is returned.
+ If more than one arg, a list of values is returned.
+ :raises KeyError: if any of *args is not in the construction env.
+
+ """
if not args:
return self._dict
dlist = [self._dict[x] for x in args]
@@ -1511,23 +1517,28 @@ class Base(SubstitutionEnvironment):
dlist = dlist[0]
return dlist
- def Dump(self, key = None):
- """
- Using the standard Python pretty printer, return the contents of the
- scons build environment as a string.
- If the key passed in is anything other than None, then that will
- be used as an index into the build environment dictionary and
- whatever is found there will be fed into the pretty printer. Note
- that this key is case sensitive.
+ def Dump(self, key=None):
+ """ Return pretty-printed string of construction variables.
+
+ :param key: if None, format the whole dict of variables.
+ Else look up and format just the value for key.
+
"""
import pprint
pp = pprint.PrettyPrinter(indent=2)
if key:
- dict = self.Dictionary(key)
+ cvars = self.Dictionary(key)
else:
- dict = self.Dictionary()
- return pp.pformat(dict)
+ cvars = self.Dictionary()
+
+ # TODO: pprint doesn't do a nice job on path-style values
+ # if the paths contain spaces (i.e. Windows), because the
+ # algorithm tries to break lines on spaces, while breaking
+ # on the path-separator would be more "natural". Is there
+ # a better way to format those?
+ return pp.pformat(cvars)
+
def FindIxes(self, paths, prefix, suffix):
"""
@@ -1600,7 +1611,7 @@ class Base(SubstitutionEnvironment):
for td in tdlist:
targets.extend(td[0])
if len(targets) > 1:
- raise SCons.Errors.UserError(
+ raise UserError(
"More than one dependency target found in `%s': %s"
% (filename, targets))
for target, depends in tdlist:
@@ -1918,14 +1929,6 @@ class Base(SubstitutionEnvironment):
t.set_always_build()
return tlist
- def BuildDir(self, *args, **kw):
- msg = """BuildDir() and the build_dir keyword have been deprecated;\n\tuse VariantDir() and the variant_dir keyword instead."""
- SCons.Warnings.warn(SCons.Warnings.DeprecatedBuildDirWarning, msg)
- if 'build_dir' in kw:
- kw['variant_dir'] = kw['build_dir']
- del kw['build_dir']
- return self.VariantDir(*args, **kw)
-
def Builder(self, **kw):
nkw = self.subst_kw(kw)
return SCons.Builder.Builder(**nkw)
@@ -1964,13 +1967,42 @@ class Base(SubstitutionEnvironment):
be any type that the Builder constructor will accept
for an action."""
bkw = {
- 'action' : action,
- 'target_factory' : self.fs.Entry,
- 'source_factory' : self.fs.Entry,
+ 'action': action,
+ 'target_factory': self.fs.Entry,
+ 'source_factory': self.fs.Entry,
}
- try: bkw['source_scanner'] = kw['source_scanner']
- except KeyError: pass
- else: del kw['source_scanner']
+ # source scanner
+ try:
+ bkw['source_scanner'] = kw['source_scanner']
+ except KeyError:
+ pass
+ else:
+ del kw['source_scanner']
+
+ # target scanner
+ try:
+ bkw['target_scanner'] = kw['target_scanner']
+ except KeyError:
+ pass
+ else:
+ del kw['target_scanner']
+
+ # source factory
+ try:
+ bkw['source_factory'] = kw['source_factory']
+ except KeyError:
+ pass
+ else:
+ del kw['source_factory']
+
+ # target factory
+ try:
+ bkw['target_factory'] = kw['target_factory']
+ except KeyError:
+ pass
+ else:
+ del kw['target_factory']
+
bld = SCons.Builder.Builder(**bkw)
return bld(self, target, source, **kw)
@@ -2039,7 +2071,7 @@ class Base(SubstitutionEnvironment):
"""
action = self.Action(action, *args, **kw)
result = action([], [], self)
- if isinstance(result, SCons.Errors.BuildError):
+ if isinstance(result, BuildError):
errstr = result.errstr
if result.filename:
errstr = result.filename + ': ' + errstr
@@ -2159,7 +2191,7 @@ class Base(SubstitutionEnvironment):
for side_effect in side_effects:
if side_effect.multiple_side_effect_has_builder():
- raise SCons.Errors.UserError("Multiple ways to build the same target were specified for: %s" % str(side_effect))
+ raise UserError("Multiple ways to build the same target were specified for: %s" % str(side_effect))
side_effect.add_source(targets)
side_effect.side_effect = 1
self.Precious(side_effect)
@@ -2177,24 +2209,6 @@ class Base(SubstitutionEnvironment):
entry.set_src_builder(builder)
return entries
- def SourceSignatures(self, type):
- global _warn_source_signatures_deprecated
- if _warn_source_signatures_deprecated:
- msg = "The env.SourceSignatures() method is deprecated;\n" + \
- "\tconvert your build to use the env.Decider() method instead."
- SCons.Warnings.warn(SCons.Warnings.DeprecatedSourceSignaturesWarning, msg)
- _warn_source_signatures_deprecated = False
- type = self.subst(type)
- self.src_sig_type = type
- if type == 'MD5':
- if not SCons.Util.md5:
- raise UserError("MD5 signatures are not available in this version of Python.")
- self.decide_source = self._changed_content
- elif type == 'timestamp':
- self.decide_source = self._changed_timestamp_match
- else:
- raise UserError("Unknown source signature type '%s'" % type)
-
def Split(self, arg):
"""This function converts a string or list into a list of strings
or Nodes. This makes things easier for users by allowing files to
@@ -2216,28 +2230,6 @@ class Base(SubstitutionEnvironment):
else:
return [self.subst(arg)]
- def TargetSignatures(self, type):
- global _warn_target_signatures_deprecated
- if _warn_target_signatures_deprecated:
- msg = "The env.TargetSignatures() method is deprecated;\n" + \
- "\tconvert your build to use the env.Decider() method instead."
- SCons.Warnings.warn(SCons.Warnings.DeprecatedTargetSignaturesWarning, msg)
- _warn_target_signatures_deprecated = False
- type = self.subst(type)
- self.tgt_sig_type = type
- if type in ('MD5', 'content'):
- if not SCons.Util.md5:
- raise UserError("MD5 signatures are not available in this version of Python.")
- self.decide_target = self._changed_content
- elif type == 'timestamp':
- self.decide_target = self._changed_timestamp_match
- elif type == 'build':
- self.decide_target = self._changed_build
- elif type == 'source':
- self.decide_target = self._changed_source
- else:
- raise UserError("Unknown target signature type '%s'"%type)
-
def Value(self, value, built_value=None):
"""
"""
@@ -2322,7 +2314,7 @@ class OverrideEnvironment(Base):
return attr.clone(self)
else:
return attr
-
+
def __setattr__(self, name, value):
setattr(self.__dict__['__subject'], name, value)
@@ -2334,7 +2326,7 @@ class OverrideEnvironment(Base):
return self.__dict__['__subject'].__getitem__(key)
def __setitem__(self, key, value):
if not is_valid_construction_var(key):
- raise SCons.Errors.UserError("Illegal construction variable `%s'" % key)
+ raise UserError("Illegal construction variable `%s'" % key)
self.__dict__['overrides'][key] = value
def __delitem__(self, key):
try:
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Errors.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Errors.py
index d6e1d4a2727..0bad46d151b 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Errors.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Errors.py
@@ -28,7 +28,7 @@ and user errors in SCons.
"""
-__revision__ = "src/engine/SCons/Errors.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Errors.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import shutil
import SCons.Util
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Executor.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Executor.py
index c3e22f5a103..5c95e95c54e 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Executor.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Executor.py
@@ -28,7 +28,7 @@ Nodes.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
from __future__ import print_function
-__revision__ = "src/engine/SCons/Executor.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Executor.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import collections
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Job.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Job.py
index a126d1c40fb..214a0c9fb83 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Job.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Job.py
@@ -29,7 +29,7 @@ stop, and wait on jobs.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Job.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Job.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import SCons.compat
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Memoize.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Memoize.py
index 6bef437c444..8f33a1be211 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Memoize.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Memoize.py
@@ -22,7 +22,7 @@
#
from __future__ import print_function
-__revision__ = "src/engine/SCons/Memoize.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Memoize.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
__doc__ = """Memoizer
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Node/Alias.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Node/Alias.py
index 302a7044d13..5c62677cda3 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Node/Alias.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Node/Alias.py
@@ -30,7 +30,7 @@ This creates a hash of global Aliases (dummy targets).
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Node/Alias.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Node/Alias.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import collections
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Node/FS.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Node/FS.py
index 19565f63c86..65d1ac14296 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Node/FS.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Node/FS.py
@@ -33,7 +33,7 @@ that can be used by scripts or modules looking for the canonical default.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
from __future__ import print_function
-__revision__ = "src/engine/SCons/Node/FS.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Node/FS.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import fnmatch
import os
@@ -58,15 +58,6 @@ import SCons.Warnings
from SCons.Debug import Trace
-# SERVER-25436: to work around an issue with python on windows where shutil.copy<2> methods
-# didn't appropriately close files, which caused build failures with the cached build.
-if sys.platform == "win32":
- import win32api
- _copy = _copy2 = win32api.CopyFile
-else:
- _copy = shutil.copy
- _copy2 = shutil.copy2
-
print_duplicate = 0
MD5_TIMESTAMP_DEBUG = False
@@ -266,7 +257,7 @@ else:
_softlink_func = None
def _copy_func(fs, src, dest):
- _copy2(src, dest)
+ shutil.copy2(src, dest)
st = fs.stat(src)
fs.chmod(dest, stat.S_IMODE(st[stat.ST_MODE]) | stat.S_IWRITE)
@@ -972,14 +963,14 @@ class Entry(Base):
def disambiguate(self, must_exist=None):
"""
- """
- if self.isdir():
- self.__class__ = Dir
- self._morph()
- elif self.isfile():
+ """
+ if self.isfile():
self.__class__ = File
self._morph()
self.clear()
+ elif self.isdir():
+ self.__class__ = Dir
+ self._morph()
else:
# There was nothing on-disk at this location, so look in
# the src directory.
@@ -1103,9 +1094,9 @@ class LocalFS(object):
def chmod(self, path, mode):
return os.chmod(path, mode)
def copy(self, src, dst):
- return _copy(src, dst)
+ return shutil.copy(src, dst)
def copy2(self, src, dst):
- return _copy2(src, dst)
+ return shutil.copy2(src, dst)
def exists(self, path):
return os.path.exists(path)
def getmtime(self, path):
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Node/Python.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Node/Python.py
index 8726332fcfd..ec23b3fc186 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Node/Python.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Node/Python.py
@@ -27,7 +27,7 @@ Python nodes.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Node/Python.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Node/Python.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import SCons.Node
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Node/__init__.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Node/__init__.py
index 54792ed0f46..32f4bbaa778 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Node/__init__.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Node/__init__.py
@@ -43,7 +43,7 @@ from __future__ import print_function
# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-__revision__ = "src/engine/SCons/Node/__init__.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Node/__init__.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import os
import collections
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/PathList.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/PathList.py
index 8de79df7e93..ad029369f36 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/PathList.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/PathList.py
@@ -21,7 +21,7 @@
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/PathList.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/PathList.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
__doc__ = """SCons.PathList
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Platform/__init__.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Platform/__init__.py
index 66bff4911b6..2e3d6cd9b3f 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Platform/__init__.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Platform/__init__.py
@@ -43,7 +43,7 @@ their own platform definition.
#
from __future__ import print_function
-__revision__ = "src/engine/SCons/Platform/__init__.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Platform/__init__.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import SCons.compat
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Platform/aix.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Platform/aix.py
index de61c163926..c5964b6458a 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Platform/aix.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Platform/aix.py
@@ -30,7 +30,7 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Platform/aix.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Platform/aix.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import os
import subprocess
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Platform/cygwin.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Platform/cygwin.py
index d630be3fdab..fe71ea91cc3 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Platform/cygwin.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Platform/cygwin.py
@@ -30,7 +30,7 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Platform/cygwin.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Platform/cygwin.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import sys
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Platform/darwin.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Platform/darwin.py
index a5bfc5217a8..ff0d50dee5e 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Platform/darwin.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Platform/darwin.py
@@ -30,7 +30,7 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Platform/darwin.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Platform/darwin.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
from . import posix
import os
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Platform/hpux.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Platform/hpux.py
index d49d1a8f0cf..3158438ee39 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Platform/hpux.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Platform/hpux.py
@@ -30,7 +30,7 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Platform/hpux.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Platform/hpux.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
from . import posix
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Platform/irix.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Platform/irix.py
index 687f3e178ce..8643b14a0a5 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Platform/irix.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Platform/irix.py
@@ -30,7 +30,7 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Platform/irix.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Platform/irix.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
from . import posix
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Platform/mingw.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Platform/mingw.py
index 010e72adaf9..1961606a133 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Platform/mingw.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Platform/mingw.py
@@ -27,7 +27,7 @@ Platform-specific initialization for the MinGW system.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Platform/mingw.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Platform/mingw.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import sys
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Platform/os2.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Platform/os2.py
index bd414cf3edc..eb2c6798bbb 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Platform/os2.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Platform/os2.py
@@ -30,7 +30,7 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Platform/os2.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Platform/os2.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
from . import win32
def generate(env):
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Platform/posix.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Platform/posix.py
index c1e43ca364d..c9f9a2d57d7 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Platform/posix.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Platform/posix.py
@@ -30,7 +30,7 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Platform/posix.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Platform/posix.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import errno
import os
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Platform/sunos.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Platform/sunos.py
index a9a7d970f33..90418d5ceae 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Platform/sunos.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Platform/sunos.py
@@ -30,7 +30,7 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Platform/sunos.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Platform/sunos.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
from . import posix
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Platform/virtualenv.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Platform/virtualenv.py
index ae3068d57f1..3416b4153db 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Platform/virtualenv.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Platform/virtualenv.py
@@ -26,7 +26,7 @@ Support for virtualenv.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Platform/virtualenv.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Platform/virtualenv.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import os
import sys
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Platform/win32.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Platform/win32.py
index 3eff40f7c0b..b386aface40 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Platform/win32.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Platform/win32.py
@@ -30,7 +30,7 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Platform/win32.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Platform/win32.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import os
import os.path
@@ -51,10 +51,6 @@ try:
import msvcrt
import win32api
import win32con
-
- msvcrt.get_osfhandle
- win32api.SetHandleInformation
- win32con.HANDLE_FLAG_INHERIT
except ImportError:
parallel_msg = \
"you do not seem to have the pywin32 extensions installed;\n" + \
@@ -66,28 +62,44 @@ except AttributeError:
else:
parallel_msg = None
- _builtin_open = open
+ if sys.version_info.major == 2:
+ import __builtin__
+
+ _builtin_file = __builtin__.file
+ _builtin_open = __builtin__.open
+
+ def _scons_fixup_mode(mode):
+ """Adjust 'mode' to mark handle as non-inheritable.
+
+ SCons is multithreaded, so allowing handles to be inherited by
+ children opens us up to races, where (e.g.) processes spawned by
+ the Taskmaster may inherit and retain references to files opened
+ by other threads. This may lead to sharing violations and,
+ ultimately, build failures.
+
+ By including 'N' as part of fopen's 'mode' parameter, all file
+ handles returned from these functions are atomically marked as
+ non-inheritable.
+ """
+ if not mode:
+ # Python's default is 'r'.
+ # https://docs.python.org/2/library/functions.html#open
+ mode = 'rN'
+ elif 'N' not in mode:
+ mode += 'N'
+ return mode
- def _scons_open(*args, **kw):
- fp = _builtin_open(*args, **kw)
- win32api.SetHandleInformation(msvcrt.get_osfhandle(fp.fileno()),
- win32con.HANDLE_FLAG_INHERIT,
- 0)
- return fp
+ class _scons_file(_builtin_file):
+ def __init__(self, name, mode=None, *args, **kwargs):
+ _builtin_file.__init__(self, name, _scons_fixup_mode(mode),
+ *args, **kwargs)
- open = _scons_open
+ def _scons_open(name, mode=None, *args, **kwargs):
+ return _builtin_open(name, _scons_fixup_mode(mode),
+ *args, **kwargs)
- if sys.version_info.major == 2:
- _builtin_file = file
- class _scons_file(_builtin_file):
- def __init__(self, *args, **kw):
- _builtin_file.__init__(self, *args, **kw)
- win32api.SetHandleInformation(msvcrt.get_osfhandle(self.fileno()),
- win32con.HANDLE_FLAG_INHERIT, 0)
- file = _scons_file
- else:
- # No longer needed for python 3.4 and above. Files are opened non sharable
- pass
+ __builtin__.file = _scons_file
+ __builtin__.open = _scons_open
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/SConf.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/SConf.py
index c6bbda6149b..e714636d6ab 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/SConf.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/SConf.py
@@ -35,7 +35,7 @@ libraries are installed, if some command line options are supported etc.
#
from __future__ import print_function
-__revision__ = "src/engine/SCons/SConf.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/SConf.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import SCons.compat
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/SConsign.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/SConsign.py
index 157468ff3f3..24bfd216b6e 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/SConsign.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/SConsign.py
@@ -29,7 +29,7 @@ Writing and reading information to the .sconsign file or files.
from __future__ import print_function
-__revision__ = "src/engine/SCons/SConsign.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/SConsign.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import SCons.compat
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Scanner/C.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Scanner/C.py
index d3df545f062..32e0499a7eb 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Scanner/C.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Scanner/C.py
@@ -27,7 +27,7 @@ This module implements the dependency scanner for C/C++ code.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Scanner/C.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Scanner/C.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import SCons.Node.FS
import SCons.Scanner
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Scanner/D.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Scanner/D.py
index aa018d6d01c..427c596d459 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Scanner/D.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Scanner/D.py
@@ -30,7 +30,7 @@ Coded by Andy Friesen
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Scanner/D.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Scanner/D.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import SCons.Scanner
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Scanner/Dir.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Scanner/Dir.py
index 0c088206c8e..c3e825c442e 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Scanner/Dir.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Scanner/Dir.py
@@ -20,7 +20,7 @@
# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-__revision__ = "src/engine/SCons/Scanner/Dir.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Scanner/Dir.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import SCons.Node.FS
import SCons.Scanner
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Scanner/Fortran.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Scanner/Fortran.py
index 50cc16e96d9..93be76c5ccf 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Scanner/Fortran.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Scanner/Fortran.py
@@ -26,7 +26,7 @@ This module implements the dependency scanner for Fortran code.
# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-__revision__ = "src/engine/SCons/Scanner/Fortran.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Scanner/Fortran.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import re
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Scanner/IDL.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Scanner/IDL.py
index 65704d80ac2..6569c1f9c35 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Scanner/IDL.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Scanner/IDL.py
@@ -28,7 +28,7 @@ Definition Language) files.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Scanner/IDL.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Scanner/IDL.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import SCons.Node.FS
import SCons.Scanner
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Scanner/LaTeX.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Scanner/LaTeX.py
index 37970d02c66..4e43eaa7822 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Scanner/LaTeX.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Scanner/LaTeX.py
@@ -27,7 +27,7 @@ This module implements the dependency scanner for LaTeX code.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Scanner/LaTeX.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Scanner/LaTeX.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import os.path
import re
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Scanner/Prog.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Scanner/Prog.py
index 4a5e4780ccc..5f9015d2e53 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Scanner/Prog.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Scanner/Prog.py
@@ -21,7 +21,7 @@
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Scanner/Prog.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Scanner/Prog.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import SCons.Node
import SCons.Node.FS
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Scanner/RC.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Scanner/RC.py
index 2bfdfc92ccc..47c6ca26ec5 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Scanner/RC.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Scanner/RC.py
@@ -28,7 +28,7 @@ Definition Language) files.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Scanner/RC.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Scanner/RC.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import re
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Scanner/SWIG.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Scanner/SWIG.py
index 26f50807936..7ff78a684fa 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Scanner/SWIG.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Scanner/SWIG.py
@@ -27,7 +27,7 @@ This module implements the dependency scanner for SWIG code.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Scanner/SWIG.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Scanner/SWIG.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import SCons.Scanner
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Scanner/__init__.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Scanner/__init__.py
index f2fa41829d7..98845332e91 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Scanner/__init__.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Scanner/__init__.py
@@ -27,7 +27,7 @@ The Scanner package for the SCons software construction utility.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Scanner/__init__.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Scanner/__init__.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import re
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Script/Interactive.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Script/Interactive.py
index c75646179a9..b2c134c84ba 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Script/Interactive.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Script/Interactive.py
@@ -21,7 +21,7 @@
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
from __future__ import print_function
-__revision__ = "src/engine/SCons/Script/Interactive.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Script/Interactive.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
__doc__ = """
SCons interactive mode
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Script/Main.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Script/Main.py
index 663e3378faf..5b7406cc32a 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Script/Main.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Script/Main.py
@@ -38,7 +38,7 @@ deprecated_python_version = (2, 7, 0)
# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-__revision__ = "src/engine/SCons/Script/Main.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Script/Main.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import SCons.compat
@@ -75,6 +75,7 @@ print_objects = 0
print_memoizer = 0
print_stacktrace = 0
print_time = 0
+print_action_timestamps = 0
sconscript_time = 0
cumulative_command_time = 0
exit_status = 0 # final exit status, assume success by default
@@ -209,6 +210,9 @@ class BuildTask(SCons.Taskmaster.OutOfDateTask):
finish_time = time.time()
last_command_end = finish_time
cumulative_command_time = cumulative_command_time+finish_time-start_time
+ if print_action_timestamps:
+ sys.stdout.write("Command execution start timestamp: %s: %f\n"%(str(self.node), start_time))
+ sys.stdout.write("Command execution end timestamp: %s: %f\n"%(str(self.node), finish_time))
sys.stdout.write("Command execution time: %s: %f seconds\n"%(str(self.node), finish_time-start_time))
def do_failed(self, status=2):
@@ -636,7 +640,7 @@ def _SConstruct_exists(dirname='', repositories=[], filelist=None):
return None
def _set_debug_values(options):
- global print_memoizer, print_objects, print_stacktrace, print_time
+ global print_memoizer, print_objects, print_stacktrace, print_time, print_action_timestamps
debug_values = options.debug
@@ -674,6 +678,9 @@ def _set_debug_values(options):
options.tree_printers.append(TreePrinter(status=True))
if "time" in debug_values:
print_time = 1
+ if "action-timestamps" in debug_values:
+ print_time = 1
+ print_action_timestamps = 1
if "tree" in debug_values:
options.tree_printers.append(TreePrinter())
if "prepare" in debug_values:
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Script/SConsOptions.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Script/SConsOptions.py
index ae08d418e49..e7a3fc1800f 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Script/SConsOptions.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Script/SConsOptions.py
@@ -21,7 +21,7 @@
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Script/SConsOptions.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Script/SConsOptions.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import optparse
import re
@@ -584,9 +584,15 @@ def Parser(version):
help="Print build actions for files from CacheDir.")
def opt_invalid(group, value, options):
+ """report an invalid option from a group"""
errmsg = "`%s' is not a valid %s option type, try:\n" % (value, group)
return errmsg + " %s" % ", ".join(options)
+ def opt_invalid_rm(group, value, msg):
+ """report an invalid option from a group: recognized but removed"""
+ errmsg = "`%s' is not a valid %s option type " % (value, group)
+ return errmsg + msg
+
config_options = ["auto", "force" ,"cache"]
opt_config_help = "Controls Configure subsystem: %s." \
@@ -604,9 +610,11 @@ def Parser(version):
help="Search up directory tree for SConstruct, "
"build all Default() targets.")
- deprecated_debug_options = {
+ deprecated_debug_options = {}
+
+ removed_debug_options = {
"dtree" : '; please use --tree=derived instead',
- "nomemoizer" : ' and has no effect',
+ "nomemoizer" : '; there is no replacement',
"stree" : '; please use --tree=all,status instead',
"tree" : '; please use --tree=all instead',
}
@@ -614,15 +622,16 @@ def Parser(version):
debug_options = ["count", "duplicate", "explain", "findlibs",
"includes", "memoizer", "memory", "objects",
"pdb", "prepare", "presub", "stacktrace",
- "time"]
+ "time", "action-timestamps"]
def opt_debug(option, opt, value__, parser,
debug_options=debug_options,
- deprecated_debug_options=deprecated_debug_options):
+ deprecated_debug_options=deprecated_debug_options,
+ removed_debug_options=removed_debug_options):
for value in value__.split(','):
if value in debug_options:
parser.values.debug.append(value)
- elif value in list(deprecated_debug_options.keys()):
+ elif value in deprecated_debug_options:
parser.values.debug.append(value)
try:
parser.values.delayed_warnings
@@ -632,6 +641,9 @@ def Parser(version):
w = "The --debug=%s option is deprecated%s." % (value, msg)
t = (SCons.Warnings.DeprecatedDebugOptionsWarning, w)
parser.values.delayed_warnings.append(t)
+ elif value in removed_debug_options:
+ msg = removed_debug_options[value]
+ raise OptionValueError(opt_invalid_rm('debug', value, msg))
else:
raise OptionValueError(opt_invalid('debug', value, debug_options))
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Script/SConscript.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Script/SConscript.py
index c0a75f24577..97073ba4c24 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Script/SConscript.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Script/SConscript.py
@@ -27,7 +27,7 @@ files.
# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-__revision__ = "src/engine/SCons/Script/SConscript.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Script/SConscript.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import SCons
import SCons.Action
@@ -42,7 +42,7 @@ import SCons.Platform
import SCons.SConf
import SCons.Script.Main
import SCons.Tool
-import SCons.Util
+from SCons.Util import is_List, is_String, is_Dict, flatten
from . import Main
@@ -98,7 +98,7 @@ def compute_exports(exports):
retval = {}
try:
for export in exports:
- if SCons.Util.is_Dict(export):
+ if is_Dict(export):
retval.update(export)
else:
try:
@@ -133,7 +133,7 @@ call_stack = []
def Return(*vars, **kw):
retval = []
try:
- fvars = SCons.Util.flatten(vars)
+ fvars = flatten(vars)
for var in fvars:
for v in var.split():
retval.append(call_stack[-1].globals[v])
@@ -420,7 +420,7 @@ class SConsEnvironment(SCons.Environment.Base):
except KeyError:
raise SCons.Errors.UserError("Invalid SConscript usage - no parameters")
- if not SCons.Util.is_List(dirs):
+ if not is_List(dirs):
dirs = [ dirs ]
dirs = list(map(str, dirs))
@@ -441,13 +441,13 @@ class SConsEnvironment(SCons.Environment.Base):
raise SCons.Errors.UserError("Invalid SConscript() usage - too many arguments")
- if not SCons.Util.is_List(files):
+ if not is_List(files):
files = [ files ]
if kw.get('exports'):
exports.extend(self.Split(kw['exports']))
- variant_dir = kw.get('variant_dir') or kw.get('build_dir')
+ variant_dir = kw.get('variant_dir')
if variant_dir:
if len(files) != 1:
raise SCons.Errors.UserError("Invalid SConscript() usage - can only specify one SConscript with a variant_dir")
@@ -577,9 +577,6 @@ class SConsEnvironment(SCons.Environment.Base):
UserError: a script is not found and such exceptions are enabled.
"""
- if 'build_dir' in kw:
- msg = """The build_dir keyword has been deprecated; use the variant_dir keyword instead."""
- SCons.Warnings.warn(SCons.Warnings.DeprecatedBuildDirWarning, msg)
def subst_element(x, subst=self.subst):
if SCons.Util.is_List(x):
x = list(map(subst, x))
@@ -589,15 +586,10 @@ class SConsEnvironment(SCons.Environment.Base):
ls = list(map(subst_element, ls))
subst_kw = {}
for key, val in kw.items():
- if SCons.Util.is_String(val):
+ if is_String(val):
val = self.subst(val)
elif SCons.Util.is_List(val):
- result = []
- for v in val:
- if SCons.Util.is_String(v):
- v = self.subst(v)
- result.append(v)
- val = result
+ val = [self.subst(v) if is_String(v) else v for v in val]
subst_kw[key] = val
files, exports = self._get_SConscript_filenames(ls, subst_kw)
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Script/__init__.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Script/__init__.py
index cb44f2b7658..5292c103f2c 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Script/__init__.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Script/__init__.py
@@ -34,7 +34,7 @@ it goes here.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Script/__init__.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Script/__init__.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import time
start_time = time.time()
@@ -314,7 +314,6 @@ GlobalDefaultEnvironmentFunctions = [
'AddPreAction',
'Alias',
'AlwaysBuild',
- 'BuildDir',
'CacheDir',
'Clean',
#The Command() method is handled separately, below.
@@ -346,10 +345,8 @@ GlobalDefaultEnvironmentFunctions = [
'SConsignFile',
'SideEffect',
'SourceCode',
- 'SourceSignatures',
'Split',
'Tag',
- 'TargetSignatures',
'Value',
'VariantDir',
]
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Subst.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Subst.py
index 618adf569bb..23030f45c90 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Subst.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Subst.py
@@ -26,7 +26,7 @@ SCons string substitution.
# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-__revision__ = "src/engine/SCons/Subst.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Subst.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import collections
import re
@@ -409,7 +409,7 @@ def scons_subst(strSubst, env, mode=SUBST_RAW, target=None, source=None, gvars={
handles separating command lines into lists of arguments, so see
that function if that's what you're looking for.
"""
- if isinstance(strSubst, str) and strSubst.find('$') < 0:
+ if (isinstance(strSubst, str) and '$' not in strSubst) or isinstance(strSubst, CmdStringHolder):
return strSubst
class StringSubber(object):
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Taskmaster.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Taskmaster.py
index 421e2b2e564..60d2ac396c7 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Taskmaster.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Taskmaster.py
@@ -54,7 +54,7 @@ __doc__ = """
target(s) that it decides need to be evaluated and/or built.
"""
-__revision__ = "src/engine/SCons/Taskmaster.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Taskmaster.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
from itertools import chain
import operator
@@ -874,8 +874,10 @@ class Taskmaster(object):
# These nodes have not even been visited yet. Add
# them to the list so that on some next pass we can
# take a stab at evaluating them (or their children).
- children_not_visited.reverse()
- self.candidates.extend(self.order(children_not_visited))
+ if children_not_visited:
+ if len(children_not_visited) > 1:
+ children_not_visited.reverse()
+ self.candidates.extend(self.order(children_not_visited))
# if T and children_not_visited:
# T.write(self.trace_message(' adding to candidates: %s' % map(str, children_not_visited)))
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/386asm.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/386asm.py
index 16f5beb3216..d398f07fc24 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/386asm.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/386asm.py
@@ -32,7 +32,7 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/386asm.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Tool/386asm.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
from SCons.Tool.PharLapCommon import addPharLapPaths
import SCons.Util
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/DCommon.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/DCommon.py
index fca89a1838b..0e0cf09cb8f 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/DCommon.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/DCommon.py
@@ -31,7 +31,7 @@ Coded by Russel Winder (russel@winder.org.uk)
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/DCommon.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Tool/DCommon.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import os.path
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/FortranCommon.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/FortranCommon.py
index a5201bbc4bb..af573fa0468 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/FortranCommon.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/FortranCommon.py
@@ -28,7 +28,7 @@ Stuff for processing Fortran, common to all fortran dialects.
#
from __future__ import print_function
-__revision__ = "src/engine/SCons/Tool/FortranCommon.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Tool/FortranCommon.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import re
import os.path
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/GettextCommon.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/GettextCommon.py
index 057810811b5..f03c256c9c1 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/GettextCommon.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/GettextCommon.py
@@ -24,7 +24,7 @@ Used by several tools of `gettext` toolset.
# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-__revision__ = "src/engine/SCons/Tool/GettextCommon.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Tool/GettextCommon.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import SCons.Warnings
import re
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/JavaCommon.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/JavaCommon.py
index 6091fdf118d..f9e36849104 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/JavaCommon.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/JavaCommon.py
@@ -27,7 +27,7 @@ Stuff for processing Java.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/JavaCommon.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Tool/JavaCommon.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import os
import os.path
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/MSCommon/__init__.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/MSCommon/__init__.py
index 67b5be8fa44..c184aad0496 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/MSCommon/__init__.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/MSCommon/__init__.py
@@ -21,7 +21,7 @@
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/MSCommon/__init__.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Tool/MSCommon/__init__.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
__doc__ = """
Common functions for Microsoft Visual Studio and Visual C/C++.
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/MSCommon/arch.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/MSCommon/arch.py
index 4475af1af93..75e72647d78 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/MSCommon/arch.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/MSCommon/arch.py
@@ -21,7 +21,7 @@
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/MSCommon/arch.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Tool/MSCommon/arch.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
__doc__ = """Module to define supported Windows chip architectures.
"""
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/MSCommon/common.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/MSCommon/common.py
index 428eabaa5ab..6f979e65377 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/MSCommon/common.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/MSCommon/common.py
@@ -25,31 +25,67 @@ Common helper functions for working with the Microsoft tool chain.
#
from __future__ import print_function
-__revision__ = "src/engine/SCons/Tool/MSCommon/common.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Tool/MSCommon/common.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import copy
+import json
import os
-import subprocess
import re
+import subprocess
+import sys
import SCons.Util
+# SCONS_MSCOMMON_DEBUG is internal-use so undocumented:
+# set to '-' to print to console, else set to filename to log to
LOGFILE = os.environ.get('SCONS_MSCOMMON_DEBUG')
if LOGFILE == '-':
def debug(message):
print(message)
elif LOGFILE:
- try:
- import logging
- except ImportError:
- debug = lambda message: open(LOGFILE, 'a').write(message + '\n')
- else:
- logging.basicConfig(filename=LOGFILE, level=logging.DEBUG)
- debug = logging.getLogger(name=__name__).debug
+ import logging
+ logging.basicConfig(
+ format='%(relativeCreated)05dms:pid%(process)05d:MSCommon/%(filename)s:%(message)s',
+ filename=LOGFILE,
+ level=logging.DEBUG)
+ debug = logging.getLogger(name=__name__).debug
else:
debug = lambda x: None
+# SCONS_CACHE_MSVC_CONFIG is public, and is documented.
+CONFIG_CACHE = os.environ.get('SCONS_CACHE_MSVC_CONFIG')
+if CONFIG_CACHE in ('1', 'true', 'True'):
+ CONFIG_CACHE = os.path.join(os.path.expanduser('~'), '.scons_msvc_cache')
+
+def read_script_env_cache():
+ """ fetch cached msvc env vars if requested, else return empty dict """
+ envcache = {}
+ if CONFIG_CACHE:
+ try:
+ with open(CONFIG_CACHE, 'r') as f:
+ envcache = json.load(f)
+ #TODO can use more specific FileNotFoundError when py2 dropped
+ except IOError:
+ # don't fail if no cache file, just proceed without it
+ pass
+ return envcache
+
+
+def write_script_env_cache(cache):
+ """ write out cache of msvc env vars if requested """
+ if CONFIG_CACHE:
+ try:
+ with open(CONFIG_CACHE, 'w') as f:
+ json.dump(cache, f, indent=2)
+ except TypeError:
+ # data can't serialize to json, don't leave partial file
+ os.remove(CONFIG_CACHE)
+ except IOError:
+ # can't write the file, just skip
+ pass
+
+
_is_win64 = None
def is_win64():
@@ -199,7 +235,6 @@ def get_output(vcbat, args = None, env = None):
if stderr:
# TODO: find something better to do with stderr;
# this at least prevents errors from getting swallowed.
- import sys
sys.stderr.write(stderr)
if popen.wait() != 0:
raise IOError(stderr.decode("mbcs"))
@@ -207,14 +242,15 @@ def get_output(vcbat, args = None, env = None):
output = stdout.decode("mbcs")
return output
-def parse_output(output, keep=("INCLUDE", "LIB", "LIBPATH", "PATH", 'VSCMD_ARG_app_plat')):
+KEEPLIST = ("INCLUDE", "LIB", "LIBPATH", "PATH", 'VSCMD_ARG_app_plat')
+def parse_output(output, keep=KEEPLIST):
"""
Parse output from running visual c++/studios vcvarsall.bat and running set
To capture the values listed in keep
"""
# dkeep is a dict associating key: path_list, where key is one item from
- # keep, and pat_list the associated list of paths
+ # keep, and path_list the associated list of paths
dkeep = dict([(i, []) for i in keep])
# rdk will keep the regex to match the .bat file output line starts
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/MSCommon/netframework.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/MSCommon/netframework.py
index 0ba84a52aaf..c2d5d7cd1be 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/MSCommon/netframework.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/MSCommon/netframework.py
@@ -20,7 +20,7 @@
# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-__revision__ = "src/engine/SCons/Tool/MSCommon/netframework.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Tool/MSCommon/netframework.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
__doc__ = """
"""
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/MSCommon/sdk.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/MSCommon/sdk.py
index a2adf3d1b39..811ee24d1c6 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/MSCommon/sdk.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/MSCommon/sdk.py
@@ -21,7 +21,7 @@
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-__revision__ = "src/engine/SCons/Tool/MSCommon/sdk.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Tool/MSCommon/sdk.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
__doc__ = """Module to detect the Platform/Windows SDK
@@ -118,11 +118,11 @@ class SDKDefinition(object):
if (host_arch != target_arch):
arch_string='%s_%s'%(host_arch,target_arch)
- debug("sdk.py: get_sdk_vc_script():arch_string:%s host_arch:%s target_arch:%s"%(arch_string,
+ debug("get_sdk_vc_script():arch_string:%s host_arch:%s target_arch:%s"%(arch_string,
host_arch,
target_arch))
file=self.vc_setup_scripts.get(arch_string,None)
- debug("sdk.py: get_sdk_vc_script():file:%s"%file)
+ debug("get_sdk_vc_script():file:%s"%file)
return file
class WindowsSDK(SDKDefinition):
@@ -286,14 +286,14 @@ InstalledSDKMap = None
def get_installed_sdks():
global InstalledSDKList
global InstalledSDKMap
- debug('sdk.py:get_installed_sdks()')
+ debug('get_installed_sdks()')
if InstalledSDKList is None:
InstalledSDKList = []
InstalledSDKMap = {}
for sdk in SupportedSDKList:
- debug('MSCommon/sdk.py: trying to find SDK %s' % sdk.version)
+ debug('trying to find SDK %s' % sdk.version)
if sdk.get_sdk_dir():
- debug('MSCommon/sdk.py:found SDK %s' % sdk.version)
+ debug('found SDK %s' % sdk.version)
InstalledSDKList.append(sdk)
InstalledSDKMap[sdk.version] = sdk
return InstalledSDKList
@@ -346,13 +346,13 @@ def get_default_sdk():
return InstalledSDKList[0]
def mssdk_setup_env(env):
- debug('sdk.py:mssdk_setup_env()')
+ debug('mssdk_setup_env()')
if 'MSSDK_DIR' in env:
sdk_dir = env['MSSDK_DIR']
if sdk_dir is None:
return
sdk_dir = env.subst(sdk_dir)
- debug('sdk.py:mssdk_setup_env: Using MSSDK_DIR:{}'.format(sdk_dir))
+ debug('mssdk_setup_env: Using MSSDK_DIR:{}'.format(sdk_dir))
elif 'MSSDK_VERSION' in env:
sdk_version = env['MSSDK_VERSION']
if sdk_version is None:
@@ -364,22 +364,22 @@ def mssdk_setup_env(env):
msg = "SDK version %s is not installed" % sdk_version
raise SCons.Errors.UserError(msg)
sdk_dir = mssdk.get_sdk_dir()
- debug('sdk.py:mssdk_setup_env: Using MSSDK_VERSION:%s'%sdk_dir)
+ debug('mssdk_setup_env: Using MSSDK_VERSION:%s'%sdk_dir)
elif 'MSVS_VERSION' in env:
msvs_version = env['MSVS_VERSION']
- debug('sdk.py:mssdk_setup_env:Getting MSVS_VERSION from env:%s'%msvs_version)
+ debug('mssdk_setup_env:Getting MSVS_VERSION from env:%s'%msvs_version)
if msvs_version is None:
- debug('sdk.py:mssdk_setup_env thinks msvs_version is None')
+ debug('mssdk_setup_env thinks msvs_version is None')
return
msvs_version = env.subst(msvs_version)
from . import vs
msvs = vs.get_vs_by_version(msvs_version)
- debug('sdk.py:mssdk_setup_env:msvs is :%s'%msvs)
+ debug('mssdk_setup_env:msvs is :%s'%msvs)
if not msvs:
- debug('sdk.py:mssdk_setup_env: no VS version detected, bailingout:%s'%msvs)
+ debug('mssdk_setup_env: no VS version detected, bailingout:%s'%msvs)
return
sdk_version = msvs.sdk_version
- debug('sdk.py:msvs.sdk_version is %s'%sdk_version)
+ debug('msvs.sdk_version is %s'%sdk_version)
if not sdk_version:
return
mssdk = get_sdk_by_version(sdk_version)
@@ -388,13 +388,13 @@ def mssdk_setup_env(env):
if not mssdk:
return
sdk_dir = mssdk.get_sdk_dir()
- debug('sdk.py:mssdk_setup_env: Using MSVS_VERSION:%s'%sdk_dir)
+ debug('mssdk_setup_env: Using MSVS_VERSION:%s'%sdk_dir)
else:
mssdk = get_default_sdk()
if not mssdk:
return
sdk_dir = mssdk.get_sdk_dir()
- debug('sdk.py:mssdk_setup_env: not using any env values. sdk_dir:%s'%sdk_dir)
+ debug('mssdk_setup_env: not using any env values. sdk_dir:%s'%sdk_dir)
set_sdk_by_directory(env, sdk_dir)
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/MSCommon/vc.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/MSCommon/vc.py
index f0ae9467514..6d0a7ecd999 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/MSCommon/vc.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/MSCommon/vc.py
@@ -30,7 +30,7 @@
# * test on 64 bits XP + VS 2005 (and VS 6 if possible)
# * SDK
# * Assembly
-__revision__ = "src/engine/SCons/Tool/MSCommon/vc.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Tool/MSCommon/vc.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
__doc__ = """Module for Visual C/C++ detection and configuration.
"""
@@ -40,7 +40,10 @@ import SCons.Util
import subprocess
import os
import platform
+import sys
from string import digits as string_digits
+if sys.version_info[0] == 2:
+ import collections
import SCons.Warnings
from SCons.Tool import find_program_path
@@ -152,22 +155,24 @@ def get_msvc_version_numeric(msvc_version):
return ''.join([x for x in msvc_version if x in string_digits + '.'])
def get_host_target(env):
- debug('vc.py:get_host_target()')
+ debug('get_host_target()')
host_platform = env.get('HOST_ARCH')
if not host_platform:
host_platform = platform.machine()
- # TODO(2.5): the native Python platform.machine() function returns
- # '' on all Python versions before 2.6, after which it also uses
- # PROCESSOR_ARCHITECTURE.
- if not host_platform:
- host_platform = os.environ.get('PROCESSOR_ARCHITECTURE', '')
+
+ # Solaris returns i86pc for both 32 and 64 bit architectures
+ if host_platform == "i86pc":
+ if platform.architecture()[0] == "64bit":
+ host_platform = "amd64"
+ else:
+ host_platform = "x86"
# Retain user requested TARGET_ARCH
req_target_platform = env.get('TARGET_ARCH')
- debug('vc.py:get_host_target() req_target_platform:%s'%req_target_platform)
+ debug('get_host_target() req_target_platform:%s'%req_target_platform)
- if req_target_platform:
+ if req_target_platform:
# If user requested a specific platform then only try that one.
target_platform = req_target_platform
else:
@@ -403,7 +408,7 @@ def find_batch_file(env,msvc_version,host_arch,target_arch):
if pdir is None:
raise NoVersionFound("No version of Visual Studio found")
- debug('vc.py: find_batch_file() in {}'.format(pdir))
+ debug('find_batch_file() in {}'.format(pdir))
# filter out e.g. "Exp" from the version name
msvc_ver_numeric = get_msvc_version_numeric(msvc_version)
@@ -423,17 +428,17 @@ def find_batch_file(env,msvc_version,host_arch,target_arch):
debug("Not found: %s" % batfilename)
batfilename = None
- installed_sdks=get_installed_sdks()
+ installed_sdks = get_installed_sdks()
for _sdk in installed_sdks:
sdk_bat_file = _sdk.get_sdk_vc_script(host_arch,target_arch)
if not sdk_bat_file:
- debug("vc.py:find_batch_file() not found:%s"%_sdk)
+ debug("find_batch_file() not found:%s"%_sdk)
else:
sdk_bat_file_path = os.path.join(pdir,sdk_bat_file)
if os.path.exists(sdk_bat_file_path):
- debug('vc.py:find_batch_file() sdk_bat_file_path:%s'%sdk_bat_file_path)
- return (batfilename,sdk_bat_file_path)
- return (batfilename,None)
+ debug('find_batch_file() sdk_bat_file_path:%s'%sdk_bat_file_path)
+ return (batfilename, sdk_bat_file_path)
+ return (batfilename, None)
__INSTALLED_VCS_RUN = None
@@ -592,21 +597,57 @@ def reset_installed_vcs():
# env2 = Environment(tools='msvs')
# we can greatly improve the speed of the second and subsequent Environment
# (or Clone) calls by memoizing the environment variables set by vcvars*.bat.
-script_env_stdout_cache = {}
+#
+# Updated: by 2018, vcvarsall.bat had gotten so expensive (vs2017 era)
+# it was breaking CI builds because the test suite starts scons so many
+# times and the existing memo logic only helped with repeated calls
+# within the same scons run. Windows builds on the CI system were split
+# into chunks to get around single-build time limits.
+# With VS2019 it got even slower and an optional persistent cache file
+# was introduced. The cache now also stores only the parsed vars,
+# not the entire output of running the batch file - saves a bit
+# of time not parsing every time.
+
+script_env_cache = None
+
def script_env(script, args=None):
- cache_key = (script, args)
- stdout = script_env_stdout_cache.get(cache_key, None)
- if stdout is None:
+ global script_env_cache
+
+ if script_env_cache is None:
+ script_env_cache = common.read_script_env_cache()
+ cache_key = "{}--{}".format(script, args)
+ cache_data = script_env_cache.get(cache_key, None)
+ if cache_data is None:
stdout = common.get_output(script, args)
- script_env_stdout_cache[cache_key] = stdout
- # Stupid batch files do not set return code: we take a look at the
- # beginning of the output for an error message instead
- olines = stdout.splitlines()
- if olines[0].startswith("The specified configuration type is missing"):
- raise BatchFileExecutionError("\n".join(olines[:2]))
+ # Stupid batch files do not set return code: we take a look at the
+ # beginning of the output for an error message instead
+ olines = stdout.splitlines()
+ if olines[0].startswith("The specified configuration type is missing"):
+ raise BatchFileExecutionError("\n".join(olines[:2]))
+
+ cache_data = common.parse_output(stdout)
+ script_env_cache[cache_key] = cache_data
+ # once we updated cache, give a chance to write out if user wanted
+ common.write_script_env_cache(script_env_cache)
+ else:
+ #TODO: Python 2 cleanup
+ # If we "hit" data from the json file, we have a Py2 problem:
+ # keys & values will be unicode. don't detect, just convert.
+ if sys.version_info[0] == 2:
+ def convert(data):
+ if isinstance(data, basestring):
+ return str(data)
+ elif isinstance(data, collections.Mapping):
+ return dict(map(convert, data.iteritems()))
+ elif isinstance(data, collections.Iterable):
+ return type(data)(map(convert, data))
+ else:
+ return data
- return common.parse_output(stdout)
+ cache_data = convert(cache_data)
+
+ return cache_data
def get_default_version(env):
debug('get_default_version()')
@@ -635,12 +676,12 @@ def get_default_version(env):
debug('installed_vcs:%s' % installed_vcs)
if not installed_vcs:
#msg = 'No installed VCs'
- #debug('msv %s\n' % repr(msg))
+ #debug('msv %s' % repr(msg))
#SCons.Warnings.warn(SCons.Warnings.VisualCMissingWarning, msg)
debug('msvc_setup_env: No installed VCs')
return None
msvc_version = installed_vcs[0]
- debug('msvc_setup_env: using default installed MSVC version %s\n' % repr(msvc_version))
+ debug('msvc_setup_env: using default installed MSVC version %s' % repr(msvc_version))
return msvc_version
@@ -654,12 +695,12 @@ def msvc_setup_env_once(env):
msvc_setup_env(env)
env["MSVC_SETUP_RUN"] = True
-def msvc_find_valid_batch_script(env,version):
- debug('vc.py:msvc_find_valid_batch_script()')
+def msvc_find_valid_batch_script(env, version):
+ debug('msvc_find_valid_batch_script()')
# Find the host platform, target platform, and if present the requested
# target platform
platforms = get_host_target(env)
- debug("vc.py: msvs_find_valid_batch_script(): host_platform %s, target_platform %s req_target_platform:%s" % platforms)
+ debug(" msvs_find_valid_batch_script(): host_platform %s, target_platform %s req_target_platform:%s" % platforms)
host_platform, target_platform, req_target_platform = platforms
try_target_archs = [target_platform]
@@ -683,7 +724,7 @@ def msvc_find_valid_batch_script(env,version):
# Set to current arch.
env['TARGET_ARCH']=tp
- debug("vc.py:msvc_find_valid_batch_script() trying target_platform:%s"%tp)
+ debug("msvc_find_valid_batch_script() trying target_platform:%s"%tp)
host_target = (host_platform, tp)
if not is_host_target_supported(host_target, version):
warn_msg = "host, target = %s not supported for MSVC version %s" % \
@@ -701,8 +742,8 @@ def msvc_find_valid_batch_script(env,version):
# Try to locate a batch file for this host/target platform combo
try:
- (vc_script,sdk_script) = find_batch_file(env,version,host_platform,tp)
- debug('vc.py:msvc_find_valid_batch_script() vc_script:%s sdk_script:%s'%(vc_script,sdk_script))
+ (vc_script, sdk_script) = find_batch_file(env, version, host_platform, tp)
+ debug('msvc_find_valid_batch_script() vc_script:%s sdk_script:%s'%(vc_script,sdk_script))
except VisualCException as e:
msg = str(e)
debug('Caught exception while looking for batch file (%s)' % msg)
@@ -714,29 +755,29 @@ def msvc_find_valid_batch_script(env,version):
continue
# Try to use the located batch file for this host/target platform combo
- debug('vc.py:msvc_find_valid_batch_script() use_script 2 %s, args:%s\n' % (repr(vc_script), arg))
+ debug('msvc_find_valid_batch_script() use_script 2 %s, args:%s' % (repr(vc_script), arg))
found = None
if vc_script:
try:
d = script_env(vc_script, args=arg)
found = vc_script
except BatchFileExecutionError as e:
- debug('vc.py:msvc_find_valid_batch_script() use_script 3: failed running VC script %s: %s: Error:%s'%(repr(vc_script),arg,e))
+ debug('msvc_find_valid_batch_script() use_script 3: failed running VC script %s: %s: Error:%s'%(repr(vc_script),arg,e))
vc_script=None
continue
if not vc_script and sdk_script:
- debug('vc.py:msvc_find_valid_batch_script() use_script 4: trying sdk script: %s'%(sdk_script))
+ debug('msvc_find_valid_batch_script() use_script 4: trying sdk script: %s'%(sdk_script))
try:
d = script_env(sdk_script)
found = sdk_script
except BatchFileExecutionError as e:
- debug('vc.py:msvc_find_valid_batch_script() use_script 5: failed running SDK script %s: Error:%s'%(repr(sdk_script),e))
+ debug('msvc_find_valid_batch_script() use_script 5: failed running SDK script %s: Error:%s'%(repr(sdk_script),e))
continue
elif not vc_script and not sdk_script:
- debug('vc.py:msvc_find_valid_batch_script() use_script 6: Neither VC script nor SDK script found')
+ debug('msvc_find_valid_batch_script() use_script 6: Neither VC script nor SDK script found')
continue
- debug("vc.py:msvc_find_valid_batch_script() Found a working script/target: %s/%s"%(repr(found),arg))
+ debug("msvc_find_valid_batch_script() Found a working script/target: %s/%s"%(repr(found),arg))
break # We've found a working target_platform, so stop looking
# If we cannot find a viable installed compiler, reset the TARGET_ARCH
@@ -756,7 +797,7 @@ def msvc_setup_env(env):
"compilers most likely not set correctly"
SCons.Warnings.warn(SCons.Warnings.VisualCMissingWarning, warn_msg)
return None
- debug('msvc_setup_env: using specified MSVC version %s\n' % repr(version))
+ debug('msvc_setup_env: using specified MSVC version %s' % repr(version))
# XXX: we set-up both MSVS version for backward
# compatibility with the msvs tool
@@ -767,11 +808,11 @@ def msvc_setup_env(env):
use_script = env.get('MSVC_USE_SCRIPT', True)
if SCons.Util.is_String(use_script):
- debug('vc.py:msvc_setup_env() use_script 1 %s\n' % repr(use_script))
+ debug('msvc_setup_env() use_script 1 %s' % repr(use_script))
d = script_env(use_script)
elif use_script:
d = msvc_find_valid_batch_script(env,version)
- debug('vc.py:msvc_setup_env() use_script 2 %s\n' % d)
+ debug('msvc_setup_env() use_script 2 %s' % d)
if not d:
return d
else:
@@ -782,7 +823,7 @@ def msvc_setup_env(env):
return None
for k, v in d.items():
- debug('vc.py:msvc_setup_env() env:%s -> %s'%(k,v))
+ debug('msvc_setup_env() env:%s -> %s'%(k,v))
env.PrependENVPath(k, v, delete_existing=True)
# final check to issue a warning if the compiler is not present
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/MSCommon/vs.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/MSCommon/vs.py
index d719301e923..972c4f8d200 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/MSCommon/vs.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/MSCommon/vs.py
@@ -21,7 +21,7 @@
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/MSCommon/vs.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Tool/MSCommon/vs.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
__doc__ = """Module to detect Visual Studio and/or Visual C/C++
"""
@@ -465,14 +465,14 @@ def get_vs_by_version(msvs):
global InstalledVSMap
global SupportedVSMap
- debug('vs.py:get_vs_by_version()')
+ debug('get_vs_by_version()')
if msvs not in SupportedVSMap:
msg = "Visual Studio version %s is not supported" % repr(msvs)
raise SCons.Errors.UserError(msg)
get_installed_visual_studios()
vs = InstalledVSMap.get(msvs)
debug('InstalledVSMap:%s'%InstalledVSMap)
- debug('vs.py:get_vs_by_version: found vs:%s'%vs)
+ debug('get_vs_by_version: found vs:%s'%vs)
# Some check like this would let us provide a useful error message
# if they try to set a Visual Studio version that's not installed.
# However, we also want to be able to run tests (like the unit
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/PharLapCommon.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/PharLapCommon.py
index d699b7eb6b7..09751d1763f 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/PharLapCommon.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/PharLapCommon.py
@@ -29,7 +29,7 @@ Phar Lap ETS tool chain. Right now, this is linkloc and
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/PharLapCommon.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Tool/PharLapCommon.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import os
import os.path
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/__init__.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/__init__.py
index ea64b789023..a75693f5dde 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/__init__.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/__init__.py
@@ -35,7 +35,7 @@ tool definition.
# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-__revision__ = "src/engine/SCons/Tool/__init__.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Tool/__init__.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import sys
import re
@@ -99,7 +99,7 @@ for suffix in LaTeXSuffixes:
SourceFileScanner.add_scanner(suffix, LaTeXScanner)
SourceFileScanner.add_scanner(suffix, PDFLaTeXScanner)
-# Tool aliases are needed for those tools whos module names also
+# Tool aliases are needed for those tools whose module names also
# occur in the python standard library. This causes module shadowing and
# can break using python library functions under python3
TOOL_ALIASES = {
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/aixc++.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/aixc++.py
index 90a3e017356..4a78edaf3fe 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/aixc++.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/aixc++.py
@@ -31,7 +31,7 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/aixc++.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Tool/aixc++.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
#forward proxy to the preffered cxx version
from SCons.Tool.aixcxx import *
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/aixcc.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/aixcc.py
index 2cc35bc62d2..e7bc1ca9572 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/aixcc.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/aixcc.py
@@ -30,7 +30,7 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/aixcc.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Tool/aixcc.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import os.path
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/aixcxx.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/aixcxx.py
index 7e7ff3aefbb..f4ee5fef877 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/aixcxx.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/aixcxx.py
@@ -31,7 +31,7 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/aixcxx.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Tool/aixcxx.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import os.path
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/aixf77.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/aixf77.py
index c7129e50010..908e8ad2302 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/aixf77.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/aixf77.py
@@ -30,7 +30,7 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/aixf77.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Tool/aixf77.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import os.path
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/aixlink.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/aixlink.py
index a82f5702a62..67d65e82a7f 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/aixlink.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/aixlink.py
@@ -30,7 +30,7 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/aixlink.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Tool/aixlink.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import os
import os.path
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/applelink.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/applelink.py
index 2c165eeaa25..f432d613b3e 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/applelink.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/applelink.py
@@ -31,7 +31,7 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/applelink.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Tool/applelink.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import SCons.Util
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/ar.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/ar.py
index e0e89a76999..3d8cc8a2f67 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/ar.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/ar.py
@@ -31,7 +31,7 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/ar.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Tool/ar.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import SCons.Defaults
import SCons.Tool
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/as.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/as.py
index 37186d72ef1..3986a44ced7 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/as.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/as.py
@@ -31,7 +31,7 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/as.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Tool/as.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import SCons.Defaults
import SCons.Tool
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/bcc32.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/bcc32.py
index bb74d4dbbd2..7e0b47f2bca 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/bcc32.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/bcc32.py
@@ -27,7 +27,7 @@ XXX
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/bcc32.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Tool/bcc32.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import os
import os.path
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/c++.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/c++.py
index 9cd420b6b12..00aee5df052 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/c++.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/c++.py
@@ -30,7 +30,7 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/c++.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Tool/c++.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
#forward proxy to the preffered cxx version
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/cc.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/cc.py
index 12e2b689926..ffcb6e84cc0 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/cc.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/cc.py
@@ -30,7 +30,7 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/cc.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Tool/cc.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import SCons.Tool
import SCons.Defaults
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/clang.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/clang.py
index 8d913d127ee..35347b43e72 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/clang.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/clang.py
@@ -33,7 +33,7 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-# __revision__ = "src/engine/SCons/Tool/clang.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+# __revision__ = "src/engine/SCons/Tool/clang.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
# Based on SCons/Tool/gcc.py by Paweł Tomulik 2014 as a separate tool.
# Brought into the SCons mainline by Russel Winder 2017.
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/clangCommon/__init__.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/clangCommon/__init__.py
index 37efbf691e7..37efbf691e7 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/clangCommon/__init__.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/clangCommon/__init__.py
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/clangxx.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/clangxx.py
index 8afda08df62..9292c21bd31 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/clangxx.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/clangxx.py
@@ -33,7 +33,7 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-# __revision__ = "src/engine/SCons/Tool/clangxx.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+# __revision__ = "src/engine/SCons/Tool/clangxx.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
# Based on SCons/Tool/g++.py by Paweł Tomulik 2014 as a separate tool.
# Brought into the SCons mainline by Russel Winder 2017.
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/cvf.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/cvf.py
index 22ec02ffb62..60d5a3d970d 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/cvf.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/cvf.py
@@ -27,7 +27,7 @@ Tool-specific initialization for the Compaq Visual Fortran compiler.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/cvf.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Tool/cvf.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
from . import fortran
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/cxx.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/cxx.py
index 7e34850ed06..aced17702f5 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/cxx.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/cxx.py
@@ -30,7 +30,7 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/cxx.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Tool/cxx.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import os.path
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/cyglink.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/cyglink.py
index c3d78de90b7..c3d78de90b7 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/cyglink.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/cyglink.py
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/default.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/default.py
index a401d253f56..355538f4006 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/default.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/default.py
@@ -31,7 +31,7 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/default.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Tool/default.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import SCons.Tool
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/dmd.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/dmd.py
index e87d79137c3..74c86735934 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/dmd.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/dmd.py
@@ -53,7 +53,7 @@ Lib tool variables:
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/dmd.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Tool/dmd.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import os
import subprocess
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/docbook/__init__.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/docbook/__init__.py
index 147556d626d..147556d626d 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/docbook/__init__.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/docbook/__init__.py
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/dvi.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/dvi.py
index 2152817142c..1a7f7af5b28 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/dvi.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/dvi.py
@@ -27,7 +27,7 @@ Common DVI Builder definition for various other Tool modules that use it.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/dvi.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Tool/dvi.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import SCons.Builder
import SCons.Tool
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/dvipdf.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/dvipdf.py
index 2b666581200..6012e5b8956 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/dvipdf.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/dvipdf.py
@@ -30,7 +30,7 @@ selection method.
# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-__revision__ = "src/engine/SCons/Tool/dvipdf.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Tool/dvipdf.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import SCons.Action
import SCons.Defaults
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/dvips.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/dvips.py
index ccc882c0a5e..9fce42c9a51 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/dvips.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/dvips.py
@@ -31,7 +31,7 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/dvips.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Tool/dvips.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import SCons.Action
import SCons.Builder
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/f03.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/f03.py
index 0a30381ea88..77a37b99253 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/f03.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/f03.py
@@ -31,7 +31,7 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/f03.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Tool/f03.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import SCons.Defaults
import SCons.Tool
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/f08.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/f08.py
index 1d2b84d39c2..e7318b9a81f 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/f08.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/f08.py
@@ -33,7 +33,7 @@ from __future__ import absolute_import
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/f08.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Tool/f08.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import SCons.Defaults
import SCons.Tool
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/f77.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/f77.py
index c52904ebd35..0777822ce74 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/f77.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/f77.py
@@ -31,7 +31,7 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/f77.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Tool/f77.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import SCons.Defaults
import SCons.Scanner.Fortran
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/f90.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/f90.py
index 1095c1c622f..6a370bdf799 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/f90.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/f90.py
@@ -31,7 +31,7 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/f90.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Tool/f90.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import SCons.Defaults
import SCons.Scanner.Fortran
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/f95.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/f95.py
index 44e9e39e423..fca7d620276 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/f95.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/f95.py
@@ -31,7 +31,7 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/f95.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Tool/f95.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import SCons.Defaults
import SCons.Tool
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/filesystem.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/filesystem.py
index b0047820514..ea16abf95f6 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/filesystem.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/filesystem.py
@@ -30,7 +30,7 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/filesystem.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Tool/filesystem.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import SCons
from SCons.Tool.install import copyFunc
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/fortran.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/fortran.py
index 2e84e499c3c..7b332c9aa26 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/fortran.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/fortran.py
@@ -31,7 +31,7 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/fortran.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Tool/fortran.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import re
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/g++.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/g++.py
index ecaf0ab3165..eace13c7299 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/g++.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/g++.py
@@ -31,7 +31,7 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/g++.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Tool/g++.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
#forward proxy to the preffered cxx version
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/g77.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/g77.py
index 6d7d4ede228..f3f935d2f9d 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/g77.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/g77.py
@@ -31,7 +31,7 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/g77.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Tool/g77.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import SCons.Util
from SCons.Tool.FortranCommon import add_all_to_env, add_f77_to_env
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/gas.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/gas.py
index add6f7c2364..9b6020164ee 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/gas.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/gas.py
@@ -31,7 +31,7 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/gas.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Tool/gas.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
try:
as_module = __import__('as', globals(), locals(), [])
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/gcc.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/gcc.py
index 4f70be5fe0e..65b9f573f4c 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/gcc.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/gcc.py
@@ -31,7 +31,7 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/gcc.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Tool/gcc.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
from . import cc
import os
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/gdc.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/gdc.py
index ebb9b060c28..4c392e84bc1 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/gdc.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/gdc.py
@@ -48,7 +48,7 @@ Lib tool variables:
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/gdc.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Tool/gdc.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import SCons.Action
import SCons.Defaults
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/gettext_tool.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/gettext_tool.py
index 9f20a6f4068..5891e40807f 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/gettext_tool.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/gettext_tool.py
@@ -23,7 +23,7 @@
# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-__revision__ = "src/engine/SCons/Tool/gettext_tool.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Tool/gettext_tool.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
#############################################################################
def generate(env,**kw):
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/gfortran.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/gfortran.py
index ca143c5b48a..986ebc6078b 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/gfortran.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/gfortran.py
@@ -32,7 +32,7 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/gfortran.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Tool/gfortran.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import SCons.Util
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/gnulink.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/gnulink.py
index 2ed5d34ef19..0715ffcf140 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/gnulink.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/gnulink.py
@@ -31,7 +31,7 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/gnulink.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Tool/gnulink.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import SCons.Util
import SCons.Tool
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/gs.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/gs.py
index ca8558546d5..3e9543facf5 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/gs.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/gs.py
@@ -31,7 +31,7 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/gs.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Tool/gs.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import SCons.Action
import SCons.Builder
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/gxx.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/gxx.py
index b9c35f77e47..2eb678dcb8c 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/gxx.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/gxx.py
@@ -31,7 +31,7 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/gxx.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Tool/gxx.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import os.path
import re
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/hpc++.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/hpc++.py
index 6da62ae8d7a..ee94e226b40 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/hpc++.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/hpc++.py
@@ -31,7 +31,7 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/hpc++.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Tool/hpc++.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
#forward proxy to the preffered cxx version
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/hpcc.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/hpcc.py
index 7e2d748cea4..f118cf3b11a 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/hpcc.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/hpcc.py
@@ -30,7 +30,7 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/hpcc.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Tool/hpcc.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import SCons.Util
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/hpcxx.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/hpcxx.py
index ccda329f2b3..e4dcb978888 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/hpcxx.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/hpcxx.py
@@ -31,7 +31,7 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/hpcxx.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Tool/hpcxx.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import os.path
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/hplink.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/hplink.py
index be830744b45..9f90071a84c 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/hplink.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/hplink.py
@@ -30,7 +30,7 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/hplink.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Tool/hplink.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import os
import os.path
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/icc.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/icc.py
index 97f30bd2bcd..877a2126c07 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/icc.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/icc.py
@@ -31,7 +31,7 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/icc.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Tool/icc.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
from . import cc
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/icl.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/icl.py
index ad9305abfbd..be67bdc7921 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/icl.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/icl.py
@@ -31,7 +31,7 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/icl.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Tool/icl.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import SCons.Tool.intelc
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/ifl.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/ifl.py
index 1e98df4c8df..2139b9f712d 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/ifl.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/ifl.py
@@ -31,7 +31,7 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/ifl.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Tool/ifl.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import SCons.Defaults
from SCons.Scanner.Fortran import FortranScan
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/ifort.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/ifort.py
index d1886ce5830..a248b3e6a1b 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/ifort.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/ifort.py
@@ -32,7 +32,7 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/ifort.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Tool/ifort.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import SCons.Defaults
from SCons.Scanner.Fortran import FortranScan
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/ilink.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/ilink.py
index 4e848dce785..289235ccedb 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/ilink.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/ilink.py
@@ -31,7 +31,7 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/ilink.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Tool/ilink.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import SCons.Defaults
import SCons.Tool
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/ilink32.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/ilink32.py
index ecb6e7b0820..33df7903c10 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/ilink32.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/ilink32.py
@@ -27,7 +27,7 @@ XXX
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/ilink32.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Tool/ilink32.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import SCons.Tool
import SCons.Tool.bcc32
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/install.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/install.py
index 8f80bc23fad..f998baac4dc 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/install.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/install.py
@@ -31,7 +31,7 @@ selection method.
#
from __future__ import print_function
-__revision__ = "src/engine/SCons/Tool/install.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Tool/install.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import os
import re
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/intelc.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/intelc.py
index ee8b4f4930c..c45c71a10d9 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/intelc.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/intelc.py
@@ -32,7 +32,7 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
from __future__ import division, print_function
-__revision__ = "src/engine/SCons/Tool/intelc.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Tool/intelc.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import math, sys, os.path, glob, string, re
@@ -387,7 +387,7 @@ def get_intel_compiler_top(version, abi):
def generate(env, version=None, abi=None, topdir=None, verbose=0):
- """Add Builders and construction variables for Intel C/C++ compiler
+ r"""Add Builders and construction variables for Intel C/C++ compiler
to an Environment.
args:
version: (string) compiler version to use, like "80"
@@ -551,7 +551,7 @@ def generate(env, version=None, abi=None, topdir=None, verbose=0):
# Look for license file dir
# in system environment, registry, and default location.
envlicdir = os.environ.get("INTEL_LICENSE_FILE", '')
- K = ('SOFTWARE\Intel\Licenses')
+ K = r'SOFTWARE\Intel\Licenses'
try:
k = SCons.Util.RegOpenKeyEx(SCons.Util.HKEY_LOCAL_MACHINE, K)
reglicdir = SCons.Util.RegQueryValueEx(k, "w_cpp")[0]
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/ipkg.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/ipkg.py
index 60096af0151..e1fad3530bd 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/ipkg.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/ipkg.py
@@ -33,7 +33,7 @@ packages fake_root.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/ipkg.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Tool/ipkg.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import os
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/jar.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/jar.py
index 212a10546b5..f2a328bf9c2 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/jar.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/jar.py
@@ -31,7 +31,7 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/jar.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Tool/jar.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import os
import SCons.Subst
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/javac.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/javac.py
index 849ac09597c..aeb52ce41cf 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/javac.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/javac.py
@@ -30,7 +30,7 @@ selection method.
# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-__revision__ = "src/engine/SCons/Tool/javac.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Tool/javac.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import os
import os.path
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/javah.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/javah.py
index 8ec3cf8d8d3..b41c742fe59 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/javah.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/javah.py
@@ -31,7 +31,7 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/javah.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Tool/javah.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import os.path
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/latex.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/latex.py
index 242aa62f668..6cfd93ad2a4 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/latex.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/latex.py
@@ -32,7 +32,7 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/latex.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Tool/latex.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import SCons.Action
import SCons.Defaults
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/ldc.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/ldc.py
index 6f6a8997e26..639dd486229 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/ldc.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/ldc.py
@@ -48,7 +48,7 @@ Lib tool variables:
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/ldc.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Tool/ldc.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import os
import subprocess
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/lex.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/lex.py
index 155e2d9e942..db1ca6d0f87 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/lex.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/lex.py
@@ -31,7 +31,7 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/lex.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Tool/lex.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import os.path
import sys
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/link.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/link.py
index 2347c947e12..c712732605f 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/link.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/link.py
@@ -32,7 +32,7 @@ selection method.
#
from __future__ import print_function
-__revision__ = "src/engine/SCons/Tool/link.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Tool/link.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import sys
import re
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/linkloc.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/linkloc.py
index e3b16fce684..508b09aeeb8 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/linkloc.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/linkloc.py
@@ -32,7 +32,7 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/linkloc.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Tool/linkloc.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import os.path
import re
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/m4.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/m4.py
index 0c345f33fa0..b71f6befd32 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/m4.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/m4.py
@@ -31,7 +31,7 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/m4.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Tool/m4.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import SCons.Action
import SCons.Builder
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/masm.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/masm.py
index 26e2e0a5a31..08977147e5b 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/masm.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/masm.py
@@ -31,7 +31,7 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/masm.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Tool/masm.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import SCons.Defaults
import SCons.Tool
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/midl.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/midl.py
index b2120c6b217..5ec5974f7f1 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/midl.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/midl.py
@@ -31,7 +31,7 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/midl.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Tool/midl.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import SCons.Action
import SCons.Builder
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/mingw.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/mingw.py
index 4d6533bf6fb..3152bf29581 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/mingw.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/mingw.py
@@ -31,7 +31,7 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/mingw.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Tool/mingw.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import os
import os.path
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/msgfmt.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/msgfmt.py
index a66af3678c3..1ee45e7dab2 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/msgfmt.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/msgfmt.py
@@ -21,7 +21,7 @@
# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-__revision__ = "src/engine/SCons/Tool/msgfmt.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Tool/msgfmt.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
from SCons.Builder import BuilderBase
#############################################################################
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/msginit.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/msginit.py
index 96c2732de07..8ce9f02a1bf 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/msginit.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/msginit.py
@@ -24,7 +24,7 @@ Tool specific initialization of msginit tool.
# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-__revision__ = "src/engine/SCons/Tool/msginit.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Tool/msginit.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import SCons.Warnings
import SCons.Builder
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/msgmerge.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/msgmerge.py
index 42cb18a6a48..748041db670 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/msgmerge.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/msgmerge.py
@@ -24,7 +24,7 @@ Tool specific initialization for `msgmerge` tool.
# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-__revision__ = "src/engine/SCons/Tool/msgmerge.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Tool/msgmerge.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
#############################################################################
def _update_or_init_po_files(target, source, env):
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/mslib.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/mslib.py
index 01ea3ffdc80..88b5b1e109a 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/mslib.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/mslib.py
@@ -31,7 +31,7 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/mslib.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Tool/mslib.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import os
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/mslink.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/mslink.py
index 43bcb3db52a..d995d3bdcc4 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/mslink.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/mslink.py
@@ -32,7 +32,7 @@ selection method.
#
from __future__ import print_function
-__revision__ = "src/engine/SCons/Tool/mslink.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Tool/mslink.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import os
import os.path
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/mssdk.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/mssdk.py
index 8dfdbeb3981..55cb54aa262 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/mssdk.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/mssdk.py
@@ -21,7 +21,7 @@
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/mssdk.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Tool/mssdk.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
"""engine.SCons.Tool.mssdk
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/msvc.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/msvc.py
index d94a0374389..00130154270 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/msvc.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/msvc.py
@@ -31,7 +31,7 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/msvc.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Tool/msvc.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import os.path
import os
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/msvs.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/msvs.py
index 7d60097d273..4a4b3903d8c 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/msvs.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/msvs.py
@@ -32,7 +32,7 @@ selection method.
from __future__ import print_function
-__revision__ = "src/engine/SCons/Tool/msvs.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Tool/msvs.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import SCons.compat
@@ -652,7 +652,7 @@ class _GenerateV6DSP(_DSPGenerator):
for base in ("BASE ",""):
self.file.write('# PROP %sUse_MFC 0\n'
'# PROP %sUse_Debug_Libraries ' % (base, base))
- if kind.lower().find('debug') < 0:
+ if 'debug' not in kind.lower():
self.file.write('0\n')
else:
self.file.write('1\n')
@@ -731,7 +731,7 @@ class _GenerateV6DSP(_DSPGenerator):
line = dspfile.readline()
# skip until marker
while line:
- if line.find("# End Project") > -1:
+ if "# End Project" in line:
break
line = dspfile.readline()
@@ -1049,7 +1049,7 @@ class _GenerateV7DSP(_DSPGenerator, _GenerateV7User):
line = dspfile.readline()
# skip until marker
while line:
- if line.find('<!-- SCons Data:') > -1:
+ if '<!-- SCons Data:' in line:
break
line = dspfile.readline()
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/mwcc.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/mwcc.py
index 1820ddbee35..341a3efcc2f 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/mwcc.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/mwcc.py
@@ -30,7 +30,7 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/mwcc.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Tool/mwcc.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import os
import os.path
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/mwld.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/mwld.py
index 3792b165133..5af02a674e1 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/mwld.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/mwld.py
@@ -30,7 +30,7 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/mwld.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Tool/mwld.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import SCons.Tool
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/nasm.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/nasm.py
index bc1e446792f..f08930e48e7 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/nasm.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/nasm.py
@@ -31,7 +31,7 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/nasm.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Tool/nasm.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import SCons.Defaults
import SCons.Tool
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/packaging/__init__.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/packaging/__init__.py
index 02f1acd16ce..4b947f93c71 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/packaging/__init__.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/packaging/__init__.py
@@ -25,7 +25,7 @@ SCons Packaging Tool.
# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-__revision__ = "src/engine/SCons/Tool/packaging/__init__.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Tool/packaging/__init__.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import SCons.Defaults
import SCons.Environment
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/packaging/ipk.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/packaging/ipk.py
index 27657eb6185..8b4d79cf38a 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/packaging/ipk.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/packaging/ipk.py
@@ -24,7 +24,7 @@
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/packaging/ipk.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Tool/packaging/ipk.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import os
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/packaging/msi.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/packaging/msi.py
index 1038a952587..1d47268b243 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/packaging/msi.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/packaging/msi.py
@@ -25,7 +25,7 @@ The msi packager.
# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-__revision__ = "src/engine/SCons/Tool/packaging/msi.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Tool/packaging/msi.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import os
import SCons
@@ -224,7 +224,7 @@ def build_wxsfile(target, source, env):
# setup function
#
def create_default_directory_layout(root, NAME, VERSION, VENDOR, filename_set):
- """ Create the wix default target directory layout and return the innermost
+ r""" Create the wix default target directory layout and return the innermost
directory.
We assume that the XML tree delivered in the root argument already contains
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/packaging/rpm.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/packaging/rpm.py
index aa150618f13..1554d096551 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/packaging/rpm.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/packaging/rpm.py
@@ -25,7 +25,7 @@ The rpm packager.
# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-__revision__ = "src/engine/SCons/Tool/packaging/rpm.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Tool/packaging/rpm.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import os
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/packaging/src_tarbz2.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/packaging/src_tarbz2.py
index 2089142237c..1889ec96960 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/packaging/src_tarbz2.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/packaging/src_tarbz2.py
@@ -26,7 +26,7 @@ The tarbz2 SRC packager.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/packaging/src_tarbz2.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Tool/packaging/src_tarbz2.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
from SCons.Tool.packaging import putintopackageroot
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/packaging/src_targz.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/packaging/src_targz.py
index f7be89c7bd2..0d3a3db6322 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/packaging/src_targz.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/packaging/src_targz.py
@@ -26,7 +26,7 @@ The targz SRC packager.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/packaging/src_targz.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Tool/packaging/src_targz.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
from SCons.Tool.packaging import putintopackageroot
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/packaging/src_tarxz.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/packaging/src_tarxz.py
index 9093d279d21..3042cac34ad 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/packaging/src_tarxz.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/packaging/src_tarxz.py
@@ -26,7 +26,7 @@ The tarxz SRC packager.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/packaging/src_tarxz.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Tool/packaging/src_tarxz.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
from SCons.Tool.packaging import putintopackageroot
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/packaging/src_zip.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/packaging/src_zip.py
index 51859ec1812..207fb1c4b76 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/packaging/src_zip.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/packaging/src_zip.py
@@ -26,7 +26,7 @@ The zip SRC packager.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/packaging/src_zip.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Tool/packaging/src_zip.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
from SCons.Tool.packaging import putintopackageroot
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/packaging/tarbz2.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/packaging/tarbz2.py
index 6adae3b21ea..f34813b0398 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/packaging/tarbz2.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/packaging/tarbz2.py
@@ -26,7 +26,7 @@ The tarbz2 packager.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/packaging/tarbz2.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Tool/packaging/tarbz2.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
from SCons.Tool.packaging import stripinstallbuilder, putintopackageroot
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/packaging/targz.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/packaging/targz.py
index 402063f5744..8c694aff058 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/packaging/targz.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/packaging/targz.py
@@ -26,7 +26,7 @@ The targz packager.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/packaging/targz.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Tool/packaging/targz.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
from SCons.Tool.packaging import stripinstallbuilder, putintopackageroot
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/packaging/tarxz.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/packaging/tarxz.py
index 0e3e44d03c0..dc52aa91137 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/packaging/tarxz.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/packaging/tarxz.py
@@ -26,7 +26,7 @@ The tarxz packager.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/packaging/tarxz.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Tool/packaging/tarxz.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
from SCons.Tool.packaging import stripinstallbuilder, putintopackageroot
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/packaging/zip.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/packaging/zip.py
index 04bb2463df9..c7da7e9feaa 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/packaging/zip.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/packaging/zip.py
@@ -26,7 +26,7 @@ The zip SRC packager.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/packaging/zip.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Tool/packaging/zip.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
from SCons.Tool.packaging import stripinstallbuilder, putintopackageroot
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/pdf.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/pdf.py
index c2b8d72ba9f..6d6310f51bd 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/pdf.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/pdf.py
@@ -28,7 +28,7 @@ Add an explicit action to run epstopdf to convert .eps files to .pdf
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/pdf.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Tool/pdf.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import SCons.Builder
import SCons.Tool
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/pdflatex.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/pdflatex.py
index 92edf6ad9c1..75503651552 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/pdflatex.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/pdflatex.py
@@ -32,7 +32,7 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/pdflatex.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Tool/pdflatex.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import SCons.Action
import SCons.Util
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/pdftex.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/pdftex.py
index 3a4c8e1b5e5..b6595c1623c 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/pdftex.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/pdftex.py
@@ -32,7 +32,7 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/pdftex.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Tool/pdftex.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import os
import SCons.Action
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/qt.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/qt.py
index 082922491d0..351d487f1d7 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/qt.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/qt.py
@@ -33,7 +33,7 @@ selection method.
#
from __future__ import print_function
-__revision__ = "src/engine/SCons/Tool/qt.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Tool/qt.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import os.path
import re
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/rmic.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/rmic.py
index ddf12e2153c..9ff16745e39 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/rmic.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/rmic.py
@@ -31,7 +31,7 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/rmic.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Tool/rmic.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import os.path
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/rpcgen.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/rpcgen.py
index f1eebeafdc3..1fb22f124d5 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/rpcgen.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/rpcgen.py
@@ -30,7 +30,7 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/rpcgen.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Tool/rpcgen.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
from SCons.Builder import Builder
import SCons.Util
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/rpm.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/rpm.py
index 7de20ccc877..39e7b59ae2f 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/rpm.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/rpm.py
@@ -33,7 +33,7 @@ tar.gz consisting of the source file and a specfile.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/rpm.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Tool/rpm.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import os
import re
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/rpmutils.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/rpmutils.py
index bacfe50fad5..4d8b9beff9a 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/rpmutils.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/rpmutils.py
@@ -36,7 +36,7 @@ exact syntax.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
from __future__ import print_function
-__revision__ = "src/engine/SCons/Tool/rpmutils.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Tool/rpmutils.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import platform
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/sgiar.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/sgiar.py
index a2f86cb7d1e..c249815c19e 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/sgiar.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/sgiar.py
@@ -33,7 +33,7 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/sgiar.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Tool/sgiar.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import SCons.Defaults
import SCons.Tool
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/sgic++.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/sgic++.py
index 9d7da764783..0cb7a4a4c3a 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/sgic++.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/sgic++.py
@@ -31,7 +31,7 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/sgic++.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Tool/sgic++.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
#forward proxy to the preffered cxx version
from SCons.Tool.sgicxx import *
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/sgicc.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/sgicc.py
index df4cf2cd2ee..b602be82910 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/sgicc.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/sgicc.py
@@ -31,7 +31,7 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/sgicc.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Tool/sgicc.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
from . import cc
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/sgicxx.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/sgicxx.py
index 3270faa3e85..8fe0441531d 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/sgicxx.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/sgicxx.py
@@ -31,7 +31,7 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/sgicxx.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Tool/sgicxx.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import SCons.Util
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/sgilink.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/sgilink.py
index 402c28bd9a3..d5d6556caab 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/sgilink.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/sgilink.py
@@ -31,7 +31,7 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/sgilink.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Tool/sgilink.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import SCons.Util
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/sunar.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/sunar.py
index 2fab8885df9..af3d6854089 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/sunar.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/sunar.py
@@ -32,7 +32,7 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/sunar.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Tool/sunar.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import SCons.Defaults
import SCons.Tool
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/sunc++.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/sunc++.py
index d33fcdf5128..5f09d94e425 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/sunc++.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/sunc++.py
@@ -31,7 +31,7 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/sunc++.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Tool/sunc++.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
#forward proxy to the preffered cxx version
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/suncc.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/suncc.py
index bc6bc9a6e56..f40b6d32605 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/suncc.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/suncc.py
@@ -30,7 +30,7 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/suncc.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Tool/suncc.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import SCons.Util
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/suncxx.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/suncxx.py
index b0e343bb662..0c70b680d00 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/suncxx.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/suncxx.py
@@ -31,7 +31,7 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/suncxx.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Tool/suncxx.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import SCons
@@ -39,12 +39,14 @@ import os
import re
import subprocess
+from SCons.Util import PY3
import SCons.Tool.cxx
cplusplus = SCons.Tool.cxx
-#cplusplus = __import__('c++', globals(), locals(), [])
+# cplusplus = __import__('c++', globals(), locals(), [])
package_info = {}
+
def get_package_info(package_name, pkginfo, pkgchk):
try:
return package_info[package_name]
@@ -52,7 +54,7 @@ def get_package_info(package_name, pkginfo, pkgchk):
version = None
pathname = None
try:
- from subprocess import DEVNULL # py3k
+ from subprocess import DEVNULL # py3k
except ImportError:
DEVNULL = open(os.devnull, 'wb')
@@ -68,13 +70,18 @@ def get_package_info(package_name, pkginfo, pkgchk):
pathname = os.path.dirname(sadm_match.group(1))
try:
+ popen_args = {'stdout': subprocess.PIPE,
+ 'stderr': DEVNULL}
+ if PY3:
+ popen_args['universal_newlines'] = True
p = subprocess.Popen([pkginfo, '-l', package_name],
- stdout=subprocess.PIPE,
- stderr=DEVNULL)
+ **popen_args)
except EnvironmentError:
pass
else:
pkginfo_contents = p.communicate()[0]
+ if not PY3:
+ pkginfo_contents.decode()
version_re = re.compile(r'^ *VERSION:\s*(.*)$', re.M)
version_match = version_re.search(pkginfo_contents)
if version_match:
@@ -82,13 +89,18 @@ def get_package_info(package_name, pkginfo, pkgchk):
if pathname is None:
try:
+ popen_args = {'stdout': subprocess.PIPE,
+ 'stderr': DEVNULL}
+ if PY3:
+ popen_args['universal_newlines'] = True
p = subprocess.Popen([pkgchk, '-l', package_name],
- stdout=subprocess.PIPE,
- stderr=DEVNULL)
+ **popen_args)
except EnvironmentError:
pass
else:
pkgchk_contents = p.communicate()[0]
+ if not PY3:
+ pkgchk_contents.decode()
pathname_re = re.compile(r'^Pathname:\s*(.*/bin/CC)$', re.M)
pathname_match = pathname_re.search(pkgchk_contents)
if pathname_match:
@@ -97,7 +109,8 @@ def get_package_info(package_name, pkginfo, pkgchk):
package_info[package_name] = (pathname, version)
return package_info[package_name]
-# use the package installer tool lslpp to figure out where cppc and what
+
+# use the package installer tool "pkg" to figure out where cppc and what
# version of it is installed
def get_cppc(env):
cxx = env.subst('$CXX')
@@ -119,6 +132,7 @@ def get_cppc(env):
return (cppcPath, 'CC', 'CC', cppcVersion)
+
def generate(env):
"""Add Builders and construction variables for SunPRO C++."""
path, cxx, shcxx, version = get_cppc(env)
@@ -131,10 +145,11 @@ def generate(env):
env['CXX'] = cxx
env['SHCXX'] = shcxx
env['CXXVERSION'] = version
- env['SHCXXFLAGS'] = SCons.Util.CLVar('$CXXFLAGS -KPIC')
- env['SHOBJPREFIX'] = 'so_'
- env['SHOBJSUFFIX'] = '.o'
-
+ env['SHCXXFLAGS'] = SCons.Util.CLVar('$CXXFLAGS -KPIC')
+ env['SHOBJPREFIX'] = 'so_'
+ env['SHOBJSUFFIX'] = '.o'
+
+
def exists(env):
path, cxx, shcxx, version = get_cppc(env)
if path and cxx:
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/sunf77.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/sunf77.py
index 0bbb52f4064..2ea544754fc 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/sunf77.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/sunf77.py
@@ -31,7 +31,7 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/sunf77.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Tool/sunf77.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import SCons.Util
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/sunf90.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/sunf90.py
index 5c34a08978d..d69f8d175b7 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/sunf90.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/sunf90.py
@@ -31,7 +31,7 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/sunf90.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Tool/sunf90.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import SCons.Util
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/sunf95.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/sunf95.py
index 71a684040f8..f03c43f6a6a 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/sunf95.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/sunf95.py
@@ -31,7 +31,7 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/sunf95.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Tool/sunf95.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import SCons.Util
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/sunlink.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/sunlink.py
index 39a921aae4a..25ab4d4e03e 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/sunlink.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/sunlink.py
@@ -30,7 +30,7 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/sunlink.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Tool/sunlink.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import os
import os.path
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/swig.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/swig.py
index a6ab3dee335..d724500beb3 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/swig.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/swig.py
@@ -32,7 +32,7 @@ from __future__ import print_function
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/swig.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Tool/swig.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import os.path
import sys
@@ -80,7 +80,7 @@ def _find_modules(src):
for m in matches:
mnames.append(m[2])
- directors = directors or m[0].find('directors') >= 0
+ directors = directors or 'directors' in m[0]
return mnames, directors
def _add_director_header_targets(target, env):
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/tar.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/tar.py
index 6a59683fb4f..564ea0f8d10 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/tar.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/tar.py
@@ -31,7 +31,7 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/tar.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Tool/tar.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import SCons.Action
import SCons.Builder
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/tex.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/tex.py
index 8c4ee965dbd..c9d9f5522c8 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/tex.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/tex.py
@@ -33,7 +33,7 @@ selection method.
#
from __future__ import print_function
-__revision__ = "src/engine/SCons/Tool/tex.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Tool/tex.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import os.path
import re
@@ -297,8 +297,8 @@ def InternalLaTeXAuxAction(XXXLaTeXAction, target = None, source= None, env=None
logfilename = targetbase + '.log'
logContent = ''
if os.path.isfile(logfilename):
- with open(logfilename, "r") as f:
- logContent = f.read()
+ with open(logfilename, "rb") as f:
+ logContent = f.read().decode(errors='replace')
# Read the fls file to find all .aux files
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/textfile.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/textfile.py
index 8d19649e31e..906c1ac4d44 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/textfile.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/textfile.py
@@ -44,7 +44,7 @@ Textfile/Substfile builder for SCons.
is unpredictable whether the expansion will occur.
"""
-__revision__ = "src/engine/SCons/Tool/textfile.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Tool/textfile.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import SCons
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/tlib.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/tlib.py
index 0e83c1723c7..935b83fcbb4 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/tlib.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/tlib.py
@@ -27,7 +27,7 @@ XXX
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/tlib.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Tool/tlib.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import SCons.Tool
import SCons.Tool.bcc32
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/wix.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/wix.py
index 6ee17843612..093cbcd946b 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/wix.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/wix.py
@@ -30,7 +30,7 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/wix.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Tool/wix.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import SCons.Builder
import SCons.Action
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/xgettext.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/xgettext.py
index 920255abbd4..1544a62ccfc 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/xgettext.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/xgettext.py
@@ -24,7 +24,7 @@ Tool specific initialization of `xgettext` tool.
# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-__revision__ = "src/engine/SCons/Tool/xgettext.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Tool/xgettext.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import os
import re
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/yacc.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/yacc.py
index aaf9a8a7992..0fdd5dd6985 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/yacc.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/yacc.py
@@ -31,7 +31,7 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/yacc.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Tool/yacc.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import os.path
import sys
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/zip.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/zip.py
index 1c482ebcbaa..8b7ab769c14 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Tool/zip.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Tool/zip.py
@@ -31,7 +31,7 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/zip.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Tool/zip.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import os.path
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Util.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Util.py
index 7bb22cddff7..2bc129a0bac 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Util.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Util.py
@@ -24,7 +24,7 @@ Various utility functions go here.
# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-__revision__ = "src/engine/SCons/Util.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Util.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import os
import sys
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Variables/BoolVariable.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Variables/BoolVariable.py
index 287a72ae643..629faaf44e3 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Variables/BoolVariable.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Variables/BoolVariable.py
@@ -34,7 +34,7 @@ Usage example::
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Variables/BoolVariable.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Variables/BoolVariable.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
__all__ = ['BoolVariable',]
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Variables/EnumVariable.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Variables/EnumVariable.py
index 19cd9089065..22630a409f2 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Variables/EnumVariable.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Variables/EnumVariable.py
@@ -37,7 +37,7 @@ Usage example::
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Variables/EnumVariable.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Variables/EnumVariable.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
__all__ = ['EnumVariable',]
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Variables/ListVariable.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Variables/ListVariable.py
index 89b04d3cf7f..bf0f8568cc7 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Variables/ListVariable.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Variables/ListVariable.py
@@ -46,7 +46,7 @@ Usage example::
# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-__revision__ = "src/engine/SCons/Variables/ListVariable.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Variables/ListVariable.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
# Known Bug: This should behave like a Set-Type, but does not really,
# since elements can occur twice.
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Variables/PackageVariable.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Variables/PackageVariable.py
index 2100314713f..12b89744a0c 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Variables/PackageVariable.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Variables/PackageVariable.py
@@ -50,7 +50,7 @@ Usage example:
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Variables/PackageVariable.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Variables/PackageVariable.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
__all__ = ['PackageVariable',]
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Variables/PathVariable.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Variables/PathVariable.py
index 88d277e5920..5b3059d4458 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Variables/PathVariable.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Variables/PathVariable.py
@@ -67,7 +67,7 @@ Usage example::
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Variables/PathVariable.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Variables/PathVariable.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
__all__ = ['PathVariable',]
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Variables/__init__.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Variables/__init__.py
index 9daad3f803b..31d66210853 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Variables/__init__.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Variables/__init__.py
@@ -26,7 +26,7 @@ customizable variables to an SCons build.
# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-__revision__ = "src/engine/SCons/Variables/__init__.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Variables/__init__.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import os.path
import sys
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Warnings.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Warnings.py
index 064076ecd83..49a35a9443d 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/Warnings.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/Warnings.py
@@ -27,7 +27,7 @@ This file implements the warnings framework for SCons.
"""
-__revision__ = "src/engine/SCons/Warnings.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/Warnings.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import sys
@@ -120,33 +120,15 @@ class PythonVersionWarning(DeprecatedWarning):
class DeprecatedSourceCodeWarning(FutureDeprecatedWarning):
pass
-class DeprecatedBuildDirWarning(DeprecatedWarning):
- pass
-
class TaskmasterNeedsExecuteWarning(DeprecatedWarning):
pass
-class DeprecatedCopyWarning(MandatoryDeprecatedWarning):
- pass
-
class DeprecatedOptionsWarning(MandatoryDeprecatedWarning):
pass
-class DeprecatedSourceSignaturesWarning(MandatoryDeprecatedWarning):
- pass
-
-class DeprecatedTargetSignaturesWarning(MandatoryDeprecatedWarning):
- pass
-
class DeprecatedDebugOptionsWarning(MandatoryDeprecatedWarning):
pass
-class DeprecatedSigModuleWarning(MandatoryDeprecatedWarning):
- pass
-
-class DeprecatedBuilderKeywordsWarning(MandatoryDeprecatedWarning):
- pass
-
class DeprecatedMissingSConscriptWarning(DeprecatedWarning):
pass
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/__init__.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/__init__.py
index 7ffc3bbd0c1..42582b137cb 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/__init__.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/__init__.py
@@ -27,15 +27,15 @@ The main package for the SCons software construction utility.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/__init__.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/__init__.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
-__version__ = "3.1.1"
+__version__ = "3.1.2"
-__build__ = "72ae09dc35ac2626f8ff711d8c4b30b6138e08e3"
+__build__ = "bee7caf9defd6e108fc2998a2520ddb36a967691"
__buildsys__ = "octodog"
-__date__ = "2019-08-08 14:50:06"
+__date__ = "2019-12-17 02:07:09"
__developer__ = "bdeegan"
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/__main__.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/__main__.py
index 0dfbb9dc57d..0dfbb9dc57d 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/__main__.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/__main__.py
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/compat/__init__.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/compat/__init__.py
index 439d3f61954..a3935c37fb4 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/compat/__init__.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/compat/__init__.py
@@ -57,7 +57,7 @@ function defined below loads the module as the "real" name (without the
rest of our code will find our pre-loaded compatibility module.
"""
-__revision__ = "src/engine/SCons/compat/__init__.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/compat/__init__.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import os
import sys
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/compat/_scons_dbm.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/compat/_scons_dbm.py
index c9682f872e8..c5da4028d5b 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/compat/_scons_dbm.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/compat/_scons_dbm.py
@@ -30,7 +30,7 @@ that the whichdb.whichdb() implementstation in the various 2.X versions of
Python won't blow up even if dbm wasn't compiled in.
"""
-__revision__ = "src/engine/SCons/compat/_scons_dbm.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/compat/_scons_dbm.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
class error(Exception):
pass
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/cpp.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/cpp.py
index d9b3a2cc127..17a92e1b297 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/cpp.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/cpp.py
@@ -21,7 +21,7 @@
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/cpp.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/cpp.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
__doc__ = """
SCons C Pre-Processor module
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/dblite.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/dblite.py
index 14bd93dc326..14bd93dc326 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/dblite.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/dblite.py
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/exitfuncs.py b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/exitfuncs.py
index 8f5207d6234..43ae73bc643 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/SCons/exitfuncs.py
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/SCons/exitfuncs.py
@@ -27,7 +27,7 @@ Register functions which are executed when SCons exits for any reason.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/exitfuncs.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/engine/SCons/exitfuncs.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import atexit
diff --git a/src/third_party/scons-3.1.1/scons-local-3.1.1/scons-3.1.1.egg-info b/src/third_party/scons-3.1.2/scons-local-3.1.2/scons-3.1.2.egg-info
index fc3f83e59b9..321323ee246 100644
--- a/src/third_party/scons-3.1.1/scons-local-3.1.1/scons-3.1.1.egg-info
+++ b/src/third_party/scons-3.1.2/scons-local-3.1.2/scons-3.1.2.egg-info
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: scons
-Version: 3.1.1
+Version: 3.1.2
Summary: Open Source next-generation build tool.
Home-page: http://www.scons.org/
Author: William Deegan
diff --git a/src/third_party/scons-3.1.1/scons-time.py b/src/third_party/scons-3.1.2/scons-time.py
index 15e37008e08..c371d59b300 100755
--- a/src/third_party/scons-3.1.1/scons-time.py
+++ b/src/third_party/scons-3.1.2/scons-time.py
@@ -31,7 +31,7 @@
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
from __future__ import division, print_function
-__revision__ = "src/script/scons-time.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/script/scons-time.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
import getopt
import glob
@@ -274,8 +274,6 @@ class SConsTimer(object):
return kw
default_settings = makedict(
- aegis = 'aegis',
- aegis_project = None,
chdir = None,
config_file = None,
initial_commands = [],
@@ -1113,7 +1111,6 @@ class SConsTimer(object):
help = """\
Usage: scons-time run [OPTIONS] [FILE ...]
- --aegis=PROJECT Use SCons from the Aegis PROJECT
--chdir=DIR Name of unpacked directory for chdir
-f FILE, --file=FILE Read configuration from specified FILE
-h, --help Print this help and exit
@@ -1138,7 +1135,6 @@ class SConsTimer(object):
short_opts = '?f:hnp:qs:v'
long_opts = [
- 'aegis=',
'file=',
'help',
'no-exec',
@@ -1157,9 +1153,7 @@ class SConsTimer(object):
opts, args = getopt.getopt(argv[1:], short_opts, long_opts)
for o, a in opts:
- if o in ('--aegis',):
- self.aegis_project = a
- elif o in ('-f', '--file'):
+ if o in ('-f', '--file'):
self.config_file = a
elif o in ('-?', '-h', '--help'):
self.do_help(['help', 'run'])
@@ -1211,8 +1205,6 @@ class SConsTimer(object):
prepare = None
if self.subversion_url:
prepare = self.prep_subversion_run
- elif self.aegis_project:
- prepare = self.prep_aegis_run
for run_number in run_number_list:
self.individual_run(run_number, self.archive_list, prepare)
@@ -1234,20 +1226,6 @@ class SConsTimer(object):
def scons_lib_dir_path(self, dir):
return os.path.join(dir, 'src', 'engine')
- def prep_aegis_run(self, commands, removals):
- self.aegis_tmpdir = tempfile.mkdtemp(prefix=self.name + '-aegis-')
- removals.append((shutil.rmtree, 'rm -rf %%s', self.aegis_tmpdir))
-
- self.aegis_parent_project = os.path.splitext(self.aegis_project)[0]
- self.scons = self.scons_path(self.aegis_tmpdir)
- self.scons_lib_dir = self.scons_lib_dir_path(self.aegis_tmpdir)
-
- commands.extend([
- (lambda: os.chdir(self.aegis_tmpdir), 'cd %(aegis_tmpdir)s'),
- '%(aegis)s -cp -ind -p %(aegis_parent_project)s .',
- '%(aegis)s -cp -ind -p %(aegis_project)s -delta %(run_number)s .',
- ])
-
def prep_subversion_run(self, commands, removals):
self.svn_tmpdir = tempfile.mkdtemp(prefix=self.name + '-svn-')
removals.append((shutil.rmtree, 'rm -rf %%s', self.svn_tmpdir))
diff --git a/src/third_party/scons-3.1.1/scons.bat b/src/third_party/scons-3.1.2/scons.bat
index a5b1b6e64ff..dc671889f63 100755
--- a/src/third_party/scons-3.1.1/scons.bat
+++ b/src/third_party/scons-3.1.2/scons.bat
@@ -1,11 +1,11 @@
@REM Copyright (c) 2001 - 2019 The SCons Foundation
-@REM src/script/scons.bat 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan
+@REM src/script/scons.bat bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 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.1.1'), join(sys.prefix, 'Lib', 'site-packages', 'scons'), join(sys.prefix, 'scons-3.1.1'), 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.2'), join(sys.prefix, 'Lib', 'site-packages', 'scons'), join(sys.prefix, 'scons-3.1.2'), 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
diff --git a/src/third_party/scons-3.1.1/scons.py b/src/third_party/scons-3.1.2/scons.py
index 1d9595e85e6..d889e7472fb 100755
--- a/src/third_party/scons-3.1.1/scons.py
+++ b/src/third_party/scons-3.1.2/scons.py
@@ -25,15 +25,15 @@
from __future__ import print_function
-__revision__ = "src/script/scons.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/script/scons.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
-__version__ = "3.1.1"
+__version__ = "3.1.2"
-__build__ = "72ae09dc35ac2626f8ff711d8c4b30b6138e08e3"
+__build__ = "bee7caf9defd6e108fc2998a2520ddb36a967691"
__buildsys__ = "octodog"
-__date__ = "2019-08-08 14:50:06"
+__date__ = "2019-12-17 02:07:09"
__developer__ = "bdeegan"
diff --git a/src/third_party/scons-3.1.1/sconsign.py b/src/third_party/scons-3.1.2/sconsign.py
index 7c5dda5c03d..b1f7cd0b98b 100755
--- a/src/third_party/scons-3.1.1/sconsign.py
+++ b/src/third_party/scons-3.1.2/sconsign.py
@@ -25,15 +25,15 @@
from __future__ import print_function
-__revision__ = "src/script/sconsign.py 72ae09dc35ac2626f8ff711d8c4b30b6138e08e3 2019-08-08 14:50:06 bdeegan"
+__revision__ = "src/script/sconsign.py bee7caf9defd6e108fc2998a2520ddb36a967691 2019-12-17 02:07:09 bdeegan"
-__version__ = "3.1.1"
+__version__ = "3.1.2"
-__build__ = "72ae09dc35ac2626f8ff711d8c4b30b6138e08e3"
+__build__ = "bee7caf9defd6e108fc2998a2520ddb36a967691"
__buildsys__ = "octodog"
-__date__ = "2019-08-08 14:50:06"
+__date__ = "2019-12-17 02:07:09"
__developer__ = "bdeegan"