aboutsummaryrefslogtreecommitdiff
path: root/build2/dist
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2019-03-07 09:06:37 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2019-03-07 09:06:37 +0200
commit1845141809aa91b03718066a6f46863885a6a887 (patch)
treea3f542ec7c1781e65aa16a9b0d5c31eae4c4d757 /build2/dist
parente0002617846755fb5f199f40a677e16d6f69e5ec (diff)
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).
Diffstat (limited to 'build2/dist')
-rw-r--r--build2/dist/operation.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/build2/dist/operation.cxx b/build2/dist/operation.cxx
index 75a5793..b227bbd 100644
--- a/build2/dist/operation.cxx
+++ b/build2/dist/operation.cxx
@@ -220,7 +220,7 @@ namespace build2
}
};
- add_adhoc (*rs, export_file);
+ add_adhoc (*rs, rs->root_extra->export_file);
// The same for subprojects that have been loaded.
//
@@ -238,7 +238,7 @@ namespace build2
if (!nrs.src_path ().sub (src_root)) // Not a strong amalgamation.
continue;
- add_adhoc (nrs, export_file);
+ add_adhoc (nrs, nrs.root_extra->export_file);
}
}