diff options
| author | William Deegan <bill@baddogconsulting.com> | 2020-07-04 15:46:49 -0700 |
|---|---|---|
| committer | William Deegan <bill@baddogconsulting.com> | 2020-07-04 15:46:49 -0700 |
| commit | 64fd44ef6c4ea257b065f1ba45e1c202f72e9b5f (patch) | |
| tree | 4469532dc7b13d7a906f7f51e4647930b0634818 | |
| parent | 074c847ad977b777f6b1580e24b14cf92b2f06d8 (diff) | |
| download | scons-git-64fd44ef6c4ea257b065f1ba45e1c202f72e9b5f.tar.gz | |
fix scons --version and packaging
| -rw-r--r-- | SCons/Script/Main.py | 4 | ||||
| -rw-r--r-- | SCons/__init__.py | 6 | ||||
| -rw-r--r-- | setup.cfg | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/SCons/Script/Main.py b/SCons/Script/Main.py index 7aa377951..a039b8bae 100644 --- a/SCons/Script/Main.py +++ b/SCons/Script/Main.py @@ -1370,8 +1370,8 @@ def main(): parts = ["SCons by Steven Knight et al.:\n"] try: - import __main__ - parts.append(version_string("SCons", __main__)) + import SCons + parts.append(version_string("SCons", SCons)) except (ImportError, AttributeError): # On Windows there is no scons.py, so there is no # __main__.__version__, hence there is no script version. diff --git a/SCons/__init__.py b/SCons/__init__.py index 3a0fc809d..cf0812336 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 21:25:16" +__date__="2020-07-04 22:22:39" __buildsys__="ProDog2020" -__revision__="d61fcebe8bdbdc576157109494d2a776ae134bc1" -__build__="d61fcebe8bdbdc576157109494d2a776ae134bc1" +__revision__="074c847ad977b777f6b1580e24b14cf92b2f06d8" +__build__="074c847ad977b777f6b1580e24b14cf92b2f06d8" # make sure compatibility is always in place import SCons.compat # noqa
\ No newline at end of file @@ -50,8 +50,8 @@ packages = find: [options.packages.find] - include=SCons.* - exclude=template +;include=SCons.* +exclude=template [options.entry_points] console_scripts = |