From 6c188cc8a6129f9ea7f1714556050b8aea3a949b Mon Sep 17 00:00:00 2001 From: William Deegan Date: Sat, 30 Jul 2022 14:02:48 -0700 Subject: Updated autogenerated doc files --- doc/generated/examples/caching_ex-random_1.xml | 6 +- doc/generated/examples/depends_include_SConstruct | 2 +- doc/generated/examples/depends_mixing_1.xml | 2 +- .../examples/mergeflags_MergeFlags1_1.xml | 2 +- .../examples/mergeflags_MergeFlags2_1.xml | 2 +- .../examples/mergeflags_MergeFlags3_1.xml | 4 +- doc/generated/examples/troubleshoot_Dump_1.xml | 2 +- doc/generated/examples/troubleshoot_Dump_2.xml | 6 +- doc/generated/examples/troubleshoot_explain1_3.xml | 2 +- .../examples/troubleshoot_stacktrace_2.xml | 2 +- doc/generated/tools.gen | 4 +- doc/generated/variables.gen | 118 +++++++++++++++++++-- doc/generated/variables.mod | 8 ++ 13 files changed, 137 insertions(+), 23 deletions(-) diff --git a/doc/generated/examples/caching_ex-random_1.xml b/doc/generated/examples/caching_ex-random_1.xml index b751534..b8bd1bf 100644 --- a/doc/generated/examples/caching_ex-random_1.xml +++ b/doc/generated/examples/caching_ex-random_1.xml @@ -1,8 +1,8 @@ % scons -Q -cc -o f5.o -c f5.c -cc -o f2.o -c f2.c cc -o f4.o -c f4.c -cc -o f1.o -c f1.c +cc -o f2.o -c f2.c cc -o f3.o -c f3.c +cc -o f1.o -c f1.c +cc -o f5.o -c f5.c cc -o prog f1.o f2.o f3.o f4.o f5.o diff --git a/doc/generated/examples/depends_include_SConstruct b/doc/generated/examples/depends_include_SConstruct index 2da2ecf..ec81661 100644 --- a/doc/generated/examples/depends_include_SConstruct +++ b/doc/generated/examples/depends_include_SConstruct @@ -1,3 +1,3 @@ -Program('hello.c', CPPPATH = '.') +Program('hello.c', CPPPATH='.') diff --git a/doc/generated/examples/depends_mixing_1.xml b/doc/generated/examples/depends_mixing_1.xml index 64511e0..9e5ed3f 100644 --- a/doc/generated/examples/depends_mixing_1.xml +++ b/doc/generated/examples/depends_mixing_1.xml @@ -1,6 +1,6 @@ % scons -Q cc -o program1.o -c -I. program1.c -cc -o prog-MD5 program1.o +cc -o prog-content program1.o cc -o program2.o -c -I. program2.c cc -o prog-timestamp program2.o % touch inc.h diff --git a/doc/generated/examples/mergeflags_MergeFlags1_1.xml b/doc/generated/examples/mergeflags_MergeFlags1_1.xml index 5985ec2..89cd499 100644 --- a/doc/generated/examples/mergeflags_MergeFlags1_1.xml +++ b/doc/generated/examples/mergeflags_MergeFlags1_1.xml @@ -1,4 +1,4 @@ % scons -Q -['-option', '-O1', '-whatever', '-O3'] +CCFLAGS: ['-option', '-O1', '-whatever', '-O3'] scons: `.' is up to date. diff --git a/doc/generated/examples/mergeflags_MergeFlags2_1.xml b/doc/generated/examples/mergeflags_MergeFlags2_1.xml index 3ff1e5d..dcc5f56 100644 --- a/doc/generated/examples/mergeflags_MergeFlags2_1.xml +++ b/doc/generated/examples/mergeflags_MergeFlags2_1.xml @@ -1,4 +1,4 @@ % scons -Q -['/include', '/usr/local/include', '/usr/include', '/usr/opt/include'] +CPPPATH: ['/include', '/usr/local/include', '/usr/include', '/usr/opt/include'] scons: `.' is up to date. diff --git a/doc/generated/examples/mergeflags_MergeFlags3_1.xml b/doc/generated/examples/mergeflags_MergeFlags3_1.xml index d0af8e2..d34efb9 100644 --- a/doc/generated/examples/mergeflags_MergeFlags3_1.xml +++ b/doc/generated/examples/mergeflags_MergeFlags3_1.xml @@ -1,5 +1,5 @@ % scons -Q -['-option', '-O1', '-whatever', '-O3'] -['/include', '/usr/local/include', '/usr/include', '/usr/opt/include'] +CCFLAGS: ['-option', '-O1', '-whatever', '-O3'] +CPPPATH: ['/include', '/usr/local/include', '/usr/include', '/usr/opt/include'] scons: `.' is up to date. diff --git a/doc/generated/examples/troubleshoot_Dump_1.xml b/doc/generated/examples/troubleshoot_Dump_1.xml index 64ef1ab..6a0fa82 100644 --- a/doc/generated/examples/troubleshoot_Dump_1.xml +++ b/doc/generated/examples/troubleshoot_Dump_1.xml @@ -31,7 +31,7 @@ scons: Reading SConscript files ... 'ENV': {'PATH': '/usr/local/bin:/opt/bin:/bin:/usr/bin:/snap/bin'}, 'ESCAPE': <function escape at 0x700000>, 'File': <SCons.Defaults.Variable_Method_Caller object at 0x700000>, - 'HOST_ARCH': 'x86_64', + 'HOST_ARCH': 'arm64', 'HOST_OS': 'posix', 'IDLSUFFIXES': ['.idl', '.IDL'], 'INSTALL': <function copyFunc at 0x700000>, diff --git a/doc/generated/examples/troubleshoot_Dump_2.xml b/doc/generated/examples/troubleshoot_Dump_2.xml index b7f0da6..c952602 100644 --- a/doc/generated/examples/troubleshoot_Dump_2.xml +++ b/doc/generated/examples/troubleshoot_Dump_2.xml @@ -10,6 +10,7 @@ scons: Reading SConscript files ... '_InternalInstallVersionedLib': <function InstallVersionedBuilderWrapper at 0x700000>}, 'CC': 'cl', 'CCCOM': <SCons.Action.FunctionAction object at 0x700000>, + 'CCDEPFLAGS': '/showIncludes', 'CCFLAGS': ['/nologo'], 'CCPCHFLAGS': <function gen_ccpchflags at 0x700000>, 'CCPDBFLAGS': ['${(PDB and "/Z7") or ""}'], @@ -52,7 +53,7 @@ scons: Reading SConscript files ... 'SystemRoot': 'C:\\WINDOWS'}, 'ESCAPE': <function escape at 0x700000>, 'File': <SCons.Defaults.Variable_Method_Caller object at 0x700000>, - 'HOST_ARCH': 'x86_64', + 'HOST_ARCH': 'arm64', 'HOST_OS': 'win32', 'IDLSUFFIXES': ['.idl', '.IDL'], 'INCPREFIX': '/I', @@ -66,6 +67,7 @@ scons: Reading SConscript files ... 'LIBSUFFIXES': ['$LIBSUFFIX'], 'MAXLINELENGTH': 2048, 'MSVC_SETUP_RUN': True, + 'NINJA_DEPFILE_PARSE_FORMAT': 'msvc', 'OBJPREFIX': '', 'OBJSUFFIX': '.obj', 'PCHCOM': '$CXX /Fo${TARGETS[1]} $CXXFLAGS $CCFLAGS $CPPFLAGS $_CPPDEFFLAGS ' @@ -90,7 +92,7 @@ scons: Reading SConscript files ... 'SHCXXCOM': '${TEMPFILE("$SHCXX $_MSVC_OUTPUT_FLAG /c $CHANGED_SOURCES ' '$SHCXXFLAGS $SHCCFLAGS $_CCCOMCOM","$SHCXXCOMSTR")}', 'SHCXXFLAGS': ['$CXXFLAGS'], - 'SHELL': None, + 'SHELL': 'command', 'SHLIBPREFIX': '', 'SHLIBSUFFIX': '.dll', 'SHOBJPREFIX': '$OBJPREFIX', diff --git a/doc/generated/examples/troubleshoot_explain1_3.xml b/doc/generated/examples/troubleshoot_explain1_3.xml index bb5b21e..e658d89 100644 --- a/doc/generated/examples/troubleshoot_explain1_3.xml +++ b/doc/generated/examples/troubleshoot_explain1_3.xml @@ -2,5 +2,5 @@ cp file.in file.oout scons: warning: Cannot find target file.out after building -File "/home/bdeegan/devel/scons/git/as_scons/scripts/scons.py", line 98, in <module> +File "/Users/bdbaddog/devel/scons/git/as_scons/scripts/scons.py", line 97, in <module> diff --git a/doc/generated/examples/troubleshoot_stacktrace_2.xml b/doc/generated/examples/troubleshoot_stacktrace_2.xml index 7c3cc36..7c471eb 100644 --- a/doc/generated/examples/troubleshoot_stacktrace_2.xml +++ b/doc/generated/examples/troubleshoot_stacktrace_2.xml @@ -3,7 +3,7 @@ scons: *** [prog.o] Source `prog.c' not found, needed by target `prog.o'. scons: internal stack trace: File "SCons/Job.py", line 203, in start task.prepare() - File "SCons/Script/Main.py", line 178, in prepare + File "SCons/Script/Main.py", line 180, in prepare return SCons.Taskmaster.OutOfDateTask.prepare(self) File "SCons/Taskmaster.py", line 186, in prepare executor.prepare() diff --git a/doc/generated/tools.gen b/doc/generated/tools.gen index 35ded17..f05b470 100644 --- a/doc/generated/tools.gen +++ b/doc/generated/tools.gen @@ -667,7 +667,7 @@ Sets construction variables for the D language compiler LDC2. Sets construction variables for the &lex; lexical analyser. -Sets: &cv-link-LEX;, &cv-link-LEXCOM;, &cv-link-LEXFLAGS;, &cv-link-LEXUNISTD;.Uses: &cv-link-LEXCOMSTR;. +Sets: &cv-link-LEX;, &cv-link-LEXCOM;, &cv-link-LEXFLAGS;, &cv-link-LEXUNISTD;.Uses: &cv-link-LEXCOMSTR;, &cv-link-LEXFLAGS;, &cv-link-LEX_HEADER_FILE;, &cv-link-LEX_TABLES_FILE;. link @@ -1097,7 +1097,7 @@ provides &b-POTUpdate; builder to make PO Sets construction variables for the &yacc; parse generator. -Sets: &cv-link-YACC;, &cv-link-YACCCOM;, &cv-link-YACCFLAGS;, &cv-link-YACCHFILESUFFIX;, &cv-link-YACCHXXFILESUFFIX;, &cv-link-YACCVCGFILESUFFIX;.Uses: &cv-link-YACCCOMSTR;. +Sets: &cv-link-YACC;, &cv-link-YACCCOM;, &cv-link-YACCFLAGS;, &cv-link-YACCHFILESUFFIX;, &cv-link-YACCHXXFILESUFFIX;, &cv-link-YACCVCGFILESUFFIX;.Uses: &cv-link-YACCCOMSTR;, &cv-link-YACCFLAGS;, &cv-link-YACC_GRAPH_FILE;, &cv-link-YACC_HEADER_FILE;. zip diff --git a/doc/generated/variables.gen b/doc/generated/variables.gen index 533ea22..fdfa9bc 100644 --- a/doc/generated/variables.gen +++ b/doc/generated/variables.gen @@ -3926,6 +3926,31 @@ The lexical analyzer generator. + + + LEX_HEADER_FILE + + +If supplied, generate a C header file with the name taken from this variable. +Will be emitted as a +command-line option. Use this in preference to including + in &cv-link-LEXFLAGS; directly. + + + + + + LEX_TABLES_FILE + + +If supplied, write the lex tables to a file with the name +taken from this variable. +Will be emitted as a +command-line option. Use this in preference to including + in &cv-link-LEXFLAGS; directly. + + + LEXCOM @@ -3947,7 +3972,7 @@ If this is not set, then &cv-link-LEXCOM; (the command line) is displayed. -env = Environment(LEXCOMSTR = "Lex'ing $TARGET from $SOURCES") +env = Environment(LEXCOMSTR="Lex'ing $TARGET from $SOURCES") @@ -3957,6 +3982,20 @@ env = Environment(LEXCOMSTR = "Lex'ing $TARGET from $SOURCES") General options passed to the lexical analyzer generator. +In addition to passing the value on during invocation, +the &t-link-lex; tool also examines this &consvar; for options +which cause additional output files to be generated, +and adds those to the target list. +Recognized for this purpose are GNU &flex; options + and +; +the output file is named by the option argument. + + +Note that files specified by and + may not be properly handled +by &SCons; in all situations. Consider using +&cv-link-LEX_HEADER_FILE; and &cv-link-LEX_TABLES_FILE; instead. @@ -10032,6 +10071,31 @@ The parser generator. + + + YACC_GRAPH_FILE + + +If supplied, write a graph of the automaton to a file with the name +taken from this variable. +Will be emitted as a +command-line option. Use this in preference to including + in &cv-link-YACCFLAGS; directly. + + + + + + YACC_HEADER_FILE + + +If supplied, generate a header file with the name taken from this variable. +Will be emitted as a +command-line option. Use this in preference to including + in &cv-link-YACCFLAGS; directly. + + + YACCCOM @@ -10053,7 +10117,7 @@ If this is not set, then &cv-link-YACCCOM; (the command line) is displayed. -env = Environment(YACCCOMSTR = "Yacc'ing $TARGET from $SOURCES") +env = Environment(YACCCOMSTR="Yacc'ing $TARGET from $SOURCES") @@ -10063,11 +10127,51 @@ env = Environment(YACCCOMSTR = "Yacc'ing $TARGET from $SOURCES") General options passed to the parser generator. -If &cv-link-YACCFLAGS; contains a option, -SCons assumes that the call will also create a .h file -(if the yacc source file ends in a .y suffix) -or a .hpp file -(if the yacc source file ends in a .yy suffix) +In addition to passing the value on during invocation, +the &t-link-yacc; tool also examines this &consvar; for options +which cause additional output files to be generated, +and adds those to the target list. + + + +If a option is present, +&scons; assumes that the call will also create a header file +with the suffix defined by &cv-link-YACCHFILESUFFIX; +if the yacc source file ends in a .y suffix, +or a file with the suffix defined by &cv-link-YACCHXXFILESUFFIX; +if the yacc source file ends in a .yy suffix. + + + +If a option is present, +&scons; assumes that the call will also create a graph file +with the suffix defined by &cv-link-YACCVCGFILESUFFIX;. + + + +If a option is present, +&scons; assumes that the call will also create an output debug file +with the suffix .output. + + + +Also recognized are GNU &bison; options + and its deprecated synonym +, +which is similar to + +but the output filename is named by the option argument; +and , +which is similar to + +but the output filename is named by the option argument. + + + +Note that files specified by and + may not be properly handled +by &SCons; in all situations. Consider using +&cv-link-YACC_HEADER_FILE; and &cv-link-YACC_GRAPH_FILE; instead. diff --git a/doc/generated/variables.mod b/doc/generated/variables.mod index 5d89887..ceb58ac 100644 --- a/doc/generated/variables.mod +++ b/doc/generated/variables.mod @@ -267,6 +267,8 @@ THIS IS AN AUTOMATICALLY-GENERATED FILE. DO NOT EDIT. $_LDMODULEVERSIONFLAGS"> $LDMODULEVERSIONFLAGS"> $LEX"> +$LEX_HEADER_FILE"> +$LEX_TABLES_FILE"> $LEXCOM"> $LEXCOMSTR"> $LEXFLAGS"> @@ -657,6 +659,8 @@ THIS IS AN AUTOMATICALLY-GENERATED FILE. DO NOT EDIT. $XGETTEXTPATHPREFIX"> $XGETTEXTPATHSUFFIX"> $YACC"> +$YACC_GRAPH_FILE"> +$YACC_HEADER_FILE"> $YACCCOM"> $YACCCOMSTR"> $YACCFLAGS"> @@ -937,6 +941,8 @@ THIS IS AN AUTOMATICALLY-GENERATED FILE. DO NOT EDIT. $_LDMODULEVERSIONFLAGS"> $LDMODULEVERSIONFLAGS"> $LEX"> +$LEX_HEADER_FILE"> +$LEX_TABLES_FILE"> $LEXCOM"> $LEXCOMSTR"> $LEXFLAGS"> @@ -1327,6 +1333,8 @@ THIS IS AN AUTOMATICALLY-GENERATED FILE. DO NOT EDIT. $XGETTEXTPATHPREFIX"> $XGETTEXTPATHSUFFIX"> $YACC"> +$YACC_GRAPH_FILE"> +$YACC_HEADER_FILE"> $YACCCOM"> $YACCCOMSTR"> $YACCFLAGS"> -- cgit v0.12 From 4e58108dc7c67613f9115d1d2aca1d195d1e1a6c Mon Sep 17 00:00:00 2001 From: William Deegan Date: Sat, 30 Jul 2022 14:09:18 -0700 Subject: Updates for 4.4.0 release --- RELEASE.txt | 4 ++-- SConstruct | 2 +- debian/changelog | 7 ++++++- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/RELEASE.txt b/RELEASE.txt index d3fc5fd..5c0d23a 100755 --- a/RELEASE.txt +++ b/RELEASE.txt @@ -1,10 +1,10 @@ -A new SCons release, 4.3.1, is now available +A new SCons release, 4.4.0, is now available on the SCons download page: https://scons.org/pages/download.html -Here is a summary of the changes since 4.3.1: +Here is a summary of the changes since 4.4.0: NOTE: If you build with Python 3.10.0 and then rebuild with 3.10.1 (or higher), you may see unexpected rebuilds. This is due to Python internals changing which changed diff --git a/SConstruct b/SConstruct index 1728271..215245a 100644 --- a/SConstruct +++ b/SConstruct @@ -38,7 +38,7 @@ month_year = strftime('%B %Y') project = 'scons' -default_version = '4.3.1' +default_version = '4.4.0' copyright = "Copyright (c) %s The SCons Foundation" % copyright_years # diff --git a/debian/changelog b/debian/changelog index 7a0ecd3..ba38e64 100755 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,15 @@ +scons (4.4.0) unstable; urgency=low + + * Feature release + + -- William Deegan Sat, 30 Jul 2022 14:08:29 -0700 + scons (4.3.0) unstable; urgency=low * Feature release -- William Deegan Tue, 16 Nov 2021 18:12:46 -0700 - scons (4.2.0) unstable; urgency=low * Feature release -- cgit v0.12 From fc8d0ec215ee6cba8bc158ad40c099be0b598297 Mon Sep 17 00:00:00 2001 From: William Deegan Date: Sat, 30 Jul 2022 14:11:17 -0700 Subject: Updates for 4.4.0 release --- CHANGES.txt | 2 +- SCons/__init__.py | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index 682e9ab..55dbad3 100755 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -7,7 +7,7 @@ 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 +RELEASE 4.4.0 - Sat, 30 Jul 2022 14:08:29 -0700 From Joseph Brill: - Verify that a user specified msvc script (via MSVC_USE_SCRIPT) exists and raise an exception diff --git a/SCons/__init__.py b/SCons/__init__.py index 784a392..32f1d82 100644 --- a/SCons/__init__.py +++ b/SCons/__init__.py @@ -1,9 +1,9 @@ -__version__="4.3.1" +__version__="4.4.0" __copyright__="Copyright (c) 2001 - 2022 The SCons Foundation" __developer__="bdbaddog" -__date__="Sun, 24 Jul 2022 18:02:27 -0700" +__date__="Sat, 30 Jul 2022 14:09:41 -0700" __buildsys__="M1Dog2021" -__revision__="2cf871f2d61b489220a93d9020a0af5310054f91" -__build__="2cf871f2d61b489220a93d9020a0af5310054f91" +__revision__="4e58108dc7c67613f9115d1d2aca1d195d1e1a6c" +__build__="4e58108dc7c67613f9115d1d2aca1d195d1e1a6c" # make sure compatibility is always in place import SCons.compat # noqa \ No newline at end of file -- cgit v0.12 From 3e1ef7b965cb78735b20b28667d2157a77976dad Mon Sep 17 00:00:00 2001 From: William Deegan Date: Sat, 30 Jul 2022 14:14:30 -0700 Subject: updates for 4.4.0 --- SCons/__init__.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/SCons/__init__.py b/SCons/__init__.py index 32f1d82..189bec3 100644 --- a/SCons/__init__.py +++ b/SCons/__init__.py @@ -1,9 +1,9 @@ __version__="4.4.0" __copyright__="Copyright (c) 2001 - 2022 The SCons Foundation" __developer__="bdbaddog" -__date__="Sat, 30 Jul 2022 14:09:41 -0700" +__date__="Sat, 30 Jul 2022 14:11:34 -0700" __buildsys__="M1Dog2021" -__revision__="4e58108dc7c67613f9115d1d2aca1d195d1e1a6c" -__build__="4e58108dc7c67613f9115d1d2aca1d195d1e1a6c" +__revision__="fc8d0ec215ee6cba8bc158ad40c099be0b598297" +__build__="fc8d0ec215ee6cba8bc158ad40c099be0b598297" # make sure compatibility is always in place import SCons.compat # noqa \ No newline at end of file -- cgit v0.12 From e353c45d68cf4144d396a66ecef58be064ef439f Mon Sep 17 00:00:00 2001 From: William Deegan Date: Sat, 30 Jul 2022 14:48:28 -0700 Subject: updates for 4.4.0 --- RELEASE.txt | 30 ++++++++++++------------------ 1 file changed, 12 insertions(+), 18 deletions(-) diff --git a/RELEASE.txt b/RELEASE.txt index 5c0d23a..6f21835 100755 --- a/RELEASE.txt +++ b/RELEASE.txt @@ -3,8 +3,7 @@ on the SCons download page: https://scons.org/pages/download.html - -Here is a summary of the changes since 4.4.0: +Here is a summary of the changes since 4.3.0: NOTE: If you build with Python 3.10.0 and then rebuild with 3.10.1 (or higher), you may see unexpected rebuilds. This is due to Python internals changing which changed @@ -88,11 +87,6 @@ NEW FUNCTIONALITY the tool can generate (applies only when using GNU flex and GNU bison). -DEPRECATED FUNCTIONALITY ------------------------- - -- List anything that's been deprecated since the last release - CHANGED/ENHANCED EXISTING FUNCTIONALITY --------------------------------------- @@ -251,20 +245,20 @@ PACKAGING - Added project_url for mailing lists and Discord - Updated setup.cfg to remove Python 3.5 and add Python 3.10 -DOCUMENTATION -------------- - -- List any significant changes to the documentation (not individual - typo fixes, even if they're mentioned in src/CHANGES.txt to give - the contributor credit) - -DEVELOPMENT ------------ - -- List visible changes in the way SCons is developed Thanks to the following contributors listed below for their contributions to this release. ========================================================================================== .. code-block:: text git shortlog --no-merges -ns 4.3.0..HEAD + git shortlog --no-merges -ns 4.3.0..HEAD + 174 Joseph Brill + 126 Mats Wichmann + 93 William Deegan + 64 Daniel Moody + 4 SergBobrovsky + 2 dependabot[bot] + 1 djh + 1 Ivan Kravets + 1 Vishwajith-K + 1 Zhichang Yu -- cgit v0.12