SERVER-62992 Remove need for resmoke.ini

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 5826be827f4..c755e12b469 100644
--- a/site_scons/site_tools/ninja.py
+++ b/site_scons/site_tools/ninja.py
@@ -660,6 +660,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.