diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2020-06-09 12:50:18 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2020-06-09 12:50:18 +0200 |
| commit | 782c437c634dc3c54384e4c3bbcb31ef54910f90 (patch) | |
| tree | 8a1088682eded0db71c9e11535a296c478f49bf2 /libbuild2/file.cxx | |
| parent | b256e5ce05c045e6d536c728776342a5c45c5995 (diff) | |
Move recipe build directory to build/build/recipes/
Our new scheme is to have any "out" content in a subdirectory called build/
(build/build/ for the build system core, build/<module>/build/ for modules).
This way we can ignore them in .gitignore with a generic entry.
Diffstat (limited to 'libbuild2/file.cxx')
| -rw-r--r-- | libbuild2/file.cxx | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/libbuild2/file.cxx b/libbuild2/file.cxx index e376ab9..f7073e6 100644 --- a/libbuild2/file.cxx +++ b/libbuild2/file.cxx @@ -30,9 +30,10 @@ namespace build2 // build: - const dir_path std_build_dir ("build"); - const dir_path std_root_dir (dir_path (std_build_dir) /= "root"); - const dir_path std_bootstrap_dir (dir_path (std_build_dir) /= "bootstrap"); + const dir_path std_build_dir ("build"); + const dir_path std_root_dir (dir_path (std_build_dir) /= "root"); + const dir_path std_bootstrap_dir (dir_path (std_build_dir) /= "bootstrap"); + const dir_path std_build_build_dir (dir_path (std_build_dir) /= "build"); const path std_root_file (std_build_dir / "root.build"); const path std_bootstrap_file (std_build_dir / "bootstrap.build"); @@ -46,9 +47,10 @@ namespace build2 // build2: - const dir_path alt_build_dir ("build2"); - const dir_path alt_root_dir (dir_path (alt_build_dir) /= "root"); - const dir_path alt_bootstrap_dir (dir_path (alt_build_dir) /= "bootstrap"); + const dir_path alt_build_dir ("build2"); + const dir_path alt_root_dir (dir_path (alt_build_dir) /= "root"); + const dir_path alt_bootstrap_dir (dir_path (alt_build_dir) /= "bootstrap"); + const dir_path alt_build_build_dir (dir_path (alt_build_dir) /= "build"); const path alt_root_file (alt_build_dir / "root.build2"); const path alt_bootstrap_file (alt_build_dir / "bootstrap.build2"); @@ -503,6 +505,7 @@ namespace build2 a ? alt_buildignore_file : std_buildignore_file, a ? alt_root_dir : std_root_dir, a ? alt_bootstrap_dir : std_bootstrap_dir, + a ? alt_build_build_dir : std_build_build_dir, a ? alt_bootstrap_file : std_bootstrap_file, a ? alt_root_file : std_root_file, a ? alt_export_file : std_export_file, |