Redesign src/out scoping

We no longer enter paths from the src tree into scope map. Instead, targets
from the src tree now include their out tree directory (in essence their
"configuration"). This is then used to find a target's scope. See the
comment in class target for details.

The result of this change is that we can now again build multiple
configurations (out trees) for same project at once.

1 files changed, 7 insertions, 1 deletions

diff --git a/build2/b.cxx b/build2/b.cxx
index 7ebbab1..dcf2cfe 100644
--- a/build2/b.cxx
+++ b/build2/b.cxx
@@ -876,7 +876,13 @@ main (int argc, char* argv[])
 
             d.normalize ();
 
-            mif->search (rs, target_key {ti, &d, &tn.value, e}, l, tgs);
+            // Figure out if this target is in the src tree.
+            //
+            dir_path out (ts.out_base != ts.src_base && d.sub (ts.src_base)
+                          ? out_src (d, ts.out_base, ts.src_base)
+                          : dir_path ());
+
+            mif->search (rs, target_key {ti, &d, &out, &tn.value, e}, l, tgs);
           }
         }