From eab11881cfeb1133b755233fdb41632e45e98775 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Sat, 14 Apr 2018 13:42:53 +0200
Subject: Add bdep submodule

---
 build.sh | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

(limited to 'build.sh')

diff --git a/build.sh b/build.sh
index b451c7a..bcb851d 100755
--- a/build.sh
+++ b/build.sh
@@ -14,7 +14,7 @@ if test -z "$BUILD2_REPO"; then
 # BUILD2_REPO="https://pkg.cppget.org/1/alpha"
 fi
 
-# Bpkg configuration directory.
+# The bpkg configuration directory.
 #
 cver="0.7-a.0"
 cdir="build2-toolchain-$cver"
@@ -248,7 +248,7 @@ run build2/b-boot $verbose config.cxx="$cxx" config.bin.lib=static build2/exe{b}
 mv build2/b build2/b-boot
 run build2/b-boot --version
 
-# Stage.
+# Build and stage the build system and the package manager.
 #
 run cd ..
 
@@ -260,7 +260,7 @@ config.install.root="$idir" \
 config.install.data_root=root/stage \
 config.install.sudo="$conf_sudo"
 
-run build2/build2/b-boot $verbose install
+run build2/build2/b-boot $verbose install: build2/ bpkg/
 
 run which b-stage
 run which bpkg-stage
@@ -268,7 +268,7 @@ run which bpkg-stage
 run b-stage --version
 run bpkg-stage --version
 
-# Install.
+# Build the entire toolchain from packages.
 #
 run cd ..
 run mkdir "$cdir"
@@ -285,19 +285,21 @@ config.install.sudo="$conf_sudo"
 
 run bpkg-stage $verbose add "$BUILD2_REPO"
 run bpkg-stage $verbose $bpkg_fetch_ops fetch
-run bpkg-stage $verbose $bpkg_build_ops build --for install --yes build2 bpkg
-run bpkg-stage $verbose install build2 bpkg
+run bpkg-stage $verbose $bpkg_build_ops build --for install --yes build2 bpkg bdep
+run bpkg-stage $verbose install build2 bpkg bdep
 
 run which b
 run which bpkg
+run which bdep
 
 run b --version
 run bpkg --version
+run bdep --version
 
-# Clean up.
+# Clean up stage.
 #
 run cd "$owd"
-run b $verbose uninstall
+run b $verbose uninstall: build2/ bpkg/
 
 diag
 diag "Toolchain installation: $idir/bin"
-- 
cgit v1.1