aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--build/bootstrap.build9
-rw-r--r--buildfile3
2 files changed, 10 insertions, 2 deletions
diff --git a/build/bootstrap.build b/build/bootstrap.build
index 7d4dccc..183578f 100644
--- a/build/bootstrap.build
+++ b/build/bootstrap.build
@@ -2,8 +2,15 @@
# license : MIT; see accompanying LICENSE file
project = build2-toolchain
+
amalgamation = # Disable amalgamation.
-subprojects = {*/ -build/ -doc/ -tests/ -submodules/}
+
+# Note: list them (mostly) explicitly without using wildcards to handle stray
+# subdirectories in the root (debian/, installation location, etc).
+#
+subprojects += libpkg-config/ libbutl/ build2/ libsqlite3/ libodb/ \
+ libodb-sqlite/ libbpkg/ bpkg/ bdep/
+subprojects += libbuild2-*/
subprojects += tests/*/
using version
diff --git a/buildfile b/buildfile
index 64a6333..2f6d247 100644
--- a/buildfile
+++ b/buildfile
@@ -19,7 +19,7 @@ build2_repo="https://stage.build2.org/1"
# @@ Note that the project directories order is important (prerequisites go
# first).
#
-# See also subprojects in bootstrap.build.
+# NOTE: see also subprojects in bootstrap.build if changing anything here.
#
d = libpkg-config/ libbutl/ build2/ libsqlite3/ libodb/ libodb-sqlite/ \
libbpkg/ bpkg/ bdep/ doc/ libbuild2-*/
@@ -53,6 +53,7 @@ pt = '^version: (.+)$'
# modules to locate all the places):
#
# - this buildfile
+# - build/bootstrap.build (submodules; should be handled automatically)
# - build scripts: build.sh.in and build-*.bat.in
# - documentation: BOOTSTRAP-*.cli and UPGRADE.cli (multiple places)
# - install scripts: prepare, build2-install.sh, and build2-install-*.bat