From efdf3fdbcd2f7654cb8d1209a8b040914437bacd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Tue, 23 Jul 2019 16:54:06 +0200 Subject: New upstream version 3.1.0 --- doc/generated/builders.gen | 38 ++++++++++++-- doc/generated/examples/caching_ex-random_1.xml | 2 +- doc/generated/examples/troubleshoot_explain1_3.xml | 2 +- doc/generated/functions.gen | 34 ++++++++---- doc/generated/variables.gen | 11 ++++ doc/generated/variables.mod | 2 + doc/man/scons-time.xml | 4 +- doc/man/scons.xml | 16 +++--- doc/man/sconsign.xml | 60 ++++++++++++++-------- doc/scons.mod | 1 + doc/user/depends.xml | 11 +++- doc/user/less-simple.xml | 18 ++++--- 12 files changed, 145 insertions(+), 54 deletions(-) (limited to 'doc') diff --git a/doc/generated/builders.gen b/doc/generated/builders.gen index dc05443..7c62558 100644 --- a/doc/generated/builders.gen +++ b/doc/generated/builders.gen @@ -849,14 +849,16 @@ Compile files for languages defined in LINGUAS file latest installed version, or the version specified by $MSVS_VERSION in the Environment constructor). For Visual Studio 6, it will generate a .dsp - file. For Visual Studio 7 (.NET) and later versions, it will - generate a .vcproj file. + file. For Visual Studio 7, 8, and 9, it will + generate a .vcproj file. For Visual + Studio 10 and later, it will generate a + .vcxproj file. By default, this also generates a solution file for the specified project, a .dsw file for Visual Studio 6 or a .sln file for - Visual Studio 7 (.NET). This behavior may be disabled by + Visual Studio 7 and later. This behavior may be disabled by specifying auto_build_solution=0 when you call MSVSProject, in which case you presumably want to build the solution file(s) by calling the MSVSSolution @@ -928,6 +930,36 @@ Compile files for languages defined in LINGUAS file + + cppdefines + + + Preprocessor definitions for the different variants. + The number of cppdefines entries + must match the number of variant + entries, or be empty (not specified). If you give + only one, it will automatically be propagated to all + variants. If you don't give this parameter, SCons + will use the invoking environment's + CPPDEFINES entry for all variants. + + + + + cpppaths + + + Compiler include paths for the different variants. + The number of cpppaths entries + must match the number of variant + entries, or be empty (not specified). If you give + only one, it will automatically be propagated to all + variants. If you don't give this parameter, SCons + will use the invoking environment's + CPPPATH entry for all variants. + + + buildtarget diff --git a/doc/generated/examples/caching_ex-random_1.xml b/doc/generated/examples/caching_ex-random_1.xml index 0a432e9..58ff6ae 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 f3.o -c f3.c cc -o f2.o -c f2.c +cc -o f5.o -c f5.c cc -o f1.o -c f1.c cc -o f4.o -c f4.c cc -o prog f1.o f2.o f3.o f4.o f5.o diff --git a/doc/generated/examples/troubleshoot_explain1_3.xml b/doc/generated/examples/troubleshoot_explain1_3.xml index ebc13f8..04b09fd 100644 --- a/doc/generated/examples/troubleshoot_explain1_3.xml +++ b/doc/generated/examples/troubleshoot_explain1_3.xml @@ -3,5 +3,5 @@ cp file.in file.oout scons: warning: Cannot find target file.out after building -File "/home/bdeegan/devel/scons/git/as_scons/src/script/scons.py", line 204, in <module> +File "/home/bdeegan/devel/scons/git/as_scons/bootstrap/src/script/scons.py", line 204, in <module> diff --git a/doc/generated/functions.gen b/doc/generated/functions.gen index 9fc9d4b..5e8bebb 100644 --- a/doc/generated/functions.gen +++ b/doc/generated/functions.gen @@ -480,7 +480,7 @@ string, in which case a list will be returned instead of a string. -If +If delete_existing is 0, then adding a path that already exists will not move it to the end; it will stay where it is in the list. @@ -518,7 +518,7 @@ then any value(s) that already exist in the construction variable will not be added again to the list. -However, if delete_existing is 1, +However, if delete_existing is 1, existing matching values are removed first, so existing values in the arg list move to the end of the list. @@ -820,12 +820,14 @@ env4 = env.Clone(tools = ['msvc', MyTool]) The parse_flags -keyword argument is also recognized: +keyword argument is also recognized to allow merging command-line +style arguments into the appropriate construction +variables (see env.MergeFlags). # create an environment for compiling programs that use wxWidgets -wx_env = env.Clone(parse_flags = '!wx-config --cflags --cxxflags') +wx_env = env.Clone(parse_flags='!wx-config --cflags --cxxflags') @@ -1137,6 +1139,17 @@ size, or content signature. + +repo_node + + +Use this node instead of the one specified by +dependency + to determine if the dependency has changed. + + + + @@ -1173,7 +1186,7 @@ Example: -def my_decider(dependency, target, prev_ni): +def my_decider(dependency, target, prev_ni, repo_node=None): return not os.path.exists(str(target)) env.Decider(my_decider) @@ -2531,9 +2544,9 @@ as the dependency. -Note that this will only remove the dependencies listed from -the files built by default. It will still be built if that -dependency is needed by another object being built. +Note that this will only remove the dependencies listed from +the files built by default. It will still be built if that +dependency is needed by another object being built. See the third and forth examples below. @@ -2941,6 +2954,9 @@ and added to the following construction variables: -frameworkdir= FRAMEWORKPATH -include CCFLAGS -isysroot CCFLAGS, LINKFLAGS +-isystem CCFLAGS +-iquote CCFLAGS +-idirafter CCFLAGS -I CPPPATH -l LIBS -L LIBPATH @@ -3151,7 +3167,7 @@ then any value(s) that already exist in the construction variable will not be added again to the list. -However, if delete_existing is 1, +However, if delete_existing is 1, existing matching values are removed first, so existing values in the arg list move to the front of the list. diff --git a/doc/generated/variables.gen b/doc/generated/variables.gen index c7048b4..28dfc59 100644 --- a/doc/generated/variables.gen +++ b/doc/generated/variables.gen @@ -4495,6 +4495,7 @@ constructor; setting it later has no effect. Valid values for Windows are +14.2, 14.1, 14.0, 14.0Exp, @@ -7341,6 +7342,16 @@ that may not be set or used in a construction environment. The suffix used for tar file names. + + + + TEMPFILEARGJOIN + + +The string (or character) to be used to join the arguments passed to TEMPFILE when command line exceeds the limit set by $MAXLINELENGTH. +The default value is a space. However for MSVC, MSLINK the default is a line seperator characters as defined by os.linesep. +Note this value is used literally and not expanded by the subst logic. + diff --git a/doc/generated/variables.mod b/doc/generated/variables.mod index 28c08dc..47576f4 100644 --- a/doc/generated/variables.mod +++ b/doc/generated/variables.mod @@ -544,6 +544,7 @@ THIS IS AN AUTOMATICALLY-GENERATED FILE. DO NOT EDIT. $TARGET_OS"> $TARGETS"> $TARSUFFIX"> +$TEMPFILEARGJOIN"> $TEMPFILEPREFIX"> $TEMPFILESUFFIX"> $TEX"> @@ -1183,6 +1184,7 @@ THIS IS AN AUTOMATICALLY-GENERATED FILE. DO NOT EDIT. $TARGET_OS"> $TARGETS"> $TARSUFFIX"> +$TEMPFILEARGJOIN"> $TEMPFILEPREFIX"> $TEMPFILESUFFIX"> $TEX"> diff --git a/doc/man/scons-time.xml b/doc/man/scons-time.xml index 80dc041..7251c9f 100644 --- a/doc/man/scons-time.xml +++ b/doc/man/scons-time.xml @@ -32,8 +32,8 @@ SCONS-TIME 1 -SCons 3.0.5 -SCons 3.0.5 +SCons 3.1.0 +SCons 3.1.0 scons-time diff --git a/doc/man/scons.xml b/doc/man/scons.xml index 2f5eb32..dd9fbdd 100644 --- a/doc/man/scons.xml +++ b/doc/man/scons.xml @@ -75,8 +75,8 @@ SCONS 1 -SCons 3.0.5 -SCons 3.0.5 +SCons 3.1.0 +SCons 3.1.0 scons @@ -2043,7 +2043,7 @@ env['BAR'] = 'bar' construction variables may also be set or modified by the parse_flags keyword argument, which applies the -ParseFlags +&f-link-env-MergeFlags; method (described below) to the argument value after all other processing is completed. This is useful either if the exact content of the flags is unknown @@ -2051,7 +2051,7 @@ This is useful either if the exact content of the flags is unknown or if the flags are distributed to a number of construction variables. -env = Environment(parse_flags = '-Iinclude -DEBUG -lm') +env = Environment(parse_flags='-Iinclude -DEBUG -lm') This example adds 'include' to @@ -2439,10 +2439,14 @@ see the descriptions of these variables, below, for more information.) It is also possible to use the parse_flags -keyword argument in an override: +keyword argument in an override, +to merge command-line style arguments +into the appropriate construction variables +(see &f-link-env-MergeFlags;). + -env = Program('hello', 'hello.c', parse_flags = '-Iinclude -DEBUG -lm') +env = Program('hello', 'hello.c', parse_flags='-Iinclude -DEBUG -lm') This example adds 'include' to diff --git a/doc/man/sconsign.xml b/doc/man/sconsign.xml index 2f0d66c..f70bb62 100644 --- a/doc/man/sconsign.xml +++ b/doc/man/sconsign.xml @@ -32,20 +32,19 @@ SCONSIGN 1 -SCons 3.0.5 -SCons 3.0.5 +SCons 3.1.0 +SCons 3.1.0 sconsign -print SCons .sconsign file information +print SCons signature file information sconsign options - file - ... + file @@ -54,30 +53,38 @@ The sconsign command -displays the contents of one or more -.sconsign +displays the contents of one or more signature +("sconsign") files specified by the user. By default, sconsign dumps the entire contents of the specified file(s). -Each entry is printed in the following format: +Without the verbose option, +each entry is printed in the following format: - file: signature timestamp length - implicit_dependency_1: signature timestamp length - implicit_dependency_2: signature timestamp length - action_signature [action string] + +file: signature timestamp length + implicit_dependency_1: signature timestamp length + implicit_dependency_2: signature timestamp length + ... + action_signature [action string] + None is printed -in place of any missing timestamp, bsig, or csig +in place of any missing timestamp, build signature ("bsig"), +or content signature ("csig") values for any entry or any of its dependencies. If the entry has no implicit dependencies, or no build action, -the lines are simply omitted. +the lines are simply omitted. +The verbose option expands the display into a more human +readable format. + By default, sconsign @@ -90,7 +97,7 @@ signature entries for more than one directory (that is, was specified by the -SConsignFile () +SConsignFile function). Any file @@ -103,13 +110,21 @@ for a single directory. If neither of those is true, sconsign attempts to guess the format. -If that does not work, +If that does not work, an explicit format may be specified using the or -options. +options. + + +If there are no +file +arguments, the name +.sconsign.dblite +is assumed. + @@ -175,7 +190,7 @@ Legal values are dbm (the DBM format used when the -SConsignFile() +SConsignFile function is used) or sconsign @@ -197,7 +212,7 @@ file in each directory). -i, --implicit Prints the list of cached implicit dependencies -for all entries or the the specified entries. +for all entries or for the specified entries. @@ -206,8 +221,8 @@ for all entries or the the specified entries. Prints a pretty-printed representation of the raw Python dictionary that holds -build information about individual entry -(both the entry itself or its implicit dependencies). +build information about individual entries +(both the entry itself and its implicit dependencies). An entry's build action is still printed in its usual format. @@ -244,7 +259,8 @@ for all entries or the specified entries. SCONS_LIB_DIR Specifies the directory that contains the SCons Python module directory -(e.g. /home/aroach/scons-src-0.01/src/engine). +(e.g. +/home/aroach/scons-src-0.01/src/engine). on the command line. diff --git a/doc/scons.mod b/doc/scons.mod index ea9ad4e..cf46e3b 100644 --- a/doc/scons.mod +++ b/doc/scons.mod @@ -67,6 +67,7 @@ Action"> ActionBase"> +BuildInfo"> CommandAction"> FunctionAction"> ListAction"> diff --git a/doc/user/depends.xml b/doc/user/depends.xml index 35372e7..bb0a142 100644 --- a/doc/user/depends.xml +++ b/doc/user/depends.xml @@ -517,7 +517,7 @@ cc -o hello hello.o Program('hello.c') -def decide_if_changed(dependency, target, prev_ni): +def decide_if_changed(dependency, target, prev_ni, repo_node=None): if dependency.get_timestamp() != prev_ni.timestamp: dep = str(dependency) tgt = str(target) @@ -561,6 +561,13 @@ int main() { printf("Hello, world!\n"); } + + The fourth argument repo_node, + is the &Node; to use if it is not None when comparing &BuildInfo;. + This is typically only set when the target node only exists in a + &Repository; + + @@ -637,7 +644,7 @@ int main() { printf("Hello, world!\n"); } env = Environment() -def config_file_decider(dependency, target, prev_ni): +def config_file_decider(dependency, target, prev_ni, repo_node=None): import os.path # We always have to init the .csig value... diff --git a/doc/user/less-simple.xml b/doc/user/less-simple.xml index 6de1075..e8ff44a 100644 --- a/doc/user/less-simple.xml +++ b/doc/user/less-simple.xml @@ -2,7 +2,7 @@ %scons; - + %builders-mod; @@ -257,7 +257,7 @@ Program('program', Glob('*.c')) (see , below) and repositories (see , below), - excluding some files + excluding some files and returning strings rather than Nodes. @@ -311,7 +311,7 @@ Program('hello', ['hello.c']) - + Although &SCons; functions @@ -359,7 +359,7 @@ Program('program2', common_sources + ['program2.c']) One drawback to the use of a Python list - for source files is that + for source files is that each file name must be enclosed in quotes (either single quotes or double quotes). This can get cumbersome and difficult to read @@ -675,8 +675,10 @@ env.SharedLibrary('word', 'word.cpp', - It is also possible to use the parse_flags keyword argument in an - override: + It is also possible to use the parse_flags + keyword argument in an override to merge command-line + style arguments into the appropriate construction + variables (see &f-link-env-MergeFlags;). @@ -688,7 +690,7 @@ env.SharedLibrary('word', 'word.cpp', -env = Program('hello', 'hello.c', parse_flags = '-Iinclude -DEBUG -lm') +env = Program('hello', 'hello.c', parse_flags='-Iinclude -DEBUG -lm') @@ -701,4 +703,4 @@ env = Program('hello', 'hello.c', parse_flags = '-Iinclude -DEBUG -lm') - \ No newline at end of file + -- cgit v1.2.3