From f32f3b34aeb9954b0e4af1bcbf464b0a057587bf Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Wed, 15 Nov 2017 09:53:56 -0800 Subject: [PATCH 1/6] add glibc_workaround.cpp if option is chosen This reverts commit 751d9bff1672f6b8cbd2b5ebe2eb460223746806. --- src/build.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/build.py b/src/build.py index 5a8fb227e..66b52aed2 100644 --- a/src/build.py +++ b/src/build.py @@ -313,6 +313,13 @@ cairo/process_markers_symbolizer.cpp cairo/process_group_symbolizer.cpp """) +if env['ENABLE_GLIBC_WORKAROUND']: + source += Split( + """ + glibc_workaround.cpp + """ + ) + if env['HAS_CAIRO']: lib_env.AppendUnique(LIBPATH=env['CAIRO_LIBPATHS']) lib_env.Append(CPPDEFINES = '-DHAVE_CAIRO') From 5e06dfb50b7879f0fde4ecdca9d20cedd2652c46 Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Wed, 15 Nov 2017 20:32:23 -0800 Subject: [PATCH 2/6] add script that asserts on expected symbols --- .travis.yml | 4 +--- scripts/check_glibcxx.sh | 31 +++++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 3 deletions(-) create mode 100755 scripts/check_glibcxx.sh diff --git a/.travis.yml b/.travis.yml index dd89b3aec..949920138 100644 --- a/.travis.yml +++ b/.travis.yml @@ -106,15 +106,13 @@ script: # (and might work) for the next build - DURATION=2400 - scripts/travis-command-wrapper.py -s "date" -i 120 --deadline=$(( $(date +%s) + ${DURATION} )) make - # dump glibcxx symbols >= 3.4.20 (if this returns output - # then it means the binaries will not run on ubuntu trusty without upgrading libstdc++) - - nm src/libmapnik* | grep "GLIBCXX_3.4.2[0-9]" || true - RESULT=0 - make test || RESULT=$? # we allow visual failures with g++ for now: https://github.com/mapnik/mapnik/issues/3567 - if [[ ${RESULT} != 0 ]] && [[ ${CXX} =~ 'clang++' ]]; then false; fi; - enabled ${COVERAGE} coverage - enabled ${BENCH} make bench + - ./scripts/check_glibcxx.sh after_success: - enabled ${TRIGGER} trigger_downstream diff --git a/scripts/check_glibcxx.sh b/scripts/check_glibcxx.sh new file mode 100755 index 000000000..d8d40924e --- /dev/null +++ b/scripts/check_glibcxx.sh @@ -0,0 +1,31 @@ +#!/bin/bash + +set -eu +set -o pipefail +shopt -s nullglob + +: ' + +Ensure no GLIBCXX_3.4.2x symbols are present in the binary +if ENABLE_GLIBC_WORKAROUND is set. + +If symbols >= 3.4.20 then it means the binaries would not run on ubuntu trusty without upgrading libstdc++ + +' +function check() { + local RESULT=0 + nm ${1} | grep "GLIBCXX_3.4.2[0-9]" > /tmp/out.txt || RESULT=$? + if [[ ${RESULT} != 0 ]]; then + echo "Success: GLIBCXX_3.4.2[0-9] symbols not present in binary (as expected)" + else + echo "$(cat /tmp/out.txt | c++filt)" + exit 1 + fi +} + +if [[ ${ENABLE_GLIBC_WORKAROUND:-false} == true ]]; then + for i in src/libmapnik*; do + echo "checking $i" + check $i + done +fi \ No newline at end of file From a2b7f642e0f6b158b9be1bea3a6c71e52be9ae06 Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Wed, 15 Nov 2017 21:48:20 -0800 Subject: [PATCH 3/6] check symbols for all modes, only error if symbols exist + ENABLE_GLIBC_WORKAROUND --- scripts/check_glibcxx.sh | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/scripts/check_glibcxx.sh b/scripts/check_glibcxx.sh index d8d40924e..9e4cbc54f 100755 --- a/scripts/check_glibcxx.sh +++ b/scripts/check_glibcxx.sh @@ -12,6 +12,9 @@ if ENABLE_GLIBC_WORKAROUND is set. If symbols >= 3.4.20 then it means the binaries would not run on ubuntu trusty without upgrading libstdc++ ' + +FINAL_RETURN_CODE=0 + function check() { local RESULT=0 nm ${1} | grep "GLIBCXX_3.4.2[0-9]" > /tmp/out.txt || RESULT=$? @@ -19,13 +22,15 @@ function check() { echo "Success: GLIBCXX_3.4.2[0-9] symbols not present in binary (as expected)" else echo "$(cat /tmp/out.txt | c++filt)" - exit 1 + if [[ ${ENABLE_GLIBC_WORKAROUND:-false} == true ]]; then + FINAL_RETURN_CODE=1 + fi fi } -if [[ ${ENABLE_GLIBC_WORKAROUND:-false} == true ]]; then - for i in src/libmapnik*; do - echo "checking $i" - check $i - done -fi \ No newline at end of file +for i in src/libmapnik*; do + echo "checking $i" + check $i +done + +return ${FINAL_RETURN_CODE} \ No newline at end of file From a780581ebc051c046d51efb003bcf10bf6fa2b01 Mon Sep 17 00:00:00 2001 From: artemp Date: Mon, 5 Jun 2017 10:25:21 +0200 Subject: [PATCH 4/6] Scons - update to 2.5.1 --- .../SCons/compat/_scons_builtins.py | 107 ------------------ .../SCons/compat/_scons_hashlib.py | 76 ------------- .../SCons/Action.py | 2 +- .../SCons/Builder.py | 2 +- .../SCons/CacheDir.py | 2 +- .../SCons/Conftest.py | 0 .../SCons/Debug.py | 2 +- .../SCons/Defaults.py | 2 +- .../SCons/Environment.py | 2 +- .../SCons/Errors.py | 4 +- .../SCons/Executor.py | 2 +- .../SCons/Job.py | 2 +- .../SCons/Memoize.py | 2 +- .../SCons/Node/Alias.py | 2 +- .../SCons/Node/FS.py | 2 +- .../SCons/Node/Python.py | 2 +- .../SCons/Node/__init__.py | 26 +++-- .../SCons/Options/BoolOption.py | 2 +- .../SCons/Options/EnumOption.py | 2 +- .../SCons/Options/ListOption.py | 2 +- .../SCons/Options/PackageOption.py | 2 +- .../SCons/Options/PathOption.py | 2 +- .../SCons/Options/__init__.py | 2 +- .../SCons/PathList.py | 2 +- .../SCons/Platform/__init__.py | 2 +- .../SCons/Platform/aix.py | 2 +- .../SCons/Platform/cygwin.py | 2 +- .../SCons/Platform/darwin.py | 2 +- .../SCons/Platform/hpux.py | 2 +- .../SCons/Platform/irix.py | 2 +- .../SCons/Platform/os2.py | 2 +- .../SCons/Platform/posix.py | 2 +- .../SCons/Platform/sunos.py | 2 +- .../SCons/Platform/win32.py | 2 +- .../SCons/SConf.py | 2 +- .../SCons/SConsign.py | 2 +- .../SCons/Scanner/C.py | 2 +- .../SCons/Scanner/D.py | 2 +- .../SCons/Scanner/Dir.py | 2 +- .../SCons/Scanner/Fortran.py | 2 +- .../SCons/Scanner/IDL.py | 2 +- .../SCons/Scanner/LaTeX.py | 2 +- .../SCons/Scanner/Prog.py | 2 +- .../SCons/Scanner/RC.py | 2 +- .../SCons/Scanner/SWIG.py | 2 +- .../SCons/Scanner/__init__.py | 2 +- .../SCons/Script/Interactive.py | 2 +- .../SCons/Script/Main.py | 6 +- .../SCons/Script/SConsOptions.py | 2 +- .../SCons/Script/SConscript.py | 2 +- .../SCons/Script/__init__.py | 2 +- .../SCons/Sig.py | 2 +- .../SCons/Subst.py | 2 +- .../SCons/Taskmaster.py | 2 +- .../SCons/Tool/386asm.py | 2 +- .../SCons/Tool/BitKeeper.py | 2 +- .../SCons/Tool/CVS.py | 2 +- .../SCons/Tool/DCommon.py | 2 +- .../SCons/Tool/FortranCommon.py | 2 +- .../SCons/Tool/GettextCommon.py | 2 +- .../SCons/Tool/JavaCommon.py | 2 +- .../SCons/Tool/MSCommon/__init__.py | 2 +- .../SCons/Tool/MSCommon/arch.py | 2 +- .../SCons/Tool/MSCommon/common.py | 2 +- .../SCons/Tool/MSCommon/netframework.py | 2 +- .../SCons/Tool/MSCommon/sdk.py | 2 +- .../SCons/Tool/MSCommon/vc.py | 2 +- .../SCons/Tool/MSCommon/vs.py | 2 +- .../SCons/Tool/Perforce.py | 2 +- .../SCons/Tool/PharLapCommon.py | 2 +- .../SCons/Tool/RCS.py | 2 +- .../SCons/Tool/SCCS.py | 2 +- .../SCons/Tool/Subversion.py | 2 +- .../SCons/Tool/__init__.py | 2 +- .../SCons/Tool/aixc++.py | 2 +- .../SCons/Tool/aixcc.py | 2 +- .../SCons/Tool/aixf77.py | 2 +- .../SCons/Tool/aixlink.py | 2 +- .../SCons/Tool/applelink.py | 2 +- .../SCons/Tool/ar.py | 2 +- .../SCons/Tool/as.py | 2 +- .../SCons/Tool/bcc32.py | 2 +- .../SCons/Tool/c++.py | 2 +- .../SCons/Tool/cc.py | 2 +- .../SCons/Tool/cvf.py | 2 +- .../SCons/Tool/cyglink.py | 0 .../SCons/Tool/default.py | 2 +- .../SCons/Tool/dmd.py | 2 +- .../SCons/Tool/docbook/__init__.py | 0 .../SCons/Tool/dvi.py | 2 +- .../SCons/Tool/dvipdf.py | 2 +- .../SCons/Tool/dvips.py | 2 +- .../SCons/Tool/f03.py | 2 +- .../SCons/Tool/f77.py | 2 +- .../SCons/Tool/f90.py | 2 +- .../SCons/Tool/f95.py | 2 +- .../SCons/Tool/filesystem.py | 2 +- .../SCons/Tool/fortran.py | 2 +- .../SCons/Tool/g++.py | 2 +- .../SCons/Tool/g77.py | 2 +- .../SCons/Tool/gas.py | 2 +- .../SCons/Tool/gcc.py | 2 +- .../SCons/Tool/gdc.py | 2 +- .../SCons/Tool/gettext.py | 2 +- .../SCons/Tool/gfortran.py | 2 +- .../SCons/Tool/gnulink.py | 2 +- .../SCons/Tool/gs.py | 2 +- .../SCons/Tool/hpc++.py | 2 +- .../SCons/Tool/hpcc.py | 2 +- .../SCons/Tool/hplink.py | 2 +- .../SCons/Tool/icc.py | 2 +- .../SCons/Tool/icl.py | 2 +- .../SCons/Tool/ifl.py | 2 +- .../SCons/Tool/ifort.py | 2 +- .../SCons/Tool/ilink.py | 2 +- .../SCons/Tool/ilink32.py | 2 +- .../SCons/Tool/install.py | 2 +- .../SCons/Tool/intelc.py | 2 +- .../SCons/Tool/ipkg.py | 2 +- .../SCons/Tool/jar.py | 2 +- .../SCons/Tool/javac.py | 2 +- .../SCons/Tool/javah.py | 2 +- .../SCons/Tool/latex.py | 2 +- .../SCons/Tool/ldc.py | 2 +- .../SCons/Tool/lex.py | 2 +- .../SCons/Tool/link.py | 2 +- .../SCons/Tool/linkloc.py | 2 +- .../SCons/Tool/m4.py | 2 +- .../SCons/Tool/masm.py | 2 +- .../SCons/Tool/midl.py | 2 +- .../SCons/Tool/mingw.py | 2 +- .../SCons/Tool/msgfmt.py | 2 +- .../SCons/Tool/msginit.py | 2 +- .../SCons/Tool/msgmerge.py | 2 +- .../SCons/Tool/mslib.py | 2 +- .../SCons/Tool/mslink.py | 2 +- .../SCons/Tool/mssdk.py | 2 +- .../SCons/Tool/msvc.py | 2 +- .../SCons/Tool/msvs.py | 2 +- .../SCons/Tool/mwcc.py | 2 +- .../SCons/Tool/mwld.py | 2 +- .../SCons/Tool/nasm.py | 2 +- .../SCons/Tool/packaging/__init__.py | 2 +- .../SCons/Tool/packaging/ipk.py | 2 +- .../SCons/Tool/packaging/msi.py | 2 +- .../SCons/Tool/packaging/rpm.py | 2 +- .../SCons/Tool/packaging/src_tarbz2.py | 2 +- .../SCons/Tool/packaging/src_targz.py | 2 +- .../SCons/Tool/packaging/src_zip.py | 2 +- .../SCons/Tool/packaging/tarbz2.py | 2 +- .../SCons/Tool/packaging/targz.py | 2 +- .../SCons/Tool/packaging/zip.py | 2 +- .../SCons/Tool/pdf.py | 2 +- .../SCons/Tool/pdflatex.py | 2 +- .../SCons/Tool/pdftex.py | 2 +- .../SCons/Tool/qt.py | 2 +- .../SCons/Tool/rmic.py | 2 +- .../SCons/Tool/rpcgen.py | 2 +- .../SCons/Tool/rpm.py | 2 +- .../SCons/Tool/rpmutils.py | 2 +- .../SCons/Tool/sgiar.py | 2 +- .../SCons/Tool/sgic++.py | 2 +- .../SCons/Tool/sgicc.py | 2 +- .../SCons/Tool/sgilink.py | 2 +- .../SCons/Tool/sunar.py | 2 +- .../SCons/Tool/sunc++.py | 2 +- .../SCons/Tool/suncc.py | 2 +- .../SCons/Tool/sunf77.py | 2 +- .../SCons/Tool/sunf90.py | 2 +- .../SCons/Tool/sunf95.py | 2 +- .../SCons/Tool/sunlink.py | 2 +- .../SCons/Tool/swig.py | 2 +- .../SCons/Tool/tar.py | 2 +- .../SCons/Tool/tex.py | 2 +- .../SCons/Tool/textfile.py | 2 +- .../SCons/Tool/tlib.py | 2 +- .../SCons/Tool/wix.py | 2 +- .../SCons/Tool/xgettext.py | 2 +- .../SCons/Tool/yacc.py | 2 +- .../SCons/Tool/zip.py | 2 +- .../SCons/Util.py | 2 +- .../SCons/Variables/BoolVariable.py | 2 +- .../SCons/Variables/EnumVariable.py | 2 +- .../SCons/Variables/ListVariable.py | 2 +- .../SCons/Variables/PackageVariable.py | 2 +- .../SCons/Variables/PathVariable.py | 2 +- .../SCons/Variables/__init__.py | 2 +- .../SCons/Warnings.py | 2 +- .../SCons/__init__.py | 10 +- .../SCons/compat/__init__.py | 2 +- .../SCons/compat/_scons_dbm.py | 2 +- .../SCons/cpp.py | 2 +- .../SCons/dblite.py | 0 .../SCons/exitfuncs.py | 2 +- .../scons-2.5.1-py2.7.egg-info} | 2 +- scons/scons-time.py | 2 +- scons/scons.py | 10 +- scons/sconsign.py | 10 +- 198 files changed, 220 insertions(+), 401 deletions(-) delete mode 100644 scons/scons-local-2.5.0/SCons/compat/_scons_builtins.py delete mode 100644 scons/scons-local-2.5.0/SCons/compat/_scons_hashlib.py rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Action.py (99%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Builder.py (99%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/CacheDir.py (99%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Conftest.py (100%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Debug.py (98%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Defaults.py (99%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Environment.py (99%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Errors.py (97%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Executor.py (99%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Job.py (99%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Memoize.py (98%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Node/Alias.py (97%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Node/FS.py (99%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Node/Python.py (98%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Node/__init__.py (99%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Options/BoolOption.py (94%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Options/EnumOption.py (94%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Options/ListOption.py (94%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Options/PackageOption.py (97%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Options/PathOption.py (95%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Options/__init__.py (95%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/PathList.py (98%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Platform/__init__.py (98%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Platform/aix.py (96%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Platform/cygwin.py (94%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Platform/darwin.py (95%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Platform/hpux.py (93%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Platform/irix.py (93%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Platform/os2.py (95%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Platform/posix.py (97%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Platform/sunos.py (94%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Platform/win32.py (99%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/SConf.py (99%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/SConsign.py (99%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Scanner/C.py (97%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Scanner/D.py (95%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Scanner/Dir.py (97%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Scanner/Fortran.py (99%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Scanner/IDL.py (94%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Scanner/LaTeX.py (99%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Scanner/Prog.py (97%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Scanner/RC.py (94%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Scanner/SWIG.py (93%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Scanner/__init__.py (99%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Script/Interactive.py (99%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Script/Main.py (99%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Script/SConsOptions.py (99%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Script/SConscript.py (99%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Script/__init__.py (99%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Sig.py (95%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Subst.py (99%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Taskmaster.py (99%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Tool/386asm.py (95%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Tool/BitKeeper.py (95%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Tool/CVS.py (96%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Tool/DCommon.py (94%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Tool/FortranCommon.py (98%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Tool/GettextCommon.py (99%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Tool/JavaCommon.py (99%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Tool/MSCommon/__init__.py (97%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Tool/MSCommon/arch.py (94%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Tool/MSCommon/common.py (99%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Tool/MSCommon/netframework.py (97%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Tool/MSCommon/sdk.py (99%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Tool/MSCommon/vc.py (99%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Tool/MSCommon/vs.py (99%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Tool/Perforce.py (97%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Tool/PharLapCommon.py (97%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Tool/RCS.py (95%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Tool/SCCS.py (95%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Tool/Subversion.py (95%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Tool/__init__.py (99%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Tool/aixc++.py (95%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Tool/aixcc.py (95%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Tool/aixf77.py (96%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Tool/aixlink.py (96%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Tool/applelink.py (96%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Tool/ar.py (95%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Tool/as.py (96%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Tool/bcc32.py (96%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Tool/c++.py (96%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Tool/cc.py (97%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Tool/cvf.py (95%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Tool/cyglink.py (100%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Tool/default.py (93%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Tool/dmd.py (98%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Tool/docbook/__init__.py (100%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Tool/dvi.py (95%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Tool/dvipdf.py (97%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Tool/dvips.py (96%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Tool/f03.py (94%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Tool/f77.py (94%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Tool/f90.py (94%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Tool/f95.py (94%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Tool/filesystem.py (96%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Tool/fortran.py (94%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Tool/g++.py (96%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Tool/g77.py (95%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Tool/gas.py (94%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Tool/gcc.py (97%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Tool/gdc.py (98%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Tool/gettext.py (94%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Tool/gfortran.py (95%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Tool/gnulink.py (96%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Tool/gs.py (96%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Tool/hpc++.py (96%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Tool/hpcc.py (94%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Tool/hplink.py (95%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Tool/icc.py (95%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Tool/icl.py (94%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Tool/ifl.py (96%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Tool/ifort.py (96%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Tool/ilink.py (95%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Tool/ilink32.py (94%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Tool/install.py (99%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Tool/intelc.py (99%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Tool/ipkg.py (95%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Tool/jar.py (97%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Tool/javac.py (98%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Tool/javah.py (97%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Tool/latex.py (96%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Tool/ldc.py (98%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Tool/lex.py (96%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Tool/link.py (99%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Tool/linkloc.py (97%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Tool/m4.py (95%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Tool/masm.py (96%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Tool/midl.py (96%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Tool/mingw.py (98%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Tool/msgfmt.py (97%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Tool/msginit.py (97%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Tool/msgmerge.py (97%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Tool/mslib.py (95%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Tool/mslink.py (99%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Tool/mssdk.py (94%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Tool/msvc.py (99%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Tool/msvs.py (99%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Tool/mwcc.py (98%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Tool/mwld.py (97%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Tool/nasm.py (96%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Tool/packaging/__init__.py (99%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Tool/packaging/ipk.py (98%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Tool/packaging/msi.py (99%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Tool/packaging/rpm.py (99%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Tool/packaging/src_tarbz2.py (96%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Tool/packaging/src_targz.py (96%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Tool/packaging/src_zip.py (96%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Tool/packaging/tarbz2.py (97%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Tool/packaging/targz.py (97%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Tool/packaging/zip.py (93%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Tool/pdf.py (96%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Tool/pdflatex.py (96%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Tool/pdftex.py (97%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Tool/qt.py (99%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Tool/rmic.py (97%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Tool/rpcgen.py (96%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Tool/rpm.py (97%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Tool/rpmutils.py (99%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Tool/sgiar.py (95%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Tool/sgic++.py (94%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Tool/sgicc.py (94%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Tool/sgilink.py (95%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Tool/sunar.py (95%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Tool/sunc++.py (97%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Tool/suncc.py (94%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Tool/sunf77.py (95%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Tool/sunf90.py (95%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Tool/sunf95.py (95%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Tool/sunlink.py (95%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Tool/swig.py (98%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Tool/tar.py (95%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Tool/tex.py (99%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Tool/textfile.py (98%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Tool/tlib.py (94%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Tool/wix.py (97%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Tool/xgettext.py (99%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Tool/yacc.py (97%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Tool/zip.py (97%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Util.py (99%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Variables/BoolVariable.py (98%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Variables/EnumVariable.py (98%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Variables/ListVariable.py (98%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Variables/PackageVariable.py (98%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Variables/PathVariable.py (99%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Variables/__init__.py (98%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/Warnings.py (98%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/__init__.py (85%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/compat/__init__.py (97%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/compat/_scons_dbm.py (93%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/cpp.py (99%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/dblite.py (100%) rename scons/{scons-local-2.5.0 => scons-local-2.5.1}/SCons/exitfuncs.py (95%) rename scons/{scons-local-2.5.0/scons-2.5.0-py2.7.egg-info => scons-local-2.5.1/scons-2.5.1-py2.7.egg-info} (96%) diff --git a/scons/scons-local-2.5.0/SCons/compat/_scons_builtins.py b/scons/scons-local-2.5.0/SCons/compat/_scons_builtins.py deleted file mode 100644 index cc97faf8f..000000000 --- a/scons/scons-local-2.5.0/SCons/compat/_scons_builtins.py +++ /dev/null @@ -1,107 +0,0 @@ -# -# Copyright (c) 2001 - 2015 The SCons Foundation -# -# Permission is hereby granted, free of charge, to any person obtaining -# a copy of this software and associated documentation files (the -# "Software"), to deal in the Software without restriction, including -# without limitation the rights to use, copy, modify, merge, publish, -# distribute, sublicense, and/or sell copies of the Software, and to -# permit persons to whom the Software is furnished to do so, subject to -# the following conditions: -# -# The above copyright notice and this permission notice shall be included -# in all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY -# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE -# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -# - -# Portions of the following are derived from the compat.py file in -# Twisted, under the following copyright: -# -# Copyright (c) 2001-2004 Twisted Matrix Laboratories - -__doc__ = """ -Compatibility idioms for builtins names - -This module adds names to the builtins module for things that we want -to use in SCons but which don't show up until later Python versions than -the earliest ones we support. - -This module checks for the following builtins names: - - all() - any() - memoryview() - -Implementations of functions are *NOT* guaranteed to be fully compliant -with these functions in later versions of Python. We are only concerned -with adding functionality that we actually use in SCons, so be wary -if you lift this code for other uses. (That said, making these more -nearly the same as later, official versions is still a desirable goal, -we just don't need to be obsessive about it.) - -If you're looking at this with pydoc and various names don't show up in -the FUNCTIONS or DATA output, that means those names are already built in -to this version of Python and we don't need to add them from this module. -""" - -__revision__ = "src/engine/SCons/compat/_scons_builtins.py rel_2.4.1:3480:df381b06597b 2015/11/21 07:35:35 bdbaddog" - -import builtins - -try: - all -except NameError: - # Pre-2.5 Python has no all() function. - def all(iterable): - """ - Returns True if all elements of the iterable are true. - """ - for element in iterable: - if not element: - return False - return True - builtins.all = all - all = all - -try: - any -except NameError: - # Pre-2.5 Python has no any() function. - def any(iterable): - """ - Returns True if any element of the iterable is true. - """ - for element in iterable: - if element: - return True - return False - builtins.any = any - any = any - -try: - memoryview -except NameError: - # Pre-2.7 doesn't have the memoryview() built-in. - class memoryview(object): - def __init__(self, obj): - # wrapping buffer in () keeps the fixer from changing it - self.obj = (buffer)(obj) - def __getitem__(self, indx): - if isinstance(indx, slice): - return self.obj[indx.start:indx.stop] - else: - return self.obj[indx] - builtins.memoryview = memoryview - -# Local Variables: -# tab-width:4 -# indent-tabs-mode:nil -# End: -# vim: set expandtab tabstop=4 shiftwidth=4: diff --git a/scons/scons-local-2.5.0/SCons/compat/_scons_hashlib.py b/scons/scons-local-2.5.0/SCons/compat/_scons_hashlib.py deleted file mode 100644 index e86078262..000000000 --- a/scons/scons-local-2.5.0/SCons/compat/_scons_hashlib.py +++ /dev/null @@ -1,76 +0,0 @@ -# -# Copyright (c) 2001 - 2015 The SCons Foundation -# -# Permission is hereby granted, free of charge, to any person obtaining -# a copy of this software and associated documentation files (the -# "Software"), to deal in the Software without restriction, including -# without limitation the rights to use, copy, modify, merge, publish, -# distribute, sublicense, and/or sell copies of the Software, and to -# permit persons to whom the Software is furnished to do so, subject to -# the following conditions: -# -# The above copyright notice and this permission notice shall be included -# in all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY -# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE -# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -# - -__doc__ = """ -hashlib backwards-compatibility module for older (pre-2.5) Python versions - -This does not not NOT (repeat, *NOT*) provide complete hashlib -functionality. It only wraps the portions of MD5 functionality used -by SCons, in an interface that looks like hashlib (or enough for our -purposes, anyway). In fact, this module will raise an ImportError if -the underlying md5 module isn't available. -""" - -__revision__ = "src/engine/SCons/compat/_scons_hashlib.py rel_2.4.1:3480:df381b06597b 2015/11/21 07:35:35 bdbaddog" - -import md5 -from string import hexdigits - -class md5obj(object): - - md5_module = md5 - - def __init__(self, name, string=''): - if not name in ('MD5', 'md5'): - raise ValueError("unsupported hash type") - self.name = 'md5' - self.m = self.md5_module.md5() - - def __repr__(self): - return '<%s HASH object @ %#x>' % (self.name, id(self)) - - def copy(self): - import copy - result = copy.copy(self) - result.m = self.m.copy() - return result - - def digest(self): - return self.m.digest() - - def update(self, arg): - return self.m.update(arg) - - def hexdigest(self): - return self.m.hexdigest() - -new = md5obj - -def md5(string=''): - return md5obj('md5', string) - -# Local Variables: -# tab-width:4 -# indent-tabs-mode:nil -# End: -# vim: set expandtab tabstop=4 shiftwidth=4: diff --git a/scons/scons-local-2.5.0/SCons/Action.py b/scons/scons-local-2.5.1/SCons/Action.py similarity index 99% rename from scons/scons-local-2.5.0/SCons/Action.py rename to scons/scons-local-2.5.1/SCons/Action.py index 6c34a4331..00b2909ab 100644 --- a/scons/scons-local-2.5.0/SCons/Action.py +++ b/scons/scons-local-2.5.1/SCons/Action.py @@ -97,7 +97,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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Action.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import dis import os diff --git a/scons/scons-local-2.5.0/SCons/Builder.py b/scons/scons-local-2.5.1/SCons/Builder.py similarity index 99% rename from scons/scons-local-2.5.0/SCons/Builder.py rename to scons/scons-local-2.5.1/SCons/Builder.py index 060b1a865..6bc5c9293 100644 --- a/scons/scons-local-2.5.0/SCons/Builder.py +++ b/scons/scons-local-2.5.1/SCons/Builder.py @@ -97,7 +97,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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Builder.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import collections diff --git a/scons/scons-local-2.5.0/SCons/CacheDir.py b/scons/scons-local-2.5.1/SCons/CacheDir.py similarity index 99% rename from scons/scons-local-2.5.0/SCons/CacheDir.py rename to scons/scons-local-2.5.1/SCons/CacheDir.py index 05199d931..cfeab0058 100644 --- a/scons/scons-local-2.5.0/SCons/CacheDir.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/CacheDir.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" __doc__ = """ CacheDir support diff --git a/scons/scons-local-2.5.0/SCons/Conftest.py b/scons/scons-local-2.5.1/SCons/Conftest.py similarity index 100% rename from scons/scons-local-2.5.0/SCons/Conftest.py rename to scons/scons-local-2.5.1/SCons/Conftest.py diff --git a/scons/scons-local-2.5.0/SCons/Debug.py b/scons/scons-local-2.5.1/SCons/Debug.py similarity index 98% rename from scons/scons-local-2.5.0/SCons/Debug.py rename to scons/scons-local-2.5.1/SCons/Debug.py index 2ba97cd3a..ac45bc094 100644 --- a/scons/scons-local-2.5.0/SCons/Debug.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Debug.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import os import sys diff --git a/scons/scons-local-2.5.0/SCons/Defaults.py b/scons/scons-local-2.5.1/SCons/Defaults.py similarity index 99% rename from scons/scons-local-2.5.0/SCons/Defaults.py rename to scons/scons-local-2.5.1/SCons/Defaults.py index 91f8f2c74..d25d3ee63 100644 --- a/scons/scons-local-2.5.0/SCons/Defaults.py +++ b/scons/scons-local-2.5.1/SCons/Defaults.py @@ -33,7 +33,7 @@ from distutils.msvccompiler. # from __future__ import division -__revision__ = "src/engine/SCons/Defaults.py rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Defaults.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import os diff --git a/scons/scons-local-2.5.0/SCons/Environment.py b/scons/scons-local-2.5.1/SCons/Environment.py similarity index 99% rename from scons/scons-local-2.5.0/SCons/Environment.py rename to scons/scons-local-2.5.1/SCons/Environment.py index 71361add4..78fe32756 100644 --- a/scons/scons-local-2.5.0/SCons/Environment.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Environment.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import copy diff --git a/scons/scons-local-2.5.0/SCons/Errors.py b/scons/scons-local-2.5.1/SCons/Errors.py similarity index 97% rename from scons/scons-local-2.5.0/SCons/Errors.py rename to scons/scons-local-2.5.1/SCons/Errors.py index 81131b7ca..801cf5545 100644 --- a/scons/scons-local-2.5.0/SCons/Errors.py +++ b/scons/scons-local-2.5.1/SCons/Errors.py @@ -28,7 +28,7 @@ and user errors in SCons. """ -__revision__ = "src/engine/SCons/Errors.py rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Errors.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import SCons.Util @@ -73,7 +73,7 @@ class BuildError(Exception): Information about the cause of the location of the error: --------------------------------------------------------- - node : the error occurred while building this target node(s) + node : the error occured while building this target node(s) executor : the executor that caused the build to fail (might be None if the build failures is not due to the diff --git a/scons/scons-local-2.5.0/SCons/Executor.py b/scons/scons-local-2.5.1/SCons/Executor.py similarity index 99% rename from scons/scons-local-2.5.0/SCons/Executor.py rename to scons/scons-local-2.5.1/SCons/Executor.py index 8161502cc..3078bfadf 100644 --- a/scons/scons-local-2.5.0/SCons/Executor.py +++ b/scons/scons-local-2.5.1/SCons/Executor.py @@ -27,7 +27,7 @@ Nodes. # 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/Executor.py rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Executor.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import collections diff --git a/scons/scons-local-2.5.0/SCons/Job.py b/scons/scons-local-2.5.1/SCons/Job.py similarity index 99% rename from scons/scons-local-2.5.0/SCons/Job.py rename to scons/scons-local-2.5.1/SCons/Job.py index 19cf3be9d..43766eff9 100644 --- a/scons/scons-local-2.5.0/SCons/Job.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Job.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import SCons.compat diff --git a/scons/scons-local-2.5.0/SCons/Memoize.py b/scons/scons-local-2.5.1/SCons/Memoize.py similarity index 98% rename from scons/scons-local-2.5.0/SCons/Memoize.py rename to scons/scons-local-2.5.1/SCons/Memoize.py index 495e13c05..10d306464 100644 --- a/scons/scons-local-2.5.0/SCons/Memoize.py +++ b/scons/scons-local-2.5.1/SCons/Memoize.py @@ -21,7 +21,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Memoize.py rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Memoize.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" __doc__ = """Memoizer diff --git a/scons/scons-local-2.5.0/SCons/Node/Alias.py b/scons/scons-local-2.5.1/SCons/Node/Alias.py similarity index 97% rename from scons/scons-local-2.5.0/SCons/Node/Alias.py rename to scons/scons-local-2.5.1/SCons/Node/Alias.py index d6adbf8e9..c5c2edb8b 100644 --- a/scons/scons-local-2.5.0/SCons/Node/Alias.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Node/Alias.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import collections diff --git a/scons/scons-local-2.5.0/SCons/Node/FS.py b/scons/scons-local-2.5.1/SCons/Node/FS.py similarity index 99% rename from scons/scons-local-2.5.0/SCons/Node/FS.py rename to scons/scons-local-2.5.1/SCons/Node/FS.py index 57085ecd1..693538419 100644 --- a/scons/scons-local-2.5.0/SCons/Node/FS.py +++ b/scons/scons-local-2.5.1/SCons/Node/FS.py @@ -32,7 +32,7 @@ that can be used by scripts or modules looking for the canonical default. # 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/FS.py rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Node/FS.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import fnmatch import os diff --git a/scons/scons-local-2.5.0/SCons/Node/Python.py b/scons/scons-local-2.5.1/SCons/Node/Python.py similarity index 98% rename from scons/scons-local-2.5.0/SCons/Node/Python.py rename to scons/scons-local-2.5.1/SCons/Node/Python.py index f3f6c2316..fd70ab82f 100644 --- a/scons/scons-local-2.5.0/SCons/Node/Python.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Node/Python.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import SCons.Node diff --git a/scons/scons-local-2.5.0/SCons/Node/__init__.py b/scons/scons-local-2.5.1/SCons/Node/__init__.py similarity index 99% rename from scons/scons-local-2.5.0/SCons/Node/__init__.py rename to scons/scons-local-2.5.1/SCons/Node/__init__.py index 3ce481b1f..6567489c3 100644 --- a/scons/scons-local-2.5.0/SCons/Node/__init__.py +++ b/scons/scons-local-2.5.1/SCons/Node/__init__.py @@ -41,7 +41,7 @@ be able to depend on any other type of "thing." # 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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Node/__init__.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import collections import copy @@ -924,9 +924,9 @@ class Node(object): scanner's recursive flag says that we should. """ nodes = [self] - seen = {} - seen[self] = 1 + seen = set(nodes) dependencies = [] + path_memo = {} root_node_scanner = self._get_scanner(env, initial_scanner, None, kw) @@ -934,31 +934,33 @@ class Node(object): node = nodes.pop(0) scanner = node._get_scanner(env, initial_scanner, root_node_scanner, kw) - if not scanner: continue - path = path_func(scanner) + try: + path = path_memo[scanner] + except KeyError: + path = path_func(scanner) + path_memo[scanner] = path included_deps = [x for x in node.get_found_includes(env, scanner, path) if x not in seen] if included_deps: dependencies.extend(included_deps) - for dep in included_deps: - seen[dep] = 1 + seen.update(included_deps) nodes.extend(scanner.recurse_nodes(included_deps)) return dependencies def _get_scanner(self, env, initial_scanner, root_node_scanner, kw): - if not initial_scanner: + if initial_scanner: + # handle explicit scanner case + scanner = initial_scanner.select(self) + else: # handle implicit scanner case scanner = self.get_env_scanner(env, kw) if scanner: scanner = scanner.select(self) - else: - # handle explicit scanner case - scanner = initial_scanner.select(self) - + if not scanner: # no scanner could be found for the given node's scanner key; # thus, make an attempt at using a default. diff --git a/scons/scons-local-2.5.0/SCons/Options/BoolOption.py b/scons/scons-local-2.5.1/SCons/Options/BoolOption.py similarity index 94% rename from scons/scons-local-2.5.0/SCons/Options/BoolOption.py rename to scons/scons-local-2.5.1/SCons/Options/BoolOption.py index 3c583868e..ac945b53b 100644 --- a/scons/scons-local-2.5.0/SCons/Options/BoolOption.py +++ b/scons/scons-local-2.5.1/SCons/Options/BoolOption.py @@ -21,7 +21,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Options/BoolOption.py rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Options/BoolOption.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" __doc__ = """Place-holder for the old SCons.Options module hierarchy diff --git a/scons/scons-local-2.5.0/SCons/Options/EnumOption.py b/scons/scons-local-2.5.1/SCons/Options/EnumOption.py similarity index 94% rename from scons/scons-local-2.5.0/SCons/Options/EnumOption.py rename to scons/scons-local-2.5.1/SCons/Options/EnumOption.py index 913aef68f..58aece604 100644 --- a/scons/scons-local-2.5.0/SCons/Options/EnumOption.py +++ b/scons/scons-local-2.5.1/SCons/Options/EnumOption.py @@ -21,7 +21,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Options/EnumOption.py rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Options/EnumOption.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" __doc__ = """Place-holder for the old SCons.Options module hierarchy diff --git a/scons/scons-local-2.5.0/SCons/Options/ListOption.py b/scons/scons-local-2.5.1/SCons/Options/ListOption.py similarity index 94% rename from scons/scons-local-2.5.0/SCons/Options/ListOption.py rename to scons/scons-local-2.5.1/SCons/Options/ListOption.py index 820358d3a..b266b934a 100644 --- a/scons/scons-local-2.5.0/SCons/Options/ListOption.py +++ b/scons/scons-local-2.5.1/SCons/Options/ListOption.py @@ -21,7 +21,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Options/ListOption.py rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Options/ListOption.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" __doc__ = """Place-holder for the old SCons.Options module hierarchy diff --git a/scons/scons-local-2.5.0/SCons/Options/PackageOption.py b/scons/scons-local-2.5.1/SCons/Options/PackageOption.py similarity index 97% rename from scons/scons-local-2.5.0/SCons/Options/PackageOption.py rename to scons/scons-local-2.5.1/SCons/Options/PackageOption.py index 4d27f9cdf..fc9ea11a9 100644 --- a/scons/scons-local-2.5.0/SCons/Options/PackageOption.py +++ b/scons/scons-local-2.5.1/SCons/Options/PackageOption.py @@ -21,7 +21,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Options/PackageOption.py rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Options/PackageOption.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" __doc__ = """Place-holder for the old SCons.Options module hierarchy diff --git a/scons/scons-local-2.5.0/SCons/Options/PathOption.py b/scons/scons-local-2.5.1/SCons/Options/PathOption.py similarity index 95% rename from scons/scons-local-2.5.0/SCons/Options/PathOption.py rename to scons/scons-local-2.5.1/SCons/Options/PathOption.py index db7f921f2..3a5a4cbfa 100644 --- a/scons/scons-local-2.5.0/SCons/Options/PathOption.py +++ b/scons/scons-local-2.5.1/SCons/Options/PathOption.py @@ -21,7 +21,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Options/PathOption.py rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Options/PathOption.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" __doc__ = """Place-holder for the old SCons.Options module hierarchy diff --git a/scons/scons-local-2.5.0/SCons/Options/__init__.py b/scons/scons-local-2.5.1/SCons/Options/__init__.py similarity index 95% rename from scons/scons-local-2.5.0/SCons/Options/__init__.py rename to scons/scons-local-2.5.1/SCons/Options/__init__.py index 6ba4d20ff..c160de4b5 100644 --- a/scons/scons-local-2.5.0/SCons/Options/__init__.py +++ b/scons/scons-local-2.5.1/SCons/Options/__init__.py @@ -21,7 +21,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Options/__init__.py rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Options/__init__.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" __doc__ = """Place-holder for the old SCons.Options module hierarchy diff --git a/scons/scons-local-2.5.0/SCons/PathList.py b/scons/scons-local-2.5.1/SCons/PathList.py similarity index 98% rename from scons/scons-local-2.5.0/SCons/PathList.py rename to scons/scons-local-2.5.1/SCons/PathList.py index a0d9e744e..6c11baa9f 100644 --- a/scons/scons-local-2.5.0/SCons/PathList.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/PathList.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" __doc__ = """SCons.PathList diff --git a/scons/scons-local-2.5.0/SCons/Platform/__init__.py b/scons/scons-local-2.5.1/SCons/Platform/__init__.py similarity index 98% rename from scons/scons-local-2.5.0/SCons/Platform/__init__.py rename to scons/scons-local-2.5.1/SCons/Platform/__init__.py index e3db28a32..c95f2911b 100644 --- a/scons/scons-local-2.5.0/SCons/Platform/__init__.py +++ b/scons/scons-local-2.5.1/SCons/Platform/__init__.py @@ -42,7 +42,7 @@ their own platform definition. # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Platform/__init__.py rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Platform/__init__.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import SCons.compat diff --git a/scons/scons-local-2.5.0/SCons/Platform/aix.py b/scons/scons-local-2.5.1/SCons/Platform/aix.py similarity index 96% rename from scons/scons-local-2.5.0/SCons/Platform/aix.py rename to scons/scons-local-2.5.1/SCons/Platform/aix.py index 65ee701e2..42de812b3 100644 --- a/scons/scons-local-2.5.0/SCons/Platform/aix.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Platform/aix.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import os import subprocess diff --git a/scons/scons-local-2.5.0/SCons/Platform/cygwin.py b/scons/scons-local-2.5.1/SCons/Platform/cygwin.py similarity index 94% rename from scons/scons-local-2.5.0/SCons/Platform/cygwin.py rename to scons/scons-local-2.5.1/SCons/Platform/cygwin.py index 3f8fc1789..6922cf199 100644 --- a/scons/scons-local-2.5.0/SCons/Platform/cygwin.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Platform/cygwin.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import posix from SCons.Platform import TempFileMunge diff --git a/scons/scons-local-2.5.0/SCons/Platform/darwin.py b/scons/scons-local-2.5.1/SCons/Platform/darwin.py similarity index 95% rename from scons/scons-local-2.5.0/SCons/Platform/darwin.py rename to scons/scons-local-2.5.1/SCons/Platform/darwin.py index 279cfc296..d3b77dbeb 100644 --- a/scons/scons-local-2.5.0/SCons/Platform/darwin.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Platform/darwin.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import posix import os diff --git a/scons/scons-local-2.5.0/SCons/Platform/hpux.py b/scons/scons-local-2.5.1/SCons/Platform/hpux.py similarity index 93% rename from scons/scons-local-2.5.0/SCons/Platform/hpux.py rename to scons/scons-local-2.5.1/SCons/Platform/hpux.py index d2de3035d..b66a791a2 100644 --- a/scons/scons-local-2.5.0/SCons/Platform/hpux.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Platform/hpux.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import posix diff --git a/scons/scons-local-2.5.0/SCons/Platform/irix.py b/scons/scons-local-2.5.1/SCons/Platform/irix.py similarity index 93% rename from scons/scons-local-2.5.0/SCons/Platform/irix.py rename to scons/scons-local-2.5.1/SCons/Platform/irix.py index c55713108..1d57400ed 100644 --- a/scons/scons-local-2.5.0/SCons/Platform/irix.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Platform/irix.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import posix diff --git a/scons/scons-local-2.5.0/SCons/Platform/os2.py b/scons/scons-local-2.5.1/SCons/Platform/os2.py similarity index 95% rename from scons/scons-local-2.5.0/SCons/Platform/os2.py rename to scons/scons-local-2.5.1/SCons/Platform/os2.py index 736363608..584e1ed29 100644 --- a/scons/scons-local-2.5.0/SCons/Platform/os2.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Platform/os2.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import win32 def generate(env): diff --git a/scons/scons-local-2.5.0/SCons/Platform/posix.py b/scons/scons-local-2.5.1/SCons/Platform/posix.py similarity index 97% rename from scons/scons-local-2.5.0/SCons/Platform/posix.py rename to scons/scons-local-2.5.1/SCons/Platform/posix.py index 6edfd784a..c2d3e502c 100644 --- a/scons/scons-local-2.5.0/SCons/Platform/posix.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Platform/posix.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import errno import os diff --git a/scons/scons-local-2.5.0/SCons/Platform/sunos.py b/scons/scons-local-2.5.1/SCons/Platform/sunos.py similarity index 94% rename from scons/scons-local-2.5.0/SCons/Platform/sunos.py rename to scons/scons-local-2.5.1/SCons/Platform/sunos.py index d053e2180..77862a55a 100644 --- a/scons/scons-local-2.5.0/SCons/Platform/sunos.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Platform/sunos.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import posix diff --git a/scons/scons-local-2.5.0/SCons/Platform/win32.py b/scons/scons-local-2.5.1/SCons/Platform/win32.py similarity index 99% rename from scons/scons-local-2.5.0/SCons/Platform/win32.py rename to scons/scons-local-2.5.1/SCons/Platform/win32.py index 556c7d480..dacb27d25 100644 --- a/scons/scons-local-2.5.0/SCons/Platform/win32.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Platform/win32.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import os import os.path diff --git a/scons/scons-local-2.5.0/SCons/SConf.py b/scons/scons-local-2.5.1/SCons/SConf.py similarity index 99% rename from scons/scons-local-2.5.0/SCons/SConf.py rename to scons/scons-local-2.5.1/SCons/SConf.py index fb1124b1f..e5799ac28 100644 --- a/scons/scons-local-2.5.0/SCons/SConf.py +++ b/scons/scons-local-2.5.1/SCons/SConf.py @@ -34,7 +34,7 @@ libraries are installed, if some command line options are supported etc. # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/SConf.py rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/SConf.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import SCons.compat diff --git a/scons/scons-local-2.5.0/SCons/SConsign.py b/scons/scons-local-2.5.1/SCons/SConsign.py similarity index 99% rename from scons/scons-local-2.5.0/SCons/SConsign.py rename to scons/scons-local-2.5.1/SCons/SConsign.py index 3166258a3..6fb018b23 100644 --- a/scons/scons-local-2.5.0/SCons/SConsign.py +++ b/scons/scons-local-2.5.1/SCons/SConsign.py @@ -27,7 +27,7 @@ Writing and reading information to the .sconsign file or files. # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/SConsign.py rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/SConsign.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import SCons.compat diff --git a/scons/scons-local-2.5.0/SCons/Scanner/C.py b/scons/scons-local-2.5.1/SCons/Scanner/C.py similarity index 97% rename from scons/scons-local-2.5.0/SCons/Scanner/C.py rename to scons/scons-local-2.5.1/SCons/Scanner/C.py index 4c6118739..d78bd05f4 100644 --- a/scons/scons-local-2.5.0/SCons/Scanner/C.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Scanner/C.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import SCons.Node.FS import SCons.Scanner diff --git a/scons/scons-local-2.5.0/SCons/Scanner/D.py b/scons/scons-local-2.5.1/SCons/Scanner/D.py similarity index 95% rename from scons/scons-local-2.5.0/SCons/Scanner/D.py rename to scons/scons-local-2.5.1/SCons/Scanner/D.py index eba6e385a..0df64064f 100644 --- a/scons/scons-local-2.5.0/SCons/Scanner/D.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Scanner/D.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import re diff --git a/scons/scons-local-2.5.0/SCons/Scanner/Dir.py b/scons/scons-local-2.5.1/SCons/Scanner/Dir.py similarity index 97% rename from scons/scons-local-2.5.0/SCons/Scanner/Dir.py rename to scons/scons-local-2.5.1/SCons/Scanner/Dir.py index d744c41fc..eefba8b9e 100644 --- a/scons/scons-local-2.5.0/SCons/Scanner/Dir.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Scanner/Dir.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import SCons.Node.FS import SCons.Scanner diff --git a/scons/scons-local-2.5.0/SCons/Scanner/Fortran.py b/scons/scons-local-2.5.1/SCons/Scanner/Fortran.py similarity index 99% rename from scons/scons-local-2.5.0/SCons/Scanner/Fortran.py rename to scons/scons-local-2.5.1/SCons/Scanner/Fortran.py index 887232ff1..179c8dbfd 100644 --- a/scons/scons-local-2.5.0/SCons/Scanner/Fortran.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Scanner/Fortran.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import re diff --git a/scons/scons-local-2.5.0/SCons/Scanner/IDL.py b/scons/scons-local-2.5.1/SCons/Scanner/IDL.py similarity index 94% rename from scons/scons-local-2.5.0/SCons/Scanner/IDL.py rename to scons/scons-local-2.5.1/SCons/Scanner/IDL.py index 84616e938..b7b76fd63 100644 --- a/scons/scons-local-2.5.0/SCons/Scanner/IDL.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Scanner/IDL.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import SCons.Node.FS import SCons.Scanner diff --git a/scons/scons-local-2.5.0/SCons/Scanner/LaTeX.py b/scons/scons-local-2.5.1/SCons/Scanner/LaTeX.py similarity index 99% rename from scons/scons-local-2.5.0/SCons/Scanner/LaTeX.py rename to scons/scons-local-2.5.1/SCons/Scanner/LaTeX.py index 10a61973e..0a68b7ebc 100644 --- a/scons/scons-local-2.5.0/SCons/Scanner/LaTeX.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Scanner/LaTeX.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import os.path import re diff --git a/scons/scons-local-2.5.0/SCons/Scanner/Prog.py b/scons/scons-local-2.5.1/SCons/Scanner/Prog.py similarity index 97% rename from scons/scons-local-2.5.0/SCons/Scanner/Prog.py rename to scons/scons-local-2.5.1/SCons/Scanner/Prog.py index de842d5e2..8e3245edf 100644 --- a/scons/scons-local-2.5.0/SCons/Scanner/Prog.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Scanner/Prog.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import SCons.Node import SCons.Node.FS diff --git a/scons/scons-local-2.5.0/SCons/Scanner/RC.py b/scons/scons-local-2.5.1/SCons/Scanner/RC.py similarity index 94% rename from scons/scons-local-2.5.0/SCons/Scanner/RC.py rename to scons/scons-local-2.5.1/SCons/Scanner/RC.py index 527a0fbf8..57e9e7f5c 100644 --- a/scons/scons-local-2.5.0/SCons/Scanner/RC.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Scanner/RC.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import SCons.Node.FS import SCons.Scanner diff --git a/scons/scons-local-2.5.0/SCons/Scanner/SWIG.py b/scons/scons-local-2.5.1/SCons/Scanner/SWIG.py similarity index 93% rename from scons/scons-local-2.5.0/SCons/Scanner/SWIG.py rename to scons/scons-local-2.5.1/SCons/Scanner/SWIG.py index 1e70ddc83..4114c1fc4 100644 --- a/scons/scons-local-2.5.0/SCons/Scanner/SWIG.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Scanner/SWIG.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import SCons.Scanner diff --git a/scons/scons-local-2.5.0/SCons/Scanner/__init__.py b/scons/scons-local-2.5.1/SCons/Scanner/__init__.py similarity index 99% rename from scons/scons-local-2.5.0/SCons/Scanner/__init__.py rename to scons/scons-local-2.5.1/SCons/Scanner/__init__.py index b13120cea..81617a4cc 100644 --- a/scons/scons-local-2.5.0/SCons/Scanner/__init__.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Scanner/__init__.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import re diff --git a/scons/scons-local-2.5.0/SCons/Script/Interactive.py b/scons/scons-local-2.5.1/SCons/Script/Interactive.py similarity index 99% rename from scons/scons-local-2.5.0/SCons/Script/Interactive.py rename to scons/scons-local-2.5.1/SCons/Script/Interactive.py index bb9ab9332..97797b530 100644 --- a/scons/scons-local-2.5.0/SCons/Script/Interactive.py +++ b/scons/scons-local-2.5.1/SCons/Script/Interactive.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/Script/Interactive.py rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Script/Interactive.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" __doc__ = """ SCons interactive mode diff --git a/scons/scons-local-2.5.0/SCons/Script/Main.py b/scons/scons-local-2.5.1/SCons/Script/Main.py similarity index 99% rename from scons/scons-local-2.5.0/SCons/Script/Main.py rename to scons/scons-local-2.5.1/SCons/Script/Main.py index 3c5b377ba..19f876372 100644 --- a/scons/scons-local-2.5.0/SCons/Script/Main.py +++ b/scons/scons-local-2.5.1/SCons/Script/Main.py @@ -34,7 +34,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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Script/Main.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import SCons.compat @@ -564,7 +564,7 @@ def find_deepest_user_frame(tb): def _scons_user_error(e): """Handle user errors. Print out a message and a description of the - error, along with the line number and routine where it occurred. + error, along with the line number and routine where it occured. The file and line number will be the deepest stack frame that is not part of SCons itself. """ @@ -579,7 +579,7 @@ def _scons_user_error(e): def _scons_user_warning(e): """Handle user warnings. Print out a message and a description of - the warning, along with the line number and routine where it occurred. + the warning, along with the line number and routine where it occured. The file and line number will be the deepest stack frame that is not part of SCons itself. """ diff --git a/scons/scons-local-2.5.0/SCons/Script/SConsOptions.py b/scons/scons-local-2.5.1/SCons/Script/SConsOptions.py similarity index 99% rename from scons/scons-local-2.5.0/SCons/Script/SConsOptions.py rename to scons/scons-local-2.5.1/SCons/Script/SConsOptions.py index 9e9d5ce0c..5bebed9c4 100644 --- a/scons/scons-local-2.5.0/SCons/Script/SConsOptions.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Script/SConsOptions.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import optparse import re diff --git a/scons/scons-local-2.5.0/SCons/Script/SConscript.py b/scons/scons-local-2.5.1/SCons/Script/SConscript.py similarity index 99% rename from scons/scons-local-2.5.0/SCons/Script/SConscript.py rename to scons/scons-local-2.5.1/SCons/Script/SConscript.py index 3f6c4e393..a9b2d5725 100644 --- a/scons/scons-local-2.5.0/SCons/Script/SConscript.py +++ b/scons/scons-local-2.5.1/SCons/Script/SConscript.py @@ -28,7 +28,7 @@ files. # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. from __future__ import division -__revision__ = "src/engine/SCons/Script/SConscript.py rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Script/SConscript.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import SCons import SCons.Action diff --git a/scons/scons-local-2.5.0/SCons/Script/__init__.py b/scons/scons-local-2.5.1/SCons/Script/__init__.py similarity index 99% rename from scons/scons-local-2.5.0/SCons/Script/__init__.py rename to scons/scons-local-2.5.1/SCons/Script/__init__.py index 56f06cfcc..ea9d4fab9 100644 --- a/scons/scons-local-2.5.0/SCons/Script/__init__.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Script/__init__.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import time start_time = time.time() diff --git a/scons/scons-local-2.5.0/SCons/Sig.py b/scons/scons-local-2.5.1/SCons/Sig.py similarity index 95% rename from scons/scons-local-2.5.0/SCons/Sig.py rename to scons/scons-local-2.5.1/SCons/Sig.py index 2d090982b..ca6892b94 100644 --- a/scons/scons-local-2.5.0/SCons/Sig.py +++ b/scons/scons-local-2.5.1/SCons/Sig.py @@ -21,7 +21,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Sig.py rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Sig.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" __doc__ = """Place-holder for the old SCons.Sig module hierarchy diff --git a/scons/scons-local-2.5.0/SCons/Subst.py b/scons/scons-local-2.5.1/SCons/Subst.py similarity index 99% rename from scons/scons-local-2.5.0/SCons/Subst.py rename to scons/scons-local-2.5.1/SCons/Subst.py index 63c15423b..28445a317 100644 --- a/scons/scons-local-2.5.0/SCons/Subst.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Subst.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import collections import re diff --git a/scons/scons-local-2.5.0/SCons/Taskmaster.py b/scons/scons-local-2.5.1/SCons/Taskmaster.py similarity index 99% rename from scons/scons-local-2.5.0/SCons/Taskmaster.py rename to scons/scons-local-2.5.1/SCons/Taskmaster.py index 829e1fc30..90306b5c5 100644 --- a/scons/scons-local-2.5.0/SCons/Taskmaster.py +++ b/scons/scons-local-2.5.1/SCons/Taskmaster.py @@ -47,7 +47,7 @@ interface and the SCons build engine. There are two key classes here: target(s) that it decides need to be evaluated and/or built. """ -__revision__ = "src/engine/SCons/Taskmaster.py rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Taskmaster.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" from itertools import chain import operator diff --git a/scons/scons-local-2.5.0/SCons/Tool/386asm.py b/scons/scons-local-2.5.1/SCons/Tool/386asm.py similarity index 95% rename from scons/scons-local-2.5.0/SCons/Tool/386asm.py rename to scons/scons-local-2.5.1/SCons/Tool/386asm.py index 2a87a2819..8fee6942b 100644 --- a/scons/scons-local-2.5.0/SCons/Tool/386asm.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Tool/386asm.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" from SCons.Tool.PharLapCommon import addPharLapPaths import SCons.Util diff --git a/scons/scons-local-2.5.0/SCons/Tool/BitKeeper.py b/scons/scons-local-2.5.1/SCons/Tool/BitKeeper.py similarity index 95% rename from scons/scons-local-2.5.0/SCons/Tool/BitKeeper.py rename to scons/scons-local-2.5.1/SCons/Tool/BitKeeper.py index 21a2ab3da..1a901bb08 100644 --- a/scons/scons-local-2.5.0/SCons/Tool/BitKeeper.py +++ b/scons/scons-local-2.5.1/SCons/Tool/BitKeeper.py @@ -32,7 +32,7 @@ selection method. # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Tool/BitKeeper.py rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Tool/BitKeeper.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import SCons.Action import SCons.Builder diff --git a/scons/scons-local-2.5.0/SCons/Tool/CVS.py b/scons/scons-local-2.5.1/SCons/Tool/CVS.py similarity index 96% rename from scons/scons-local-2.5.0/SCons/Tool/CVS.py rename to scons/scons-local-2.5.1/SCons/Tool/CVS.py index 91a8d627a..a8e5a8d8d 100644 --- a/scons/scons-local-2.5.0/SCons/Tool/CVS.py +++ b/scons/scons-local-2.5.1/SCons/Tool/CVS.py @@ -29,7 +29,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/CVS.py rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Tool/CVS.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import SCons.Action import SCons.Builder diff --git a/scons/scons-local-2.5.0/SCons/Tool/DCommon.py b/scons/scons-local-2.5.1/SCons/Tool/DCommon.py similarity index 94% rename from scons/scons-local-2.5.0/SCons/Tool/DCommon.py rename to scons/scons-local-2.5.1/SCons/Tool/DCommon.py index 8738ece72..e2750a493 100644 --- a/scons/scons-local-2.5.0/SCons/Tool/DCommon.py +++ b/scons/scons-local-2.5.1/SCons/Tool/DCommon.py @@ -28,7 +28,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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Tool/DCommon.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import os.path diff --git a/scons/scons-local-2.5.0/SCons/Tool/FortranCommon.py b/scons/scons-local-2.5.1/SCons/Tool/FortranCommon.py similarity index 98% rename from scons/scons-local-2.5.0/SCons/Tool/FortranCommon.py rename to scons/scons-local-2.5.1/SCons/Tool/FortranCommon.py index cf6486880..058f24d0d 100644 --- a/scons/scons-local-2.5.0/SCons/Tool/FortranCommon.py +++ b/scons/scons-local-2.5.1/SCons/Tool/FortranCommon.py @@ -27,7 +27,7 @@ Stuff for processing Fortran, common to all fortran dialects. # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Tool/FortranCommon.py rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Tool/FortranCommon.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import re import os.path diff --git a/scons/scons-local-2.5.0/SCons/Tool/GettextCommon.py b/scons/scons-local-2.5.1/SCons/Tool/GettextCommon.py similarity index 99% rename from scons/scons-local-2.5.0/SCons/Tool/GettextCommon.py rename to scons/scons-local-2.5.1/SCons/Tool/GettextCommon.py index 6dfb615b5..596586cfb 100644 --- a/scons/scons-local-2.5.0/SCons/Tool/GettextCommon.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Tool/GettextCommon.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import SCons.Warnings import re diff --git a/scons/scons-local-2.5.0/SCons/Tool/JavaCommon.py b/scons/scons-local-2.5.1/SCons/Tool/JavaCommon.py similarity index 99% rename from scons/scons-local-2.5.0/SCons/Tool/JavaCommon.py rename to scons/scons-local-2.5.1/SCons/Tool/JavaCommon.py index 26be53027..38f4e4781 100644 --- a/scons/scons-local-2.5.0/SCons/Tool/JavaCommon.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Tool/JavaCommon.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import os import os.path diff --git a/scons/scons-local-2.5.0/SCons/Tool/MSCommon/__init__.py b/scons/scons-local-2.5.1/SCons/Tool/MSCommon/__init__.py similarity index 97% rename from scons/scons-local-2.5.0/SCons/Tool/MSCommon/__init__.py rename to scons/scons-local-2.5.1/SCons/Tool/MSCommon/__init__.py index 8e72feaea..6b637febd 100644 --- a/scons/scons-local-2.5.0/SCons/Tool/MSCommon/__init__.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Tool/MSCommon/__init__.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" __doc__ = """ Common functions for Microsoft Visual Studio and Visual C/C++. diff --git a/scons/scons-local-2.5.0/SCons/Tool/MSCommon/arch.py b/scons/scons-local-2.5.1/SCons/Tool/MSCommon/arch.py similarity index 94% rename from scons/scons-local-2.5.0/SCons/Tool/MSCommon/arch.py rename to scons/scons-local-2.5.1/SCons/Tool/MSCommon/arch.py index f7d28daf4..46fb601e8 100644 --- a/scons/scons-local-2.5.0/SCons/Tool/MSCommon/arch.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Tool/MSCommon/arch.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" __doc__ = """Module to define supported Windows chip architectures. """ diff --git a/scons/scons-local-2.5.0/SCons/Tool/MSCommon/common.py b/scons/scons-local-2.5.1/SCons/Tool/MSCommon/common.py similarity index 99% rename from scons/scons-local-2.5.0/SCons/Tool/MSCommon/common.py rename to scons/scons-local-2.5.1/SCons/Tool/MSCommon/common.py index 59296c229..1467543b5 100644 --- a/scons/scons-local-2.5.0/SCons/Tool/MSCommon/common.py +++ b/scons/scons-local-2.5.1/SCons/Tool/MSCommon/common.py @@ -21,7 +21,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Tool/MSCommon/common.py rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Tool/MSCommon/common.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" __doc__ = """ Common helper functions for working with the Microsoft tool chain. diff --git a/scons/scons-local-2.5.0/SCons/Tool/MSCommon/netframework.py b/scons/scons-local-2.5.1/SCons/Tool/MSCommon/netframework.py similarity index 97% rename from scons/scons-local-2.5.0/SCons/Tool/MSCommon/netframework.py rename to scons/scons-local-2.5.1/SCons/Tool/MSCommon/netframework.py index 935a8a5e8..8d39cf642 100644 --- a/scons/scons-local-2.5.0/SCons/Tool/MSCommon/netframework.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Tool/MSCommon/netframework.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" __doc__ = """ """ diff --git a/scons/scons-local-2.5.0/SCons/Tool/MSCommon/sdk.py b/scons/scons-local-2.5.1/SCons/Tool/MSCommon/sdk.py similarity index 99% rename from scons/scons-local-2.5.0/SCons/Tool/MSCommon/sdk.py rename to scons/scons-local-2.5.1/SCons/Tool/MSCommon/sdk.py index 601f4f8f4..53bb8aa15 100644 --- a/scons/scons-local-2.5.0/SCons/Tool/MSCommon/sdk.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Tool/MSCommon/sdk.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" __doc__ = """Module to detect the Platform/Windows SDK diff --git a/scons/scons-local-2.5.0/SCons/Tool/MSCommon/vc.py b/scons/scons-local-2.5.1/SCons/Tool/MSCommon/vc.py similarity index 99% rename from scons/scons-local-2.5.0/SCons/Tool/MSCommon/vc.py rename to scons/scons-local-2.5.1/SCons/Tool/MSCommon/vc.py index baf859afd..ca8a2da8f 100644 --- a/scons/scons-local-2.5.0/SCons/Tool/MSCommon/vc.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Tool/MSCommon/vc.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" __doc__ = """Module for Visual C/C++ detection and configuration. """ diff --git a/scons/scons-local-2.5.0/SCons/Tool/MSCommon/vs.py b/scons/scons-local-2.5.1/SCons/Tool/MSCommon/vs.py similarity index 99% rename from scons/scons-local-2.5.0/SCons/Tool/MSCommon/vs.py rename to scons/scons-local-2.5.1/SCons/Tool/MSCommon/vs.py index 82b989d82..1f04cbef1 100644 --- a/scons/scons-local-2.5.0/SCons/Tool/MSCommon/vs.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Tool/MSCommon/vs.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" __doc__ = """Module to detect Visual Studio and/or Visual C/C++ """ diff --git a/scons/scons-local-2.5.0/SCons/Tool/Perforce.py b/scons/scons-local-2.5.1/SCons/Tool/Perforce.py similarity index 97% rename from scons/scons-local-2.5.0/SCons/Tool/Perforce.py rename to scons/scons-local-2.5.1/SCons/Tool/Perforce.py index 47d609658..212150a84 100644 --- a/scons/scons-local-2.5.0/SCons/Tool/Perforce.py +++ b/scons/scons-local-2.5.1/SCons/Tool/Perforce.py @@ -29,7 +29,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/Perforce.py rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Tool/Perforce.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import os diff --git a/scons/scons-local-2.5.0/SCons/Tool/PharLapCommon.py b/scons/scons-local-2.5.1/SCons/Tool/PharLapCommon.py similarity index 97% rename from scons/scons-local-2.5.0/SCons/Tool/PharLapCommon.py rename to scons/scons-local-2.5.1/SCons/Tool/PharLapCommon.py index 863d2080f..ccc2004db 100644 --- a/scons/scons-local-2.5.0/SCons/Tool/PharLapCommon.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Tool/PharLapCommon.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import os import os.path diff --git a/scons/scons-local-2.5.0/SCons/Tool/RCS.py b/scons/scons-local-2.5.1/SCons/Tool/RCS.py similarity index 95% rename from scons/scons-local-2.5.0/SCons/Tool/RCS.py rename to scons/scons-local-2.5.1/SCons/Tool/RCS.py index 29dec38d8..7a8b8b178 100644 --- a/scons/scons-local-2.5.0/SCons/Tool/RCS.py +++ b/scons/scons-local-2.5.1/SCons/Tool/RCS.py @@ -29,7 +29,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/RCS.py rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Tool/RCS.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import SCons.Action import SCons.Builder diff --git a/scons/scons-local-2.5.0/SCons/Tool/SCCS.py b/scons/scons-local-2.5.1/SCons/Tool/SCCS.py similarity index 95% rename from scons/scons-local-2.5.0/SCons/Tool/SCCS.py rename to scons/scons-local-2.5.1/SCons/Tool/SCCS.py index faf10b550..c4dbbf800 100644 --- a/scons/scons-local-2.5.0/SCons/Tool/SCCS.py +++ b/scons/scons-local-2.5.1/SCons/Tool/SCCS.py @@ -29,7 +29,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/SCCS.py rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Tool/SCCS.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import SCons.Action import SCons.Builder diff --git a/scons/scons-local-2.5.0/SCons/Tool/Subversion.py b/scons/scons-local-2.5.1/SCons/Tool/Subversion.py similarity index 95% rename from scons/scons-local-2.5.0/SCons/Tool/Subversion.py rename to scons/scons-local-2.5.1/SCons/Tool/Subversion.py index f1f10df26..cb34e0764 100644 --- a/scons/scons-local-2.5.0/SCons/Tool/Subversion.py +++ b/scons/scons-local-2.5.1/SCons/Tool/Subversion.py @@ -29,7 +29,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/Subversion.py rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Tool/Subversion.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import os.path diff --git a/scons/scons-local-2.5.0/SCons/Tool/__init__.py b/scons/scons-local-2.5.1/SCons/Tool/__init__.py similarity index 99% rename from scons/scons-local-2.5.0/SCons/Tool/__init__.py rename to scons/scons-local-2.5.1/SCons/Tool/__init__.py index 0207292d7..274b563b7 100644 --- a/scons/scons-local-2.5.0/SCons/Tool/__init__.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Tool/__init__.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import imp import sys diff --git a/scons/scons-local-2.5.0/SCons/Tool/aixc++.py b/scons/scons-local-2.5.1/SCons/Tool/aixc++.py similarity index 95% rename from scons/scons-local-2.5.0/SCons/Tool/aixc++.py rename to scons/scons-local-2.5.1/SCons/Tool/aixc++.py index 699dacb8d..77d192a6d 100644 --- a/scons/scons-local-2.5.0/SCons/Tool/aixc++.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Tool/aixc++.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import os.path diff --git a/scons/scons-local-2.5.0/SCons/Tool/aixcc.py b/scons/scons-local-2.5.1/SCons/Tool/aixcc.py similarity index 95% rename from scons/scons-local-2.5.0/SCons/Tool/aixcc.py rename to scons/scons-local-2.5.1/SCons/Tool/aixcc.py index 30735c96a..bee2b99b5 100644 --- a/scons/scons-local-2.5.0/SCons/Tool/aixcc.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Tool/aixcc.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import os.path diff --git a/scons/scons-local-2.5.0/SCons/Tool/aixf77.py b/scons/scons-local-2.5.1/SCons/Tool/aixf77.py similarity index 96% rename from scons/scons-local-2.5.0/SCons/Tool/aixf77.py rename to scons/scons-local-2.5.1/SCons/Tool/aixf77.py index f23c1cbd8..899bd4f16 100644 --- a/scons/scons-local-2.5.0/SCons/Tool/aixf77.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Tool/aixf77.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import os.path diff --git a/scons/scons-local-2.5.0/SCons/Tool/aixlink.py b/scons/scons-local-2.5.1/SCons/Tool/aixlink.py similarity index 96% rename from scons/scons-local-2.5.0/SCons/Tool/aixlink.py rename to scons/scons-local-2.5.1/SCons/Tool/aixlink.py index 483068c4f..0c8e1cc55 100644 --- a/scons/scons-local-2.5.0/SCons/Tool/aixlink.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Tool/aixlink.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import os import os.path diff --git a/scons/scons-local-2.5.0/SCons/Tool/applelink.py b/scons/scons-local-2.5.1/SCons/Tool/applelink.py similarity index 96% rename from scons/scons-local-2.5.0/SCons/Tool/applelink.py rename to scons/scons-local-2.5.1/SCons/Tool/applelink.py index 4e7a679d2..f9995b3c3 100644 --- a/scons/scons-local-2.5.0/SCons/Tool/applelink.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Tool/applelink.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import SCons.Util diff --git a/scons/scons-local-2.5.0/SCons/Tool/ar.py b/scons/scons-local-2.5.1/SCons/Tool/ar.py similarity index 95% rename from scons/scons-local-2.5.0/SCons/Tool/ar.py rename to scons/scons-local-2.5.1/SCons/Tool/ar.py index a64ddfaee..dcaafdc63 100644 --- a/scons/scons-local-2.5.0/SCons/Tool/ar.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Tool/ar.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import SCons.Defaults import SCons.Tool diff --git a/scons/scons-local-2.5.0/SCons/Tool/as.py b/scons/scons-local-2.5.1/SCons/Tool/as.py similarity index 96% rename from scons/scons-local-2.5.0/SCons/Tool/as.py rename to scons/scons-local-2.5.1/SCons/Tool/as.py index 75992d59e..59c1e1a3f 100644 --- a/scons/scons-local-2.5.0/SCons/Tool/as.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Tool/as.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import SCons.Defaults import SCons.Tool diff --git a/scons/scons-local-2.5.0/SCons/Tool/bcc32.py b/scons/scons-local-2.5.1/SCons/Tool/bcc32.py similarity index 96% rename from scons/scons-local-2.5.0/SCons/Tool/bcc32.py rename to scons/scons-local-2.5.1/SCons/Tool/bcc32.py index ffd29f263..4b83d3a70 100644 --- a/scons/scons-local-2.5.0/SCons/Tool/bcc32.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Tool/bcc32.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import os import os.path diff --git a/scons/scons-local-2.5.0/SCons/Tool/c++.py b/scons/scons-local-2.5.1/SCons/Tool/c++.py similarity index 96% rename from scons/scons-local-2.5.0/SCons/Tool/c++.py rename to scons/scons-local-2.5.1/SCons/Tool/c++.py index b0c4e62e3..3b2528a91 100644 --- a/scons/scons-local-2.5.0/SCons/Tool/c++.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Tool/c++.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import os.path diff --git a/scons/scons-local-2.5.0/SCons/Tool/cc.py b/scons/scons-local-2.5.1/SCons/Tool/cc.py similarity index 97% rename from scons/scons-local-2.5.0/SCons/Tool/cc.py rename to scons/scons-local-2.5.1/SCons/Tool/cc.py index b0a73f843..ba82b5d51 100644 --- a/scons/scons-local-2.5.0/SCons/Tool/cc.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Tool/cc.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import SCons.Tool import SCons.Defaults diff --git a/scons/scons-local-2.5.0/SCons/Tool/cvf.py b/scons/scons-local-2.5.1/SCons/Tool/cvf.py similarity index 95% rename from scons/scons-local-2.5.0/SCons/Tool/cvf.py rename to scons/scons-local-2.5.1/SCons/Tool/cvf.py index 06ea06378..37b4a00b9 100644 --- a/scons/scons-local-2.5.0/SCons/Tool/cvf.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Tool/cvf.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import fortran diff --git a/scons/scons-local-2.5.0/SCons/Tool/cyglink.py b/scons/scons-local-2.5.1/SCons/Tool/cyglink.py similarity index 100% rename from scons/scons-local-2.5.0/SCons/Tool/cyglink.py rename to scons/scons-local-2.5.1/SCons/Tool/cyglink.py diff --git a/scons/scons-local-2.5.0/SCons/Tool/default.py b/scons/scons-local-2.5.1/SCons/Tool/default.py similarity index 93% rename from scons/scons-local-2.5.0/SCons/Tool/default.py rename to scons/scons-local-2.5.1/SCons/Tool/default.py index 848e0b72c..1c19b7e00 100644 --- a/scons/scons-local-2.5.0/SCons/Tool/default.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Tool/default.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import SCons.Tool diff --git a/scons/scons-local-2.5.0/SCons/Tool/dmd.py b/scons/scons-local-2.5.1/SCons/Tool/dmd.py similarity index 98% rename from scons/scons-local-2.5.0/SCons/Tool/dmd.py rename to scons/scons-local-2.5.1/SCons/Tool/dmd.py index a08421c10..aaacd4763 100644 --- a/scons/scons-local-2.5.0/SCons/Tool/dmd.py +++ b/scons/scons-local-2.5.1/SCons/Tool/dmd.py @@ -58,7 +58,7 @@ Lib tool variables: # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Tool/dmd.py rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Tool/dmd.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import os import subprocess diff --git a/scons/scons-local-2.5.0/SCons/Tool/docbook/__init__.py b/scons/scons-local-2.5.1/SCons/Tool/docbook/__init__.py similarity index 100% rename from scons/scons-local-2.5.0/SCons/Tool/docbook/__init__.py rename to scons/scons-local-2.5.1/SCons/Tool/docbook/__init__.py diff --git a/scons/scons-local-2.5.0/SCons/Tool/dvi.py b/scons/scons-local-2.5.1/SCons/Tool/dvi.py similarity index 95% rename from scons/scons-local-2.5.0/SCons/Tool/dvi.py rename to scons/scons-local-2.5.1/SCons/Tool/dvi.py index cc3c8ca63..cf5504e7f 100644 --- a/scons/scons-local-2.5.0/SCons/Tool/dvi.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Tool/dvi.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import SCons.Builder import SCons.Tool diff --git a/scons/scons-local-2.5.0/SCons/Tool/dvipdf.py b/scons/scons-local-2.5.1/SCons/Tool/dvipdf.py similarity index 97% rename from scons/scons-local-2.5.0/SCons/Tool/dvipdf.py rename to scons/scons-local-2.5.1/SCons/Tool/dvipdf.py index d6a5dbbe6..1e7daacbe 100644 --- a/scons/scons-local-2.5.0/SCons/Tool/dvipdf.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Tool/dvipdf.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import SCons.Action import SCons.Defaults diff --git a/scons/scons-local-2.5.0/SCons/Tool/dvips.py b/scons/scons-local-2.5.1/SCons/Tool/dvips.py similarity index 96% rename from scons/scons-local-2.5.0/SCons/Tool/dvips.py rename to scons/scons-local-2.5.1/SCons/Tool/dvips.py index dcffa48c1..5217a16b1 100644 --- a/scons/scons-local-2.5.0/SCons/Tool/dvips.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Tool/dvips.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import SCons.Action import SCons.Builder diff --git a/scons/scons-local-2.5.0/SCons/Tool/f03.py b/scons/scons-local-2.5.1/SCons/Tool/f03.py similarity index 94% rename from scons/scons-local-2.5.0/SCons/Tool/f03.py rename to scons/scons-local-2.5.1/SCons/Tool/f03.py index 9e804d21e..c71c48738 100644 --- a/scons/scons-local-2.5.0/SCons/Tool/f03.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Tool/f03.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import SCons.Defaults import SCons.Tool diff --git a/scons/scons-local-2.5.0/SCons/Tool/f77.py b/scons/scons-local-2.5.1/SCons/Tool/f77.py similarity index 94% rename from scons/scons-local-2.5.0/SCons/Tool/f77.py rename to scons/scons-local-2.5.1/SCons/Tool/f77.py index 14cfc952d..48c724c2c 100644 --- a/scons/scons-local-2.5.0/SCons/Tool/f77.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Tool/f77.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import SCons.Defaults import SCons.Scanner.Fortran diff --git a/scons/scons-local-2.5.0/SCons/Tool/f90.py b/scons/scons-local-2.5.1/SCons/Tool/f90.py similarity index 94% rename from scons/scons-local-2.5.0/SCons/Tool/f90.py rename to scons/scons-local-2.5.1/SCons/Tool/f90.py index 04ea509fc..9272a63f6 100644 --- a/scons/scons-local-2.5.0/SCons/Tool/f90.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Tool/f90.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import SCons.Defaults import SCons.Scanner.Fortran diff --git a/scons/scons-local-2.5.0/SCons/Tool/f95.py b/scons/scons-local-2.5.1/SCons/Tool/f95.py similarity index 94% rename from scons/scons-local-2.5.0/SCons/Tool/f95.py rename to scons/scons-local-2.5.1/SCons/Tool/f95.py index 7398064a2..abc905394 100644 --- a/scons/scons-local-2.5.0/SCons/Tool/f95.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Tool/f95.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import SCons.Defaults import SCons.Tool diff --git a/scons/scons-local-2.5.0/SCons/Tool/filesystem.py b/scons/scons-local-2.5.1/SCons/Tool/filesystem.py similarity index 96% rename from scons/scons-local-2.5.0/SCons/Tool/filesystem.py rename to scons/scons-local-2.5.1/SCons/Tool/filesystem.py index 8d11a4f93..29817056c 100644 --- a/scons/scons-local-2.5.0/SCons/Tool/filesystem.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Tool/filesystem.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import SCons from SCons.Tool.install import copyFunc diff --git a/scons/scons-local-2.5.0/SCons/Tool/fortran.py b/scons/scons-local-2.5.1/SCons/Tool/fortran.py similarity index 94% rename from scons/scons-local-2.5.0/SCons/Tool/fortran.py rename to scons/scons-local-2.5.1/SCons/Tool/fortran.py index e536a84d5..4cba6d523 100644 --- a/scons/scons-local-2.5.0/SCons/Tool/fortran.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Tool/fortran.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import re diff --git a/scons/scons-local-2.5.0/SCons/Tool/g++.py b/scons/scons-local-2.5.1/SCons/Tool/g++.py similarity index 96% rename from scons/scons-local-2.5.0/SCons/Tool/g++.py rename to scons/scons-local-2.5.1/SCons/Tool/g++.py index f66adc1c4..1d12962f3 100644 --- a/scons/scons-local-2.5.0/SCons/Tool/g++.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Tool/g++.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import os.path import re diff --git a/scons/scons-local-2.5.0/SCons/Tool/g77.py b/scons/scons-local-2.5.1/SCons/Tool/g77.py similarity index 95% rename from scons/scons-local-2.5.0/SCons/Tool/g77.py rename to scons/scons-local-2.5.1/SCons/Tool/g77.py index f685b01e4..24731f3a8 100644 --- a/scons/scons-local-2.5.0/SCons/Tool/g77.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Tool/g77.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import SCons.Util from SCons.Tool.FortranCommon import add_all_to_env, add_f77_to_env diff --git a/scons/scons-local-2.5.0/SCons/Tool/gas.py b/scons/scons-local-2.5.1/SCons/Tool/gas.py similarity index 94% rename from scons/scons-local-2.5.0/SCons/Tool/gas.py rename to scons/scons-local-2.5.1/SCons/Tool/gas.py index acebe5d1a..0c09c7bee 100644 --- a/scons/scons-local-2.5.0/SCons/Tool/gas.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Tool/gas.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" as_module = __import__('as', globals(), locals(), []) diff --git a/scons/scons-local-2.5.0/SCons/Tool/gcc.py b/scons/scons-local-2.5.1/SCons/Tool/gcc.py similarity index 97% rename from scons/scons-local-2.5.0/SCons/Tool/gcc.py rename to scons/scons-local-2.5.1/SCons/Tool/gcc.py index e4032eaf4..427e80c98 100644 --- a/scons/scons-local-2.5.0/SCons/Tool/gcc.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Tool/gcc.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import cc import os diff --git a/scons/scons-local-2.5.0/SCons/Tool/gdc.py b/scons/scons-local-2.5.1/SCons/Tool/gdc.py similarity index 98% rename from scons/scons-local-2.5.0/SCons/Tool/gdc.py rename to scons/scons-local-2.5.1/SCons/Tool/gdc.py index 1c41858c9..c9ac97246 100644 --- a/scons/scons-local-2.5.0/SCons/Tool/gdc.py +++ b/scons/scons-local-2.5.1/SCons/Tool/gdc.py @@ -46,7 +46,7 @@ Lib tool variables: # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Tool/gdc.py rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Tool/gdc.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import SCons.Action import SCons.Defaults diff --git a/scons/scons-local-2.5.0/SCons/Tool/gettext.py b/scons/scons-local-2.5.1/SCons/Tool/gettext.py similarity index 94% rename from scons/scons-local-2.5.0/SCons/Tool/gettext.py rename to scons/scons-local-2.5.1/SCons/Tool/gettext.py index 99fbd3237..79c1dd294 100644 --- a/scons/scons-local-2.5.0/SCons/Tool/gettext.py +++ b/scons/scons-local-2.5.1/SCons/Tool/gettext.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.py rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Tool/gettext.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" ############################################################################# def generate(env,**kw): diff --git a/scons/scons-local-2.5.0/SCons/Tool/gfortran.py b/scons/scons-local-2.5.1/SCons/Tool/gfortran.py similarity index 95% rename from scons/scons-local-2.5.0/SCons/Tool/gfortran.py rename to scons/scons-local-2.5.1/SCons/Tool/gfortran.py index 62f434ea9..d25073ca8 100644 --- a/scons/scons-local-2.5.0/SCons/Tool/gfortran.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Tool/gfortran.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import SCons.Util diff --git a/scons/scons-local-2.5.0/SCons/Tool/gnulink.py b/scons/scons-local-2.5.1/SCons/Tool/gnulink.py similarity index 96% rename from scons/scons-local-2.5.0/SCons/Tool/gnulink.py rename to scons/scons-local-2.5.1/SCons/Tool/gnulink.py index 3df077ba3..794bee6e1 100644 --- a/scons/scons-local-2.5.0/SCons/Tool/gnulink.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Tool/gnulink.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import SCons.Util import SCons.Tool diff --git a/scons/scons-local-2.5.0/SCons/Tool/gs.py b/scons/scons-local-2.5.1/SCons/Tool/gs.py similarity index 96% rename from scons/scons-local-2.5.0/SCons/Tool/gs.py rename to scons/scons-local-2.5.1/SCons/Tool/gs.py index b0874fda4..77a49fcd4 100644 --- a/scons/scons-local-2.5.0/SCons/Tool/gs.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Tool/gs.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import SCons.Action import SCons.Builder diff --git a/scons/scons-local-2.5.0/SCons/Tool/hpc++.py b/scons/scons-local-2.5.1/SCons/Tool/hpc++.py similarity index 96% rename from scons/scons-local-2.5.0/SCons/Tool/hpc++.py rename to scons/scons-local-2.5.1/SCons/Tool/hpc++.py index 8e79af4e2..d71382575 100644 --- a/scons/scons-local-2.5.0/SCons/Tool/hpc++.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Tool/hpc++.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import os.path diff --git a/scons/scons-local-2.5.0/SCons/Tool/hpcc.py b/scons/scons-local-2.5.1/SCons/Tool/hpcc.py similarity index 94% rename from scons/scons-local-2.5.0/SCons/Tool/hpcc.py rename to scons/scons-local-2.5.1/SCons/Tool/hpcc.py index 25835942e..11aec7b44 100644 --- a/scons/scons-local-2.5.0/SCons/Tool/hpcc.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Tool/hpcc.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import SCons.Util diff --git a/scons/scons-local-2.5.0/SCons/Tool/hplink.py b/scons/scons-local-2.5.1/SCons/Tool/hplink.py similarity index 95% rename from scons/scons-local-2.5.0/SCons/Tool/hplink.py rename to scons/scons-local-2.5.1/SCons/Tool/hplink.py index 0b7777a41..d120827b0 100644 --- a/scons/scons-local-2.5.0/SCons/Tool/hplink.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Tool/hplink.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import os import os.path diff --git a/scons/scons-local-2.5.0/SCons/Tool/icc.py b/scons/scons-local-2.5.1/SCons/Tool/icc.py similarity index 95% rename from scons/scons-local-2.5.0/SCons/Tool/icc.py rename to scons/scons-local-2.5.1/SCons/Tool/icc.py index f6f071168..4ae57e792 100644 --- a/scons/scons-local-2.5.0/SCons/Tool/icc.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Tool/icc.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import cc diff --git a/scons/scons-local-2.5.0/SCons/Tool/icl.py b/scons/scons-local-2.5.1/SCons/Tool/icl.py similarity index 94% rename from scons/scons-local-2.5.0/SCons/Tool/icl.py rename to scons/scons-local-2.5.1/SCons/Tool/icl.py index b14adf6dc..846368e86 100644 --- a/scons/scons-local-2.5.0/SCons/Tool/icl.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Tool/icl.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import SCons.Tool.intelc diff --git a/scons/scons-local-2.5.0/SCons/Tool/ifl.py b/scons/scons-local-2.5.1/SCons/Tool/ifl.py similarity index 96% rename from scons/scons-local-2.5.0/SCons/Tool/ifl.py rename to scons/scons-local-2.5.1/SCons/Tool/ifl.py index e8b309108..61622bfe6 100644 --- a/scons/scons-local-2.5.0/SCons/Tool/ifl.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Tool/ifl.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import SCons.Defaults from SCons.Scanner.Fortran import FortranScan diff --git a/scons/scons-local-2.5.0/SCons/Tool/ifort.py b/scons/scons-local-2.5.1/SCons/Tool/ifort.py similarity index 96% rename from scons/scons-local-2.5.0/SCons/Tool/ifort.py rename to scons/scons-local-2.5.1/SCons/Tool/ifort.py index a00e2491d..b44a6f75f 100644 --- a/scons/scons-local-2.5.0/SCons/Tool/ifort.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Tool/ifort.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import SCons.Defaults from SCons.Scanner.Fortran import FortranScan diff --git a/scons/scons-local-2.5.0/SCons/Tool/ilink.py b/scons/scons-local-2.5.1/SCons/Tool/ilink.py similarity index 95% rename from scons/scons-local-2.5.0/SCons/Tool/ilink.py rename to scons/scons-local-2.5.1/SCons/Tool/ilink.py index 4532d9b12..d66c75e4a 100644 --- a/scons/scons-local-2.5.0/SCons/Tool/ilink.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Tool/ilink.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import SCons.Defaults import SCons.Tool diff --git a/scons/scons-local-2.5.0/SCons/Tool/ilink32.py b/scons/scons-local-2.5.1/SCons/Tool/ilink32.py similarity index 94% rename from scons/scons-local-2.5.0/SCons/Tool/ilink32.py rename to scons/scons-local-2.5.1/SCons/Tool/ilink32.py index a4ccff011..b07afc87d 100644 --- a/scons/scons-local-2.5.0/SCons/Tool/ilink32.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Tool/ilink32.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import SCons.Tool import SCons.Tool.bcc32 diff --git a/scons/scons-local-2.5.0/SCons/Tool/install.py b/scons/scons-local-2.5.1/SCons/Tool/install.py similarity index 99% rename from scons/scons-local-2.5.0/SCons/Tool/install.py rename to scons/scons-local-2.5.1/SCons/Tool/install.py index f3e4227eb..4cebf5bf7 100644 --- a/scons/scons-local-2.5.0/SCons/Tool/install.py +++ b/scons/scons-local-2.5.1/SCons/Tool/install.py @@ -30,7 +30,7 @@ selection method. # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Tool/install.py rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Tool/install.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import os import re diff --git a/scons/scons-local-2.5.0/SCons/Tool/intelc.py b/scons/scons-local-2.5.1/SCons/Tool/intelc.py similarity index 99% rename from scons/scons-local-2.5.0/SCons/Tool/intelc.py rename to scons/scons-local-2.5.1/SCons/Tool/intelc.py index 24b1dc527..995377c24 100644 --- a/scons/scons-local-2.5.0/SCons/Tool/intelc.py +++ b/scons/scons-local-2.5.1/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 -__revision__ = "src/engine/SCons/Tool/intelc.py rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Tool/intelc.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import math, sys, os.path, glob, string, re diff --git a/scons/scons-local-2.5.0/SCons/Tool/ipkg.py b/scons/scons-local-2.5.1/SCons/Tool/ipkg.py similarity index 95% rename from scons/scons-local-2.5.0/SCons/Tool/ipkg.py rename to scons/scons-local-2.5.1/SCons/Tool/ipkg.py index 474f762d9..f7f8fb22e 100644 --- a/scons/scons-local-2.5.0/SCons/Tool/ipkg.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Tool/ipkg.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import os diff --git a/scons/scons-local-2.5.0/SCons/Tool/jar.py b/scons/scons-local-2.5.1/SCons/Tool/jar.py similarity index 97% rename from scons/scons-local-2.5.0/SCons/Tool/jar.py rename to scons/scons-local-2.5.1/SCons/Tool/jar.py index eed1bc627..ba6954759 100644 --- a/scons/scons-local-2.5.0/SCons/Tool/jar.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Tool/jar.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import SCons.Subst import SCons.Util diff --git a/scons/scons-local-2.5.0/SCons/Tool/javac.py b/scons/scons-local-2.5.1/SCons/Tool/javac.py similarity index 98% rename from scons/scons-local-2.5.0/SCons/Tool/javac.py rename to scons/scons-local-2.5.1/SCons/Tool/javac.py index 51dd199bd..adaf35f43 100644 --- a/scons/scons-local-2.5.0/SCons/Tool/javac.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Tool/javac.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import os import os.path diff --git a/scons/scons-local-2.5.0/SCons/Tool/javah.py b/scons/scons-local-2.5.1/SCons/Tool/javah.py similarity index 97% rename from scons/scons-local-2.5.0/SCons/Tool/javah.py rename to scons/scons-local-2.5.1/SCons/Tool/javah.py index c16077288..76a49d45b 100644 --- a/scons/scons-local-2.5.0/SCons/Tool/javah.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Tool/javah.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import os.path diff --git a/scons/scons-local-2.5.0/SCons/Tool/latex.py b/scons/scons-local-2.5.1/SCons/Tool/latex.py similarity index 96% rename from scons/scons-local-2.5.0/SCons/Tool/latex.py rename to scons/scons-local-2.5.1/SCons/Tool/latex.py index 6ed84c6ed..18c53aa60 100644 --- a/scons/scons-local-2.5.0/SCons/Tool/latex.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Tool/latex.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import SCons.Action import SCons.Defaults diff --git a/scons/scons-local-2.5.0/SCons/Tool/ldc.py b/scons/scons-local-2.5.1/SCons/Tool/ldc.py similarity index 98% rename from scons/scons-local-2.5.0/SCons/Tool/ldc.py rename to scons/scons-local-2.5.1/SCons/Tool/ldc.py index 663df3836..f0d726e16 100644 --- a/scons/scons-local-2.5.0/SCons/Tool/ldc.py +++ b/scons/scons-local-2.5.1/SCons/Tool/ldc.py @@ -46,7 +46,7 @@ Lib tool variables: # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Tool/ldc.py rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Tool/ldc.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import os import subprocess diff --git a/scons/scons-local-2.5.0/SCons/Tool/lex.py b/scons/scons-local-2.5.1/SCons/Tool/lex.py similarity index 96% rename from scons/scons-local-2.5.0/SCons/Tool/lex.py rename to scons/scons-local-2.5.1/SCons/Tool/lex.py index d0ac82db0..4c5bb9288 100644 --- a/scons/scons-local-2.5.0/SCons/Tool/lex.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Tool/lex.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import os.path diff --git a/scons/scons-local-2.5.0/SCons/Tool/link.py b/scons/scons-local-2.5.1/SCons/Tool/link.py similarity index 99% rename from scons/scons-local-2.5.0/SCons/Tool/link.py rename to scons/scons-local-2.5.1/SCons/Tool/link.py index 7a883a574..720a66cb3 100644 --- a/scons/scons-local-2.5.0/SCons/Tool/link.py +++ b/scons/scons-local-2.5.1/SCons/Tool/link.py @@ -31,7 +31,7 @@ selection method. # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Tool/link.py rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Tool/link.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import sys import re diff --git a/scons/scons-local-2.5.0/SCons/Tool/linkloc.py b/scons/scons-local-2.5.1/SCons/Tool/linkloc.py similarity index 97% rename from scons/scons-local-2.5.0/SCons/Tool/linkloc.py rename to scons/scons-local-2.5.1/SCons/Tool/linkloc.py index 9fbc59935..3b0b678b3 100644 --- a/scons/scons-local-2.5.0/SCons/Tool/linkloc.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Tool/linkloc.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import os.path import re diff --git a/scons/scons-local-2.5.0/SCons/Tool/m4.py b/scons/scons-local-2.5.1/SCons/Tool/m4.py similarity index 95% rename from scons/scons-local-2.5.0/SCons/Tool/m4.py rename to scons/scons-local-2.5.1/SCons/Tool/m4.py index 7fd4a2fa7..0e7c965e0 100644 --- a/scons/scons-local-2.5.0/SCons/Tool/m4.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Tool/m4.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import SCons.Action import SCons.Builder diff --git a/scons/scons-local-2.5.0/SCons/Tool/masm.py b/scons/scons-local-2.5.1/SCons/Tool/masm.py similarity index 96% rename from scons/scons-local-2.5.0/SCons/Tool/masm.py rename to scons/scons-local-2.5.1/SCons/Tool/masm.py index bc1f83e31..62f300300 100644 --- a/scons/scons-local-2.5.0/SCons/Tool/masm.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Tool/masm.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import SCons.Defaults import SCons.Tool diff --git a/scons/scons-local-2.5.0/SCons/Tool/midl.py b/scons/scons-local-2.5.1/SCons/Tool/midl.py similarity index 96% rename from scons/scons-local-2.5.0/SCons/Tool/midl.py rename to scons/scons-local-2.5.1/SCons/Tool/midl.py index 27ab01aee..c7e257743 100644 --- a/scons/scons-local-2.5.0/SCons/Tool/midl.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Tool/midl.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import SCons.Action import SCons.Builder diff --git a/scons/scons-local-2.5.0/SCons/Tool/mingw.py b/scons/scons-local-2.5.1/SCons/Tool/mingw.py similarity index 98% rename from scons/scons-local-2.5.0/SCons/Tool/mingw.py rename to scons/scons-local-2.5.1/SCons/Tool/mingw.py index 182fd7447..b4889b0b5 100644 --- a/scons/scons-local-2.5.0/SCons/Tool/mingw.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Tool/mingw.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import os import os.path diff --git a/scons/scons-local-2.5.0/SCons/Tool/msgfmt.py b/scons/scons-local-2.5.1/SCons/Tool/msgfmt.py similarity index 97% rename from scons/scons-local-2.5.0/SCons/Tool/msgfmt.py rename to scons/scons-local-2.5.1/SCons/Tool/msgfmt.py index 12b750405..09b1e2a41 100644 --- a/scons/scons-local-2.5.0/SCons/Tool/msgfmt.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Tool/msgfmt.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" from SCons.Builder import BuilderBase ############################################################################# diff --git a/scons/scons-local-2.5.0/SCons/Tool/msginit.py b/scons/scons-local-2.5.1/SCons/Tool/msginit.py similarity index 97% rename from scons/scons-local-2.5.0/SCons/Tool/msginit.py rename to scons/scons-local-2.5.1/SCons/Tool/msginit.py index 0f5950b15..aa95d78c8 100644 --- a/scons/scons-local-2.5.0/SCons/Tool/msginit.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Tool/msginit.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import SCons.Warnings import SCons.Builder diff --git a/scons/scons-local-2.5.0/SCons/Tool/msgmerge.py b/scons/scons-local-2.5.1/SCons/Tool/msgmerge.py similarity index 97% rename from scons/scons-local-2.5.0/SCons/Tool/msgmerge.py rename to scons/scons-local-2.5.1/SCons/Tool/msgmerge.py index 3473597da..c7ebd8875 100644 --- a/scons/scons-local-2.5.0/SCons/Tool/msgmerge.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Tool/msgmerge.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" ############################################################################# def _update_or_init_po_files(target, source, env): diff --git a/scons/scons-local-2.5.0/SCons/Tool/mslib.py b/scons/scons-local-2.5.1/SCons/Tool/mslib.py similarity index 95% rename from scons/scons-local-2.5.0/SCons/Tool/mslib.py rename to scons/scons-local-2.5.1/SCons/Tool/mslib.py index 70c164334..22683a74c 100644 --- a/scons/scons-local-2.5.0/SCons/Tool/mslib.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Tool/mslib.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import SCons.Defaults import SCons.Tool diff --git a/scons/scons-local-2.5.0/SCons/Tool/mslink.py b/scons/scons-local-2.5.1/SCons/Tool/mslink.py similarity index 99% rename from scons/scons-local-2.5.0/SCons/Tool/mslink.py rename to scons/scons-local-2.5.1/SCons/Tool/mslink.py index 27745d16a..173df7f21 100644 --- a/scons/scons-local-2.5.0/SCons/Tool/mslink.py +++ b/scons/scons-local-2.5.1/SCons/Tool/mslink.py @@ -31,7 +31,7 @@ selection method. # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Tool/mslink.py rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Tool/mslink.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import os.path diff --git a/scons/scons-local-2.5.0/SCons/Tool/mssdk.py b/scons/scons-local-2.5.1/SCons/Tool/mssdk.py similarity index 94% rename from scons/scons-local-2.5.0/SCons/Tool/mssdk.py rename to scons/scons-local-2.5.1/SCons/Tool/mssdk.py index 1dddbe770..7cf439aec 100644 --- a/scons/scons-local-2.5.0/SCons/Tool/mssdk.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Tool/mssdk.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" """engine.SCons.Tool.mssdk diff --git a/scons/scons-local-2.5.0/SCons/Tool/msvc.py b/scons/scons-local-2.5.1/SCons/Tool/msvc.py similarity index 99% rename from scons/scons-local-2.5.0/SCons/Tool/msvc.py rename to scons/scons-local-2.5.1/SCons/Tool/msvc.py index f60bf3404..08368e71a 100644 --- a/scons/scons-local-2.5.0/SCons/Tool/msvc.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Tool/msvc.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import os.path import re diff --git a/scons/scons-local-2.5.0/SCons/Tool/msvs.py b/scons/scons-local-2.5.1/SCons/Tool/msvs.py similarity index 99% rename from scons/scons-local-2.5.0/SCons/Tool/msvs.py rename to scons/scons-local-2.5.1/SCons/Tool/msvs.py index df80edf34..c7e91b404 100644 --- a/scons/scons-local-2.5.0/SCons/Tool/msvs.py +++ b/scons/scons-local-2.5.1/SCons/Tool/msvs.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/msvs.py rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Tool/msvs.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import SCons.compat diff --git a/scons/scons-local-2.5.0/SCons/Tool/mwcc.py b/scons/scons-local-2.5.1/SCons/Tool/mwcc.py similarity index 98% rename from scons/scons-local-2.5.0/SCons/Tool/mwcc.py rename to scons/scons-local-2.5.1/SCons/Tool/mwcc.py index 2694a46d9..a7ddb53cb 100644 --- a/scons/scons-local-2.5.0/SCons/Tool/mwcc.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Tool/mwcc.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import os import os.path diff --git a/scons/scons-local-2.5.0/SCons/Tool/mwld.py b/scons/scons-local-2.5.1/SCons/Tool/mwld.py similarity index 97% rename from scons/scons-local-2.5.0/SCons/Tool/mwld.py rename to scons/scons-local-2.5.1/SCons/Tool/mwld.py index e187273f4..eeb80f090 100644 --- a/scons/scons-local-2.5.0/SCons/Tool/mwld.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Tool/mwld.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import SCons.Tool diff --git a/scons/scons-local-2.5.0/SCons/Tool/nasm.py b/scons/scons-local-2.5.1/SCons/Tool/nasm.py similarity index 96% rename from scons/scons-local-2.5.0/SCons/Tool/nasm.py rename to scons/scons-local-2.5.1/SCons/Tool/nasm.py index 5c8ff4ca2..ee1d78cbb 100644 --- a/scons/scons-local-2.5.0/SCons/Tool/nasm.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Tool/nasm.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import SCons.Defaults import SCons.Tool diff --git a/scons/scons-local-2.5.0/SCons/Tool/packaging/__init__.py b/scons/scons-local-2.5.1/SCons/Tool/packaging/__init__.py similarity index 99% rename from scons/scons-local-2.5.0/SCons/Tool/packaging/__init__.py rename to scons/scons-local-2.5.1/SCons/Tool/packaging/__init__.py index 78bc679f5..9b1a14a7a 100644 --- a/scons/scons-local-2.5.0/SCons/Tool/packaging/__init__.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Tool/packaging/__init__.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import SCons.Environment from SCons.Variables import * diff --git a/scons/scons-local-2.5.0/SCons/Tool/packaging/ipk.py b/scons/scons-local-2.5.1/SCons/Tool/packaging/ipk.py similarity index 98% rename from scons/scons-local-2.5.0/SCons/Tool/packaging/ipk.py rename to scons/scons-local-2.5.1/SCons/Tool/packaging/ipk.py index fbf3c2b1e..b3abe13c9 100644 --- a/scons/scons-local-2.5.0/SCons/Tool/packaging/ipk.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Tool/packaging/ipk.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import SCons.Builder import SCons.Node.FS diff --git a/scons/scons-local-2.5.0/SCons/Tool/packaging/msi.py b/scons/scons-local-2.5.1/SCons/Tool/packaging/msi.py similarity index 99% rename from scons/scons-local-2.5.0/SCons/Tool/packaging/msi.py rename to scons/scons-local-2.5.1/SCons/Tool/packaging/msi.py index 29095e811..087a8b113 100644 --- a/scons/scons-local-2.5.0/SCons/Tool/packaging/msi.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Tool/packaging/msi.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import os import SCons diff --git a/scons/scons-local-2.5.0/SCons/Tool/packaging/rpm.py b/scons/scons-local-2.5.1/SCons/Tool/packaging/rpm.py similarity index 99% rename from scons/scons-local-2.5.0/SCons/Tool/packaging/rpm.py rename to scons/scons-local-2.5.1/SCons/Tool/packaging/rpm.py index 6c00e8c5d..899e375a8 100644 --- a/scons/scons-local-2.5.0/SCons/Tool/packaging/rpm.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Tool/packaging/rpm.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import os diff --git a/scons/scons-local-2.5.0/SCons/Tool/packaging/src_tarbz2.py b/scons/scons-local-2.5.1/SCons/Tool/packaging/src_tarbz2.py similarity index 96% rename from scons/scons-local-2.5.0/SCons/Tool/packaging/src_tarbz2.py rename to scons/scons-local-2.5.1/SCons/Tool/packaging/src_tarbz2.py index b72f42e5d..686d6ca82 100644 --- a/scons/scons-local-2.5.0/SCons/Tool/packaging/src_tarbz2.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Tool/packaging/src_tarbz2.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" from SCons.Tool.packaging import putintopackageroot diff --git a/scons/scons-local-2.5.0/SCons/Tool/packaging/src_targz.py b/scons/scons-local-2.5.1/SCons/Tool/packaging/src_targz.py similarity index 96% rename from scons/scons-local-2.5.0/SCons/Tool/packaging/src_targz.py rename to scons/scons-local-2.5.1/SCons/Tool/packaging/src_targz.py index c8e91ec89..a993d5845 100644 --- a/scons/scons-local-2.5.0/SCons/Tool/packaging/src_targz.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Tool/packaging/src_targz.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" from SCons.Tool.packaging import putintopackageroot diff --git a/scons/scons-local-2.5.0/SCons/Tool/packaging/src_zip.py b/scons/scons-local-2.5.1/SCons/Tool/packaging/src_zip.py similarity index 96% rename from scons/scons-local-2.5.0/SCons/Tool/packaging/src_zip.py rename to scons/scons-local-2.5.1/SCons/Tool/packaging/src_zip.py index 41d5e45b1..c288fd930 100644 --- a/scons/scons-local-2.5.0/SCons/Tool/packaging/src_zip.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Tool/packaging/src_zip.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" from SCons.Tool.packaging import putintopackageroot diff --git a/scons/scons-local-2.5.0/SCons/Tool/packaging/tarbz2.py b/scons/scons-local-2.5.1/SCons/Tool/packaging/tarbz2.py similarity index 97% rename from scons/scons-local-2.5.0/SCons/Tool/packaging/tarbz2.py rename to scons/scons-local-2.5.1/SCons/Tool/packaging/tarbz2.py index a98c6e811..51d998aa2 100644 --- a/scons/scons-local-2.5.0/SCons/Tool/packaging/tarbz2.py +++ b/scons/scons-local-2.5.1/SCons/Tool/packaging/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/tarbz2.py rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Tool/packaging/tarbz2.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" from SCons.Tool.packaging import stripinstallbuilder, putintopackageroot diff --git a/scons/scons-local-2.5.0/SCons/Tool/packaging/targz.py b/scons/scons-local-2.5.1/SCons/Tool/packaging/targz.py similarity index 97% rename from scons/scons-local-2.5.0/SCons/Tool/packaging/targz.py rename to scons/scons-local-2.5.1/SCons/Tool/packaging/targz.py index d0c80dbfe..121599bca 100644 --- a/scons/scons-local-2.5.0/SCons/Tool/packaging/targz.py +++ b/scons/scons-local-2.5.1/SCons/Tool/packaging/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/targz.py rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Tool/packaging/targz.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" from SCons.Tool.packaging import stripinstallbuilder, putintopackageroot diff --git a/scons/scons-local-2.5.0/SCons/Tool/packaging/zip.py b/scons/scons-local-2.5.1/SCons/Tool/packaging/zip.py similarity index 93% rename from scons/scons-local-2.5.0/SCons/Tool/packaging/zip.py rename to scons/scons-local-2.5.1/SCons/Tool/packaging/zip.py index 0709ff162..873de0299 100644 --- a/scons/scons-local-2.5.0/SCons/Tool/packaging/zip.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Tool/packaging/zip.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" from SCons.Tool.packaging import stripinstallbuilder, putintopackageroot diff --git a/scons/scons-local-2.5.0/SCons/Tool/pdf.py b/scons/scons-local-2.5.1/SCons/Tool/pdf.py similarity index 96% rename from scons/scons-local-2.5.0/SCons/Tool/pdf.py rename to scons/scons-local-2.5.1/SCons/Tool/pdf.py index 9475bda15..b29cd154f 100644 --- a/scons/scons-local-2.5.0/SCons/Tool/pdf.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Tool/pdf.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import SCons.Builder import SCons.Tool diff --git a/scons/scons-local-2.5.0/SCons/Tool/pdflatex.py b/scons/scons-local-2.5.1/SCons/Tool/pdflatex.py similarity index 96% rename from scons/scons-local-2.5.0/SCons/Tool/pdflatex.py rename to scons/scons-local-2.5.1/SCons/Tool/pdflatex.py index 9f8973691..a18258647 100644 --- a/scons/scons-local-2.5.0/SCons/Tool/pdflatex.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Tool/pdflatex.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import SCons.Action import SCons.Util diff --git a/scons/scons-local-2.5.0/SCons/Tool/pdftex.py b/scons/scons-local-2.5.1/SCons/Tool/pdftex.py similarity index 97% rename from scons/scons-local-2.5.0/SCons/Tool/pdftex.py rename to scons/scons-local-2.5.1/SCons/Tool/pdftex.py index 815dc83bd..c47d5377b 100644 --- a/scons/scons-local-2.5.0/SCons/Tool/pdftex.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Tool/pdftex.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import os import SCons.Action diff --git a/scons/scons-local-2.5.0/SCons/Tool/qt.py b/scons/scons-local-2.5.1/SCons/Tool/qt.py similarity index 99% rename from scons/scons-local-2.5.0/SCons/Tool/qt.py rename to scons/scons-local-2.5.1/SCons/Tool/qt.py index 4feb38eaa..69e534f0b 100644 --- a/scons/scons-local-2.5.0/SCons/Tool/qt.py +++ b/scons/scons-local-2.5.1/SCons/Tool/qt.py @@ -32,7 +32,7 @@ selection method. # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Tool/qt.py rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Tool/qt.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import os.path import re diff --git a/scons/scons-local-2.5.0/SCons/Tool/rmic.py b/scons/scons-local-2.5.1/SCons/Tool/rmic.py similarity index 97% rename from scons/scons-local-2.5.0/SCons/Tool/rmic.py rename to scons/scons-local-2.5.1/SCons/Tool/rmic.py index c05286db8..0a04b599d 100644 --- a/scons/scons-local-2.5.0/SCons/Tool/rmic.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Tool/rmic.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import os.path diff --git a/scons/scons-local-2.5.0/SCons/Tool/rpcgen.py b/scons/scons-local-2.5.1/SCons/Tool/rpcgen.py similarity index 96% rename from scons/scons-local-2.5.0/SCons/Tool/rpcgen.py rename to scons/scons-local-2.5.1/SCons/Tool/rpcgen.py index 6c4116f5b..2348e39ba 100644 --- a/scons/scons-local-2.5.0/SCons/Tool/rpcgen.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Tool/rpcgen.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" from SCons.Builder import Builder import SCons.Util diff --git a/scons/scons-local-2.5.0/SCons/Tool/rpm.py b/scons/scons-local-2.5.1/SCons/Tool/rpm.py similarity index 97% rename from scons/scons-local-2.5.0/SCons/Tool/rpm.py rename to scons/scons-local-2.5.1/SCons/Tool/rpm.py index fe63e2941..43bb0e75c 100644 --- a/scons/scons-local-2.5.0/SCons/Tool/rpm.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Tool/rpm.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import os import re diff --git a/scons/scons-local-2.5.0/SCons/Tool/rpmutils.py b/scons/scons-local-2.5.1/SCons/Tool/rpmutils.py similarity index 99% rename from scons/scons-local-2.5.0/SCons/Tool/rpmutils.py rename to scons/scons-local-2.5.1/SCons/Tool/rpmutils.py index aa6c6804b..07c1ff37a 100644 --- a/scons/scons-local-2.5.0/SCons/Tool/rpmutils.py +++ b/scons/scons-local-2.5.1/SCons/Tool/rpmutils.py @@ -35,7 +35,7 @@ exact syntax. # 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/rpmutils.py rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Tool/rpmutils.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import platform diff --git a/scons/scons-local-2.5.0/SCons/Tool/sgiar.py b/scons/scons-local-2.5.1/SCons/Tool/sgiar.py similarity index 95% rename from scons/scons-local-2.5.0/SCons/Tool/sgiar.py rename to scons/scons-local-2.5.1/SCons/Tool/sgiar.py index 849520c9b..aa3cb4496 100644 --- a/scons/scons-local-2.5.0/SCons/Tool/sgiar.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Tool/sgiar.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import SCons.Defaults import SCons.Tool diff --git a/scons/scons-local-2.5.0/SCons/Tool/sgic++.py b/scons/scons-local-2.5.1/SCons/Tool/sgic++.py similarity index 94% rename from scons/scons-local-2.5.0/SCons/Tool/sgic++.py rename to scons/scons-local-2.5.1/SCons/Tool/sgic++.py index ec1954ec7..6124ade51 100644 --- a/scons/scons-local-2.5.0/SCons/Tool/sgic++.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Tool/sgic++.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import SCons.Util diff --git a/scons/scons-local-2.5.0/SCons/Tool/sgicc.py b/scons/scons-local-2.5.1/SCons/Tool/sgicc.py similarity index 94% rename from scons/scons-local-2.5.0/SCons/Tool/sgicc.py rename to scons/scons-local-2.5.1/SCons/Tool/sgicc.py index 474e6cdca..0a0604f09 100644 --- a/scons/scons-local-2.5.0/SCons/Tool/sgicc.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Tool/sgicc.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import cc diff --git a/scons/scons-local-2.5.0/SCons/Tool/sgilink.py b/scons/scons-local-2.5.1/SCons/Tool/sgilink.py similarity index 95% rename from scons/scons-local-2.5.0/SCons/Tool/sgilink.py rename to scons/scons-local-2.5.1/SCons/Tool/sgilink.py index 491d293ff..9f7446bd8 100644 --- a/scons/scons-local-2.5.0/SCons/Tool/sgilink.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Tool/sgilink.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import SCons.Util diff --git a/scons/scons-local-2.5.0/SCons/Tool/sunar.py b/scons/scons-local-2.5.1/SCons/Tool/sunar.py similarity index 95% rename from scons/scons-local-2.5.0/SCons/Tool/sunar.py rename to scons/scons-local-2.5.1/SCons/Tool/sunar.py index e453a7bbc..a055708fe 100644 --- a/scons/scons-local-2.5.0/SCons/Tool/sunar.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Tool/sunar.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import SCons.Defaults import SCons.Tool diff --git a/scons/scons-local-2.5.0/SCons/Tool/sunc++.py b/scons/scons-local-2.5.1/SCons/Tool/sunc++.py similarity index 97% rename from scons/scons-local-2.5.0/SCons/Tool/sunc++.py rename to scons/scons-local-2.5.1/SCons/Tool/sunc++.py index cf0c95dc5..f8b12a1da 100644 --- a/scons/scons-local-2.5.0/SCons/Tool/sunc++.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Tool/sunc++.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import SCons diff --git a/scons/scons-local-2.5.0/SCons/Tool/suncc.py b/scons/scons-local-2.5.1/SCons/Tool/suncc.py similarity index 94% rename from scons/scons-local-2.5.0/SCons/Tool/suncc.py rename to scons/scons-local-2.5.1/SCons/Tool/suncc.py index 0110174e4..4bcba29c9 100644 --- a/scons/scons-local-2.5.0/SCons/Tool/suncc.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Tool/suncc.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import SCons.Util diff --git a/scons/scons-local-2.5.0/SCons/Tool/sunf77.py b/scons/scons-local-2.5.1/SCons/Tool/sunf77.py similarity index 95% rename from scons/scons-local-2.5.0/SCons/Tool/sunf77.py rename to scons/scons-local-2.5.1/SCons/Tool/sunf77.py index e3260c9e6..3a1dc7b3a 100644 --- a/scons/scons-local-2.5.0/SCons/Tool/sunf77.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Tool/sunf77.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import SCons.Util diff --git a/scons/scons-local-2.5.0/SCons/Tool/sunf90.py b/scons/scons-local-2.5.1/SCons/Tool/sunf90.py similarity index 95% rename from scons/scons-local-2.5.0/SCons/Tool/sunf90.py rename to scons/scons-local-2.5.1/SCons/Tool/sunf90.py index 63465e2f5..e5f378828 100644 --- a/scons/scons-local-2.5.0/SCons/Tool/sunf90.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Tool/sunf90.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import SCons.Util diff --git a/scons/scons-local-2.5.0/SCons/Tool/sunf95.py b/scons/scons-local-2.5.1/SCons/Tool/sunf95.py similarity index 95% rename from scons/scons-local-2.5.0/SCons/Tool/sunf95.py rename to scons/scons-local-2.5.1/SCons/Tool/sunf95.py index 61bdf3742..8534f400d 100644 --- a/scons/scons-local-2.5.0/SCons/Tool/sunf95.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Tool/sunf95.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import SCons.Util diff --git a/scons/scons-local-2.5.0/SCons/Tool/sunlink.py b/scons/scons-local-2.5.1/SCons/Tool/sunlink.py similarity index 95% rename from scons/scons-local-2.5.0/SCons/Tool/sunlink.py rename to scons/scons-local-2.5.1/SCons/Tool/sunlink.py index 49deaf163..b36d0e56a 100644 --- a/scons/scons-local-2.5.0/SCons/Tool/sunlink.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Tool/sunlink.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import os import os.path diff --git a/scons/scons-local-2.5.0/SCons/Tool/swig.py b/scons/scons-local-2.5.1/SCons/Tool/swig.py similarity index 98% rename from scons/scons-local-2.5.0/SCons/Tool/swig.py rename to scons/scons-local-2.5.1/SCons/Tool/swig.py index 1d806ae6f..0f6883c43 100644 --- a/scons/scons-local-2.5.0/SCons/Tool/swig.py +++ b/scons/scons-local-2.5.1/SCons/Tool/swig.py @@ -31,7 +31,7 @@ selection method. # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Tool/swig.py rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Tool/swig.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import os.path import re diff --git a/scons/scons-local-2.5.0/SCons/Tool/tar.py b/scons/scons-local-2.5.1/SCons/Tool/tar.py similarity index 95% rename from scons/scons-local-2.5.0/SCons/Tool/tar.py rename to scons/scons-local-2.5.1/SCons/Tool/tar.py index c19d4916a..924358b45 100644 --- a/scons/scons-local-2.5.0/SCons/Tool/tar.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Tool/tar.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import SCons.Action import SCons.Builder diff --git a/scons/scons-local-2.5.0/SCons/Tool/tex.py b/scons/scons-local-2.5.1/SCons/Tool/tex.py similarity index 99% rename from scons/scons-local-2.5.0/SCons/Tool/tex.py rename to scons/scons-local-2.5.1/SCons/Tool/tex.py index b4e457f64..8da6d75c0 100644 --- a/scons/scons-local-2.5.0/SCons/Tool/tex.py +++ b/scons/scons-local-2.5.1/SCons/Tool/tex.py @@ -32,7 +32,7 @@ selection method. # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Tool/tex.py rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Tool/tex.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import os.path import re diff --git a/scons/scons-local-2.5.0/SCons/Tool/textfile.py b/scons/scons-local-2.5.1/SCons/Tool/textfile.py similarity index 98% rename from scons/scons-local-2.5.0/SCons/Tool/textfile.py rename to scons/scons-local-2.5.1/SCons/Tool/textfile.py index f0d028f92..3cea7ebce 100644 --- a/scons/scons-local-2.5.0/SCons/Tool/textfile.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Tool/textfile.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import SCons diff --git a/scons/scons-local-2.5.0/SCons/Tool/tlib.py b/scons/scons-local-2.5.1/SCons/Tool/tlib.py similarity index 94% rename from scons/scons-local-2.5.0/SCons/Tool/tlib.py rename to scons/scons-local-2.5.1/SCons/Tool/tlib.py index 406697f3c..dd2721a50 100644 --- a/scons/scons-local-2.5.0/SCons/Tool/tlib.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Tool/tlib.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import SCons.Tool import SCons.Tool.bcc32 diff --git a/scons/scons-local-2.5.0/SCons/Tool/wix.py b/scons/scons-local-2.5.1/SCons/Tool/wix.py similarity index 97% rename from scons/scons-local-2.5.0/SCons/Tool/wix.py rename to scons/scons-local-2.5.1/SCons/Tool/wix.py index cc259edc1..85b46e5fd 100644 --- a/scons/scons-local-2.5.0/SCons/Tool/wix.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Tool/wix.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import SCons.Builder import SCons.Action diff --git a/scons/scons-local-2.5.0/SCons/Tool/xgettext.py b/scons/scons-local-2.5.1/SCons/Tool/xgettext.py similarity index 99% rename from scons/scons-local-2.5.0/SCons/Tool/xgettext.py rename to scons/scons-local-2.5.1/SCons/Tool/xgettext.py index 153d71f74..b05df26c3 100644 --- a/scons/scons-local-2.5.0/SCons/Tool/xgettext.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Tool/xgettext.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" ############################################################################# class _CmdRunner(object): diff --git a/scons/scons-local-2.5.0/SCons/Tool/yacc.py b/scons/scons-local-2.5.1/SCons/Tool/yacc.py similarity index 97% rename from scons/scons-local-2.5.0/SCons/Tool/yacc.py rename to scons/scons-local-2.5.1/SCons/Tool/yacc.py index 6a089a147..a2fa83cf0 100644 --- a/scons/scons-local-2.5.0/SCons/Tool/yacc.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Tool/yacc.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import os.path diff --git a/scons/scons-local-2.5.0/SCons/Tool/zip.py b/scons/scons-local-2.5.1/SCons/Tool/zip.py similarity index 97% rename from scons/scons-local-2.5.0/SCons/Tool/zip.py rename to scons/scons-local-2.5.1/SCons/Tool/zip.py index 5349cba33..7cfea31a5 100644 --- a/scons/scons-local-2.5.0/SCons/Tool/zip.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Tool/zip.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import os.path diff --git a/scons/scons-local-2.5.0/SCons/Util.py b/scons/scons-local-2.5.1/SCons/Util.py similarity index 99% rename from scons/scons-local-2.5.0/SCons/Util.py rename to scons/scons-local-2.5.1/SCons/Util.py index 21ef53fed..2370a9c35 100644 --- a/scons/scons-local-2.5.0/SCons/Util.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Util.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import os import sys diff --git a/scons/scons-local-2.5.0/SCons/Variables/BoolVariable.py b/scons/scons-local-2.5.1/SCons/Variables/BoolVariable.py similarity index 98% rename from scons/scons-local-2.5.0/SCons/Variables/BoolVariable.py rename to scons/scons-local-2.5.1/SCons/Variables/BoolVariable.py index e6ad86bf8..44731848e 100644 --- a/scons/scons-local-2.5.0/SCons/Variables/BoolVariable.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Variables/BoolVariable.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" __all__ = ['BoolVariable',] diff --git a/scons/scons-local-2.5.0/SCons/Variables/EnumVariable.py b/scons/scons-local-2.5.1/SCons/Variables/EnumVariable.py similarity index 98% rename from scons/scons-local-2.5.0/SCons/Variables/EnumVariable.py rename to scons/scons-local-2.5.1/SCons/Variables/EnumVariable.py index 5fd41013d..57c466156 100644 --- a/scons/scons-local-2.5.0/SCons/Variables/EnumVariable.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Variables/EnumVariable.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" __all__ = ['EnumVariable',] diff --git a/scons/scons-local-2.5.0/SCons/Variables/ListVariable.py b/scons/scons-local-2.5.1/SCons/Variables/ListVariable.py similarity index 98% rename from scons/scons-local-2.5.0/SCons/Variables/ListVariable.py rename to scons/scons-local-2.5.1/SCons/Variables/ListVariable.py index 8e31d88e8..18405616d 100644 --- a/scons/scons-local-2.5.0/SCons/Variables/ListVariable.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Variables/ListVariable.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" # Known Bug: This should behave like a Set-Type, but does not really, # since elements can occur twice. diff --git a/scons/scons-local-2.5.0/SCons/Variables/PackageVariable.py b/scons/scons-local-2.5.1/SCons/Variables/PackageVariable.py similarity index 98% rename from scons/scons-local-2.5.0/SCons/Variables/PackageVariable.py rename to scons/scons-local-2.5.1/SCons/Variables/PackageVariable.py index 44d87ccbb..6d4761fde 100644 --- a/scons/scons-local-2.5.0/SCons/Variables/PackageVariable.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Variables/PackageVariable.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" __all__ = ['PackageVariable',] diff --git a/scons/scons-local-2.5.0/SCons/Variables/PathVariable.py b/scons/scons-local-2.5.1/SCons/Variables/PathVariable.py similarity index 99% rename from scons/scons-local-2.5.0/SCons/Variables/PathVariable.py rename to scons/scons-local-2.5.1/SCons/Variables/PathVariable.py index 081fee598..aa3f2180f 100644 --- a/scons/scons-local-2.5.0/SCons/Variables/PathVariable.py +++ b/scons/scons-local-2.5.1/SCons/Variables/PathVariable.py @@ -68,7 +68,7 @@ Usage example: # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Variables/PathVariable.py rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Variables/PathVariable.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" __all__ = ['PathVariable',] diff --git a/scons/scons-local-2.5.0/SCons/Variables/__init__.py b/scons/scons-local-2.5.1/SCons/Variables/__init__.py similarity index 98% rename from scons/scons-local-2.5.0/SCons/Variables/__init__.py rename to scons/scons-local-2.5.1/SCons/Variables/__init__.py index 83ec1b267..284813fca 100644 --- a/scons/scons-local-2.5.0/SCons/Variables/__init__.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Variables/__init__.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import os.path import sys diff --git a/scons/scons-local-2.5.0/SCons/Warnings.py b/scons/scons-local-2.5.1/SCons/Warnings.py similarity index 98% rename from scons/scons-local-2.5.0/SCons/Warnings.py rename to scons/scons-local-2.5.1/SCons/Warnings.py index adf1eabd1..25efcb9a0 100644 --- a/scons/scons-local-2.5.0/SCons/Warnings.py +++ b/scons/scons-local-2.5.1/SCons/Warnings.py @@ -27,7 +27,7 @@ This file implements the warnings framework for SCons. """ -__revision__ = "src/engine/SCons/Warnings.py rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/Warnings.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import sys diff --git a/scons/scons-local-2.5.0/SCons/__init__.py b/scons/scons-local-2.5.1/SCons/__init__.py similarity index 85% rename from scons/scons-local-2.5.0/SCons/__init__.py rename to scons/scons-local-2.5.1/SCons/__init__.py index bc557bf50..d5c94a797 100644 --- a/scons/scons-local-2.5.0/SCons/__init__.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3544:95d356f188a3 2016/04/09 14:38:50 bdbaddog" +__revision__ = "src/engine/SCons/__init__.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" -__version__ = "2.5.0" +__version__ = "2.5.1" -__build__ = "rel_2.5.0:3544:95d356f188a3[MODIFIED]" +__build__ = "rel_2.5.1:3735:9dc6cee5c168[MODIFIED]" -__buildsys__ = "ubuntu1404-32bit" +__buildsys__ = "mongodog" -__date__ = "2016/04/09 14:38:50" +__date__ = "2016/11/03 14:02:02" __developer__ = "bdbaddog" diff --git a/scons/scons-local-2.5.0/SCons/compat/__init__.py b/scons/scons-local-2.5.1/SCons/compat/__init__.py similarity index 97% rename from scons/scons-local-2.5.0/SCons/compat/__init__.py rename to scons/scons-local-2.5.1/SCons/compat/__init__.py index 000b81faf..d3d4fe6f5 100644 --- a/scons/scons-local-2.5.0/SCons/compat/__init__.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/compat/__init__.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import os import sys diff --git a/scons/scons-local-2.5.0/SCons/compat/_scons_dbm.py b/scons/scons-local-2.5.1/SCons/compat/_scons_dbm.py similarity index 93% rename from scons/scons-local-2.5.0/SCons/compat/_scons_dbm.py rename to scons/scons-local-2.5.1/SCons/compat/_scons_dbm.py index 0720956fb..ab8534c9c 100644 --- a/scons/scons-local-2.5.0/SCons/compat/_scons_dbm.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/compat/_scons_dbm.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" class error(Exception): pass diff --git a/scons/scons-local-2.5.0/SCons/cpp.py b/scons/scons-local-2.5.1/SCons/cpp.py similarity index 99% rename from scons/scons-local-2.5.0/SCons/cpp.py rename to scons/scons-local-2.5.1/SCons/cpp.py index 46671afdb..60484f717 100644 --- a/scons/scons-local-2.5.0/SCons/cpp.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/cpp.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" __doc__ = """ SCons C Pre-Processor module diff --git a/scons/scons-local-2.5.0/SCons/dblite.py b/scons/scons-local-2.5.1/SCons/dblite.py similarity index 100% rename from scons/scons-local-2.5.0/SCons/dblite.py rename to scons/scons-local-2.5.1/SCons/dblite.py diff --git a/scons/scons-local-2.5.0/SCons/exitfuncs.py b/scons/scons-local-2.5.1/SCons/exitfuncs.py similarity index 95% rename from scons/scons-local-2.5.0/SCons/exitfuncs.py rename to scons/scons-local-2.5.1/SCons/exitfuncs.py index a20f049b3..756b9251e 100644 --- a/scons/scons-local-2.5.0/SCons/exitfuncs.py +++ b/scons/scons-local-2.5.1/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 rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/engine/SCons/exitfuncs.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import atexit diff --git a/scons/scons-local-2.5.0/scons-2.5.0-py2.7.egg-info b/scons/scons-local-2.5.1/scons-2.5.1-py2.7.egg-info similarity index 96% rename from scons/scons-local-2.5.0/scons-2.5.0-py2.7.egg-info rename to scons/scons-local-2.5.1/scons-2.5.1-py2.7.egg-info index 1742cf89d..1db6dcb8f 100644 --- a/scons/scons-local-2.5.0/scons-2.5.0-py2.7.egg-info +++ b/scons/scons-local-2.5.1/scons-2.5.1-py2.7.egg-info @@ -1,6 +1,6 @@ Metadata-Version: 1.0 Name: scons -Version: 2.5.0 +Version: 2.5.1 Summary: Open Source next-generation build tool. Home-page: http://www.scons.org/ Author: Steven Knight diff --git a/scons/scons-time.py b/scons/scons-time.py index 2e63ef211..343806267 100755 --- a/scons/scons-time.py +++ b/scons/scons-time.py @@ -32,7 +32,7 @@ from __future__ import division from __future__ import nested_scopes -__revision__ = "src/script/scons-time.py rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog" +__revision__ = "src/script/scons-time.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" import getopt import glob diff --git a/scons/scons.py b/scons/scons.py index 2cae192af..967d3988f 100755 --- a/scons/scons.py +++ b/scons/scons.py @@ -23,15 +23,15 @@ # 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/script/scons.py rel_2.5.0:3544:95d356f188a3 2016/04/09 14:38:50 bdbaddog" +__revision__ = "src/script/scons.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" -__version__ = "2.5.0" +__version__ = "2.5.1" -__build__ = "rel_2.5.0:3544:95d356f188a3[MODIFIED]" +__build__ = "rel_2.5.1:3735:9dc6cee5c168[MODIFIED]" -__buildsys__ = "ubuntu1404-32bit" +__buildsys__ = "mongodog" -__date__ = "2016/04/09 14:38:50" +__date__ = "2016/11/03 14:02:02" __developer__ = "bdbaddog" diff --git a/scons/sconsign.py b/scons/sconsign.py index 38a217a54..90572c3d1 100755 --- a/scons/sconsign.py +++ b/scons/sconsign.py @@ -23,15 +23,15 @@ # 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/script/sconsign.py rel_2.5.0:3544:95d356f188a3 2016/04/09 14:38:50 bdbaddog" +__revision__ = "src/script/sconsign.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog" -__version__ = "2.5.0" +__version__ = "2.5.1" -__build__ = "rel_2.5.0:3544:95d356f188a3[MODIFIED]" +__build__ = "rel_2.5.1:3735:9dc6cee5c168[MODIFIED]" -__buildsys__ = "ubuntu1404-32bit" +__buildsys__ = "mongodog" -__date__ = "2016/04/09 14:38:50" +__date__ = "2016/11/03 14:02:02" __developer__ = "bdbaddog" From c18730a1829532e91726e2a88bad494962477622 Mon Sep 17 00:00:00 2001 From: Artem Pavlenko Date: Mon, 20 Nov 2017 09:44:33 +0100 Subject: [PATCH 5/6] use `exit ${CODE}` --- scripts/check_glibcxx.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/check_glibcxx.sh b/scripts/check_glibcxx.sh index 9e4cbc54f..ae298939e 100755 --- a/scripts/check_glibcxx.sh +++ b/scripts/check_glibcxx.sh @@ -33,4 +33,4 @@ for i in src/libmapnik*; do check $i done -return ${FINAL_RETURN_CODE} \ No newline at end of file +exit ${FINAL_RETURN_CODE} From ce12610adc595f354f04c1d263f92aa32dcf6c89 Mon Sep 17 00:00:00 2001 From: Artem Pavlenko Date: Tue, 21 Nov 2017 15:53:08 +0100 Subject: [PATCH 6/6] Add copyleft notice --- src/glibc_workaround.cpp | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/src/glibc_workaround.cpp b/src/glibc_workaround.cpp index c07a22d9a..27c97f4dd 100644 --- a/src/glibc_workaround.cpp +++ b/src/glibc_workaround.cpp @@ -1,3 +1,25 @@ +/***************************************************************************** + * + * This file is part of Mapnik (c++ mapping toolkit) + * + * Copyright (C) 2017 Artem Pavlenko + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * + *****************************************************************************/ + #ifdef __linux__ #ifdef MAPNIK_ENABLE_GLIBC_WORKAROUND