diff options
author | Richard Samuels <richard.l.samuels@gmail.com> | 2022-04-21 13:19:59 +0000 |
---|---|---|
committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2022-04-21 13:45:41 +0000 |
commit | f517542b0aff150da32a795b5d9dc6a7fb0f54b9 (patch) | |
tree | 68aa48d9c1451fa2e67d388a76b24926f4f84c71 /site_scons | |
parent | d001194fb86b590f73a7171c7cb6a317a93a2300 (diff) | |
download | mongo-f517542b0aff150da32a795b5d9dc6a7fb0f54b9.tar.gz |
SERVER-62992 Remove need for resmoke.ini (v5.0)
Diffstat (limited to 'site_scons')
-rw-r--r-- | site_scons/site_tools/auto_archive.py | 9 | ||||
-rw-r--r-- | site_scons/site_tools/ninja.py | 1 |
2 files changed, 9 insertions, 1 deletions
diff --git a/site_scons/site_tools/auto_archive.py b/site_scons/site_tools/auto_archive.py index f4c7201b33e..b3c9ddd99a4 100644 --- a/site_scons/site_tools/auto_archive.py +++ b/site_scons/site_tools/auto_archive.py @@ -133,7 +133,14 @@ def collect_transitive_files(env, entry): # anyway. stack.extend(env.GetTransitivelyInstalledFiles(s)) - return sorted(files) + # Setting the AIB_NO_ARCHIVE attribute to True prevents outputs from an + # AutoInstall builder from being included into archives produced by this + # tool + # Usage: + # node = env.AutoInstall(...) + # setattr(node[0].attributes, 'AIB_NO_ARCHIVE', True) + # TODO SERVER-61013 Update documentation once AutoInstall is a real builder + return sorted(f for f in files if not getattr(f.attributes, 'AIB_NO_ARCHIVE', False)) def auto_archive_gen(first_env, make_archive_script, pkg_fmt): diff --git a/site_scons/site_tools/ninja.py b/site_scons/site_tools/ninja.py index 28140682ab0..ba69b33bd2f 100644 --- a/site_scons/site_tools/ninja.py +++ b/site_scons/site_tools/ninja.py @@ -653,6 +653,7 @@ class NinjaState: kwargs['pool'] = 'local_pool' ninja.rule(rule, **kwargs) + # TODO SERVER-64664 generated_source_files = sorted({ output # First find builds which have header files in their outputs. |