summaryrefslogtreecommitdiff
path: root/site_scons
diff options
context:
space:
mode:
authorRichard Samuels <richard.l.samuels@gmail.com>2022-03-30 14:04:37 -0400
committerEvergreen Agent <no-reply@evergreen.mongodb.com>2022-03-30 18:38:31 +0000
commit2ab888c8fe45f88ce9509a3690e083ad5f35e418 (patch)
tree45ee0276f67a265d16be045ce351550b0fbeb2be /site_scons
parentf9bbbfb86db15ac7e4111890447dc46caf5fe4b4 (diff)
downloadmongo-2ab888c8fe45f88ce9509a3690e083ad5f35e418.tar.gz
Revert "SERVER-62992 Remove need for resmoke.ini"
This reverts commit d4206bdeb19f4c5862280c04cd6b831c9ec03a40.
Diffstat (limited to 'site_scons')
-rw-r--r--site_scons/site_tools/auto_archive.py9
-rw-r--r--site_scons/site_tools/ninja.py1
2 files changed, 1 insertions, 9 deletions
diff --git a/site_scons/site_tools/auto_archive.py b/site_scons/site_tools/auto_archive.py
index b3c9ddd99a4..f4c7201b33e 100644
--- a/site_scons/site_tools/auto_archive.py
+++ b/site_scons/site_tools/auto_archive.py
@@ -133,14 +133,7 @@ def collect_transitive_files(env, entry):
# anyway.
stack.extend(env.GetTransitivelyInstalledFiles(s))
- # 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))
+ return sorted(files)
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 c755e12b469..5826be827f4 100644
--- a/site_scons/site_tools/ninja.py
+++ b/site_scons/site_tools/ninja.py
@@ -660,7 +660,6 @@ 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.