Script updates for new single configuration toolchain dev setup

1 files changed, 7 insertions, 3 deletions

diff --git a/stage b/stage
index e8278c7..411b6ba 100755
--- a/stage
+++ b/stage
@@ -33,10 +33,14 @@ bpkg --version >/dev/null
 bdep --version >/dev/null
 
 # Make sure the build system if up to date (otherwise update will be triggered
-# by libbuild2-* module distribution).
+# by libbuild2-* module distribution). Also make sure the package manager is
+# up to date since it depend on libbuild2. Update project manager for good
+# measure.
 #
-b build2/build2/
-b --version >/dev/null
+b build2/build2/ bpkg/bpkg/ bdep/bdep/
+b    --version >/dev/null
+bpkg --version >/dev/null
+bdep --version >/dev/null
 
 v="$(sed -n -re 's/^version: ([^.]+\.[^.]+\.[^-]+(-[ab]\.[^.+]+)?).*$/\1/p' build2-toolchain/manifest)"
 vf="$(echo $v | sed -re 's/^([^.]*)\.([^.]*)\.([^-]*).*$/\1.\2.\3/')" # Final.