Add support for alternative build file/directory naming scheme

Now the build/*.build, buildfile, and .buildignore filesystem entries in
a project can alternatively (but consistently) be called build2/*.build2,
build2file, and .build2ignore. See a note at the beginning of the Project
Structure section in the manual for details (motivation, restrictions,
etc).

1 files changed, 6 insertions, 4 deletions

diff --git a/build2/config/utility.cxx b/build2/config/utility.cxx
index 2fee5f7..d2e8699 100644
--- a/build2/config/utility.cxx
+++ b/build2/config/utility.cxx
@@ -183,12 +183,14 @@ namespace build2
 
       // Create the build/ subdirectory.
       //
-      mkdir (d / build_dir, verbosity);
+      // Note that for now we use the standard build file/directory scheme.
+      //
+      mkdir (d / std_build_dir, verbosity);
 
       // Write build/bootstrap.build.
       //
       {
-        path f (d / bootstrap_file);
+        path f (d / std_bootstrap_file);
 
         if (verb >= verbosity)
           text << (verb >= 2 ? "cat >" : "save ") << f;
@@ -232,7 +234,7 @@ namespace build2
       // Write build/root.build.
       //
       {
-        path f (d / root_file);
+        path f (d / std_root_file);
 
         if (verb >= verbosity)
           text << (verb >= 2 ? "cat >" : "save ") << f;
@@ -281,7 +283,7 @@ namespace build2
       //
       if (buildfile)
       {
-        path f (d / buildfile_file);
+        path f (d / std_buildfile_file);
 
         if (verb >= verbosity)
           text << (verb >= 2 ? "cat >" : "save ") << f;