From 71b532b5dadb0fe097d54271b5dbb584a2e06154 Mon Sep 17 00:00:00 2001 From: William Deegan Date: Sat, 28 Oct 2023 17:42:30 -0700 Subject: Updates to make ready for merging --- CHANGES.txt | 8 ++--- RELEASE.txt | 2 ++ SCons/Script/SConscript.py | 4 +-- SCons/__init__.py | 10 +++---- doc/man/scons.xml | 2 +- test/SConscript/SConscriptTrace.py | 58 ------------------------------------ test/option/debug-sconscript.py | 60 ++++++++++++++++++++++++++++++++++++++ 7 files changed, 74 insertions(+), 70 deletions(-) delete mode 100644 test/SConscript/SConscriptTrace.py create mode 100644 test/option/debug-sconscript.py diff --git a/CHANGES.txt b/CHANGES.txt index 2c69e34..725539d 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -8,10 +8,6 @@ NOTE: The 4.0.0 Release of SCons dropped Python 2.7 Support NOTE: 4.3.0 now requires Python 3.6.0 and above. Python 3.5.x is no longer supported RELEASE VERSION/DATE TO BE FILLED IN LATER - From Sten Grüner - - The --debug flag has a 'sconscript' option allowing to trace - files included via SConscript call. - From Max Bachmann: - Add missing directories to searched paths for mingw installs @@ -62,6 +58,10 @@ RELEASE VERSION/DATE TO BE FILLED IN LATER - Obsoleted YACCVCGFILESUFFIX, being replaced by YACC_GRAPH_FILE_SUFFIX. If YACC_GRAPH_FILE_SUFFIX is not set, it will respect YACCVCGFILESUFFIX. + From Sten Grüner + - The newly added --debug=sconscript optiont (new) will output notices when + entering an exiting each SConscript as they are processed. + From Philipp Maierhöfer: - Fix gfortran tool initialization. Defaults to using binary named gfortran as would be expected, and properly set's SHFORTRAN flags to include -fPIC diff --git a/RELEASE.txt b/RELEASE.txt index c0925bb..01ac02d 100644 --- a/RELEASE.txt +++ b/RELEASE.txt @@ -79,6 +79,8 @@ CHANGED/ENHANCED EXISTING FUNCTIONALITY Any code that did the direct import will have to change to import from SCons.Util.sctypes. - Add JDK 21 LTS support +- The newly added --debug=sconscript optiont (new) will output notices when + entering an exiting each SConscript as they are processed. FIXES ----- diff --git a/SCons/Script/SConscript.py b/SCons/Script/SConscript.py index 860b3e7..0d75088 100644 --- a/SCons/Script/SConscript.py +++ b/SCons/Script/SConscript.py @@ -275,10 +275,10 @@ def _SConscript(fs, *files, **kw): scriptname = _file_.name _file_.close() if SCons.Debug.sconscript_trace: - print("scons-entering>"+str(scriptname)) + print("scons: Entering "+str(scriptname)) exec(compile(scriptdata, scriptname, 'exec'), call_stack[-1].globals) if SCons.Debug.sconscript_trace: - print("scons-exiting>"+str(scriptname)) + print("scons: Exiting "+str(scriptname)) except SConscriptReturn: pass finally: diff --git a/SCons/__init__.py b/SCons/__init__.py index f0f241d..29176c1 100644 --- a/SCons/__init__.py +++ b/SCons/__init__.py @@ -1,9 +1,9 @@ -__version__="4.5.2" +__version__="4.5.3" __copyright__="Copyright (c) 2001 - 2023 The SCons Foundation" __developer__="bdbaddog" -__date__="Sun, 04 Jun 2023 15:36:48 -0700" +__date__="Sat, 28 Oct 2023 17:40:01 -0700" __buildsys__="M1Dog2021" -__revision__="b3744e8862927899e3d0ebcb41297f9b4c142c63" -__build__="b3744e8862927899e3d0ebcb41297f9b4c142c63" +__revision__="a790daf8d878aef83937723e1fb1017fd86875f2" +__build__="a790daf8d878aef83937723e1fb1017fd86875f2" # make sure compatibility is always in place -import SCons.compat # noqa \ No newline at end of file +import SCons.compat # noqa \ No newline at end of file diff --git a/doc/man/scons.xml b/doc/man/scons.xml index d9406d7..aaebc2c 100644 --- a/doc/man/scons.xml +++ b/doc/man/scons.xml @@ -1122,7 +1122,7 @@ should take place in parallel.) sconscript -Augments the output of SCons with markers to track included SConscript files. +Enables output indicating entering and exiting each SConscript file. diff --git a/test/SConscript/SConscriptTrace.py b/test/SConscript/SConscriptTrace.py deleted file mode 100644 index ab1b660..0000000 --- a/test/SConscript/SConscriptTrace.py +++ /dev/null @@ -1,58 +0,0 @@ -#!/usr/bin/env python -# -# __COPYRIGHT__ -# -# 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. -# - -__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" - -import os -import TestSCons - -test = TestSCons.TestSCons() - - -test.write('SConstruct', """\ -print("SConstruct") -""") - -wpath = test.workpath() - -test.run(arguments = ".") -unexpect = [ - 'scons-entering>%s%sSConstruct'%(wpath, os.sep), - 'scons-exiting>%s%sSConstruct'%(wpath, os.sep) -] -test.must_not_contain_any_line(test.stdout(), unexpect) - -test.run(arguments = "--debug=sconscript .") -expect = [ - 'scons-entering>%s%sSConstruct'%(wpath, os.sep), - 'scons-exiting>%s%sSConstruct'%(wpath, os.sep) -] -test.must_contain_all_lines(test.stdout(), expect) -test.pass_test() - -# Local Variables: -# tab-width:4 -# indent-tabs-mode:nil -# End: -# vim: set expandtab tabstop=4 shiftwidth=4: diff --git a/test/option/debug-sconscript.py b/test/option/debug-sconscript.py new file mode 100644 index 0000000..9638f79 --- /dev/null +++ b/test/option/debug-sconscript.py @@ -0,0 +1,60 @@ +#!/usr/bin/env python +# +# MIT License +# +# Copyright 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. + +""" +Test the --debug=sconscript option +""" + +import os +import TestSCons + +test = TestSCons.TestSCons() + +test.write('SConstruct', """\ +print("SConstruct") +""") + +wpath = test.workpath() + +test.run(arguments=".") +unexpect = [ + 'scons: Entering %s%sSConstruct' % (wpath, os.sep), + 'scons: Exiting %s%sSConstruct' % (wpath, os.sep) +] +test.must_not_contain_any_line(test.stdout(), unexpect) + +test.run(arguments="--debug=sconscript .") +expect = [ + 'scons: Entering %s%sSConstruct' % (wpath, os.sep), + 'scons: Exiting %s%sSConstruct' % (wpath, os.sep) +] +test.must_contain_all_lines(test.stdout(), expect) +test.pass_test() + +# Local Variables: +# tab-width:4 +# indent-tabs-mode:nil +# End: +# vim: set expandtab tabstop=4 shiftwidth=4: -- cgit v0.12