From ecaa97dbf0b3c4d4b19efd23716d851b0e7a0e85 Mon Sep 17 00:00:00 2001 From: Steven Knight Date: Mon, 2 Aug 2010 13:21:04 +0000 Subject: Fix formatting in some new function definitions: make some overlooked terms , and rearrange tags so the regular expression substitution in bin/scons-proc.py match them. --- src/engine/SCons/Environment.xml | 50 ++++++--- src/engine/SCons/Script/Main.xml | 234 ++++++++++++++++++++++++++------------- 2 files changed, 188 insertions(+), 96 deletions(-) diff --git a/src/engine/SCons/Environment.xml b/src/engine/SCons/Environment.xml index b2be10d..601cc56 100644 --- a/src/engine/SCons/Environment.xml +++ b/src/engine/SCons/Environment.xml @@ -907,8 +907,9 @@ to be performed: -timestamp-newer - +timestamp-newer + + Specifies that a target shall be considered out of date and rebuilt if the dependency's timestamp is newer than the target file's timestamp. This is the behavior of the classic Make utility, @@ -916,11 +917,13 @@ and make can be used a synonym for timestamp-newer. - + + -timestamp-match - +timestamp-match + + Specifies that a target shall be considered out of date and rebuilt if the dependency's timestamp is different than the timestamp recorded the last time the target was built. @@ -931,11 +934,13 @@ except that the target will also be rebuilt if a dependency file has been restored to a version with an earlier timestamp, such as can happen when restoring files from backup archives. - + + -MD5 - +MD5 + + Specifies that a target shall be considered out of date and rebuilt if the dependency's content has changed sine the last time the target was built, @@ -946,11 +951,13 @@ last time the target was built. content can be used as a synonym for MD5. - + + -MD5-timestamp - +MD5-timestamp + + Specifies that a target shall be considered out of date and rebuilt if the dependency's content has changed sine the last time the target was built, @@ -974,7 +981,8 @@ that runs a build, updates a file, and runs the build again, all within a single second. - + + @@ -998,7 +1006,8 @@ that takes the following three arguments: dependency - + + The Node (file) which should cause the target @@ -1006,22 +1015,26 @@ to be rebuilt if it has "changed" since the last tme target was built. - + + target - + + The Node (file) being built. In the normal case, this is what should get rebuilt if the dependency has "changed." - + + prev_ni - + + Stored information about the state of the dependency the last time the @@ -1031,7 +1044,8 @@ This can be consulted to match various file characteristics such as the timestamp, size, or content signature. - + + diff --git a/src/engine/SCons/Script/Main.xml b/src/engine/SCons/Script/Main.xml index 0380755..d4931f1 100644 --- a/src/engine/SCons/Script/Main.xml +++ b/src/engine/SCons/Script/Main.xml @@ -229,183 +229,243 @@ The options supported are: cache_debug - + + which corresponds to --cache-debug; - + + cache_disable - + + which corresponds to --cache-disable; - + + cache_force - + + which corresponds to --cache-force; - + + cache_show - + + which corresponds to --cache-show; - + + clean - + + which corresponds to -c, --clean and --remove; - + + config - + + which corresponds to --config; - + + directory - + + which corresponds to -C and --directory; - + + diskcheck - + + which corresponds to --diskcheck - + + duplicate - + + which corresponds to --duplicate; - + + file - + + which corresponds to -f, --file, --makefile and --sconstruct; - + + help - + + which corresponds to -h and --help; - + + ignore_errors - + + which corresponds to --ignore-errors; - + + implicit_cache - + + which corresponds to --implicit-cache; - + + implicit_deps_changed - + + which corresponds to --implicit-deps-changed; - + + implicit_deps_unchanged - + + which corresponds to --implicit-deps-unchanged; - + + interactive - + + which corresponds to --interact and --interactive; - + + keep_going - + + which corresponds to -k and --keep-going; - + + max_drift - + + which corresponds to --max-drift; - + + no_exec - + + which corresponds to -n, --no-exec, --just-print, --dry-run and --recon; - + + no_site_dir - + + which corresponds to --no-site-dir; - + + num_jobs - + + which corresponds to -j and --jobs; - + + profile_file - + + which corresponds to --profile; - + + question - + + which corresponds to -q and --question; - + + random - + + which corresponds to --random; - + + repository - + + which corresponds to -Y, --repository and --srcdir; - + + silent - + + which corresponds to -s, --silent and --quiet; - + + site_dir - + + which corresponds to --site-dir; - + + stack_size - + + which corresponds to --stack-size; - + + taskmastertrace_file - + + which corresponds to --taskmastertrace; and - + + warn - + + which corresponds to --warn and --warning. - + + @@ -565,57 +625,75 @@ line options from a SConscript file. The options supported are: clean - + + which corresponds to -c, --clean and --remove; - + + duplicate - + + which corresponds to --duplicate; - + + help - + + which corresponds to -h and --help; - + + implicit_cache - + + which corresponds to --implicit-cache; - + + max_drift - + + which corresponds to --max-drift; - + + no_exec - + + which corresponds to -n, --no-exec, --just-print, --dry-run and --recon; - + + num_jobs - + + which corresponds to -j and --jobs; - + + random - + + which corresponds to --random; and - + + stack_size - + + which corresponds to --stack-size. - + + -- cgit v0.12