diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2017-11-29 17:44:48 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2017-11-29 17:44:48 +0200 |
| commit | 074a8c04a384a9752466bd2af69b695333b2955c (patch) | |
| tree | 707454105647db7886268551ffc661a359e4637c /build2/file.hxx | |
| parent | f588f2e5a62d7621d20b2a567b8835bb87ff31f4 (diff) | |
Reimplement module sidebuilding using an ad hoc subproject
Diffstat (limited to 'build2/file.hxx')
| -rw-r--r-- | build2/file.hxx | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/build2/file.hxx b/build2/file.hxx index c394818..d946c88 100644 --- a/build2/file.hxx +++ b/build2/file.hxx @@ -72,7 +72,7 @@ namespace build2 // passed src_root value is not empty. The scope argument is only used // as proof of lock. // - scope& + scope_map::iterator create_root (scope&, const dir_path& out_root, const dir_path& src_root); // Setup root scope. Note that it assume the src_root variable @@ -90,12 +90,27 @@ namespace build2 // Return a scope for the specified directory (first). Note that switching // to this scope might also involve switch to a new root scope (second) if - // the new scope is in another project. In the new scope is not in any + // the new scope is in another project. If the new scope is not in any // project, then NULL is returned in second. // pair<scope&, scope*> switch_scope (scope& root, const dir_path&); + // Bootstrap and optionally load an ad hoc (sub)project (i.e., the kind that + // is not discovered and loaded automatically by bootstrap/load functions + // above). + // + // Note that we expect the outer project (if any) to be bootstrapped and + // loaded and currently we do not add the newly loaded subproject to the + // outer project's subprojects map. + // + // The scope argument is only used as proof of lock. + // + scope& + load_project (scope&, + const dir_path& out_root, const dir_path& src_root, + bool load = true); + // Bootstrap the project's root scope, the out part. // void |