From 05763ba4d5565953701646018a40fcf01f9abcde Mon Sep 17 00:00:00 2001
From: William Deegan <bill@baddogconsulting.com>
Date: Tue, 30 Jun 2020 15:04:23 -0700
Subject: have scripts use central SCons.__init__.py's __version__,etc

---
 SCons/Utilities/ConfigureCache.py | 12 +-----------
 SCons/Utilities/sconsign.py       | 12 +-----------
 SCons/__init__.py                 | 12 ++++++------
 site_scons/update_build_info.py   | 14 ++++++--------
 4 files changed, 14 insertions(+), 36 deletions(-)

diff --git a/SCons/Utilities/ConfigureCache.py b/SCons/Utilities/ConfigureCache.py
index 80783a9..0c6dbe3 100644
--- a/SCons/Utilities/ConfigureCache.py
+++ b/SCons/Utilities/ConfigureCache.py
@@ -36,17 +36,7 @@ import glob
 import json
 import os
 
-__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
-
-__version__ = "__VERSION__"
-
-__build__ = "__BUILD__"
-
-__buildsys__ = "__BUILDSYS__"
-
-__date__ = "__DATE__"
-
-__developer__ = "__DEVELOPER__"
+from SCons import __version__, __build__, __buildsys__, __date__, __developer__
 
 
 def rearrange_cache_entries(current_prefix_len, new_prefix_len):
diff --git a/SCons/Utilities/sconsign.py b/SCons/Utilities/sconsign.py
index 21aaabc..d2831e6 100644
--- a/SCons/Utilities/sconsign.py
+++ b/SCons/Utilities/sconsign.py
@@ -23,17 +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__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
-
-__version__ = "__VERSION__"
-
-__build__ = "__BUILD__"
-
-__buildsys__ = "__BUILDSYS__"
-
-__date__ = "__DATE__"
-
-__developer__ = "__DEVELOPER__"
+from SCons import __version__, __build__, __buildsys__, __date__, __developer__
 
 import getopt
 import os
diff --git a/SCons/__init__.py b/SCons/__init__.py
index 9e12a3f..fad85c2 100644
--- a/SCons/__init__.py
+++ b/SCons/__init__.py
@@ -1,9 +1,9 @@
-__VERSION__="3.9.9a996"
+__version__="3.9.9a996"
 __copyright__="Copyright (c) 2001 - 2020 The SCons Foundation"
-__DEVELOPER__="bdbaddog"
-__DATE__="2020-06-30 20:17:38"
-__BUILDSYS__="ProDog2020"
-__REVISION__="f2fb4bb5449c1375c0cbde5d15f674a168f2b3bf"
-__BUILD__="f2fb4bb5449c1375c0cbde5d15f674a168f2b3bf"
+__developer__="bdbaddog"
+__date__="2020-06-30 22:00:50"
+__buildsys__="ProDog2020"
+__revision__="a61be899bd0c0e5038bcbf361873f494a0e0dd70"
+__build__="a61be899bd0c0e5038bcbf361873f494a0e0dd70"
 # make sure compatibility is always in place
 import SCons.compat
\ No newline at end of file
diff --git a/site_scons/update_build_info.py b/site_scons/update_build_info.py
index 9c34286..2007245 100644
--- a/site_scons/update_build_info.py
+++ b/site_scons/update_build_info.py
@@ -1,15 +1,13 @@
 def update_init_file(env):
     substitutions = {
-        '__VERSION__': env['VERSION'],
+        '__version__': env['VERSION'],
         "__copyright__": env['COPYRIGHT'],
-        "__DEVELOPER__": env['DEVELOPER'],
-        "__DATE__": env['DATE'],
-        "__BUILDSYS__": env['BUILDSYS'],
-        "__REVISION__": env['REVISION'],
-        "__BUILD__": env['BUILD'],
+        "__developer__": env['DEVELOPER'],
+        "__date__": env['DATE'],
+        "__buildsys__": env['BUILDSYS'],
+        "__revision__": env['REVISION'],
+        "__build__": env['BUILD'],
     }
-    # env.Textfile('#SCons/__versioninfo.py',
-
     si = env.Textfile('#SCons/__init__.py',
                       ["%s=\"%s\"" % (k, v) for k, v in substitutions.items()] +
                       ['# make sure compatibility is always in place',
-- 
cgit v0.12