diff options
| author | William Deegan <bill@baddogconsulting.com> | 2020-07-06 17:48:03 (GMT) |
|---|---|---|
| committer | William Deegan <bill@baddogconsulting.com> | 2020-07-06 17:48:03 (GMT) |
| commit | a0dc798c1b6d5625950cd25574af212fd406f2ab (patch) | |
| tree | 367c7f4061a337714c23870323ed53d124885e03 | |
| parent | edf795edf3fa1cea04dc81bbbc79bd7a0e3f2126 (diff) | |
| parent | 08c027aee6627a5eb2d7cef2834df2949745eb0e (diff) | |
| download | SCons-a0dc798c1b6d5625950cd25574af212fd406f2ab.zip SCons-a0dc798c1b6d5625950cd25574af212fd406f2ab.tar.gz SCons-a0dc798c1b6d5625950cd25574af212fd406f2ab.tar.bz2 | |
Merge branch 'rel_4.0.0' of github.com:SCons/scons into rel_4.0.0
| -rw-r--r-- | SCons/__init__.py | 6 | ||||
| -rw-r--r-- | site_scons/scons_local_package.py | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/SCons/__init__.py b/SCons/__init__.py index 05c7159..8bd6961 100644 --- a/SCons/__init__.py +++ b/SCons/__init__.py @@ -1,9 +1,9 @@ __version__="4.0.0" __copyright__="Copyright (c) 2001 - 2020 The SCons Foundation" __developer__="bdbaddog" -__date__="2020-07-04 22:47:08" +__date__="2020-07-06 15:58:10" __buildsys__="ProDog2020" -__revision__="64fd44ef6c4ea257b065f1ba45e1c202f72e9b5f" -__build__="64fd44ef6c4ea257b065f1ba45e1c202f72e9b5f" +__revision__="ad3f21fbf0667f5b654771176d29dbdf75d9b120" +__build__="ad3f21fbf0667f5b654771176d29dbdf75d9b120" # make sure compatibility is always in place import SCons.compat # noqa
\ No newline at end of file diff --git a/site_scons/scons_local_package.py b/site_scons/scons_local_package.py index 445dc05..5e633e9 100644 --- a/site_scons/scons_local_package.py +++ b/site_scons/scons_local_package.py @@ -56,7 +56,9 @@ def install_local_package_files(env): 'scripts/scons-configure-cache.py', 'scripts/sconsign.py', 'bin/scons-time.py'] - all_local_installed.extend(env.Install('#/build/scons-local', basedir_files)) + for bf in basedir_files: + fn = os.path.basename(bf) + all_local_installed.append(env.SCons_revision('#/build/scons-local/%s'%fn, bf)) rename_files = [('scons-${VERSION}.bat', 'scripts/scons.bat'), ('scons-README', 'README-local'), |