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-msvc.bat | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

(limited to 'build-msvc.bat')

diff --git a/build-msvc.bat b/build-msvc.bat
index 26488c1..48e55d8 100644
--- a/build-msvc.bat
+++ b/build-msvc.bat
@@ -40,7 +40,7 @@ rem set "BUILD2_REPO=https://pkg.cppget.org/1/queue"
 rem set "BUILD2_REPO=https://pkg.cppget.org/1/alpha"
 )
 
-rem Bpkg configuration directory.
+rem The bpkg configuration directory.
 rem
 set "cver=0.7-a.0"
 set "cdir=build2-toolchain-%cver%"
@@ -207,7 +207,7 @@ move /y build2\b.exe build2\b-boot.exe
 build2\b-boot --version
 @if errorlevel 1 goto error
 
-@rem Build and stage the toolchain.
+@rem Build and stage the build system and the package manager.
 @rem
 cd ..
 
@@ -218,7 +218,7 @@ build2\build2\b-boot %verbose% configure^
  config.install.data_root=root\stage
 @if errorlevel 1 goto error
 
-build2\build2\b-boot %verbose% install
+build2\build2\b-boot %verbose% install: build2\ bpkg\
 @if errorlevel 1 goto error
 
 where b-stage
@@ -233,7 +233,7 @@ b-stage --version
 bpkg-stage --version
 @if errorlevel 1 goto error
 
-@rem Rebuild via package manager.
+@rem Build the entire toolchain from packages.
 @rem
 cd ..
 
@@ -259,10 +259,10 @@ bpkg-stage %verbose% add %BUILD2_REPO%
 bpkg-stage %verbose% fetch %timeout% %trust%
 @if errorlevel 1 goto error
 
-bpkg-stage %verbose% build %timeout% --for install --yes build2 bpkg
+bpkg-stage %verbose% build %timeout% --for install --yes build2 bpkg bdep
 @if errorlevel 1 goto error
 
-bpkg-stage %verbose% install build2 bpkg
+bpkg-stage %verbose% install build2 bpkg bdep
 @if errorlevel 1 goto error
 
 where b
@@ -271,16 +271,22 @@ where b
 where bpkg
 @if errorlevel 1 goto error
 
+where bdep
+@if errorlevel 1 goto error
+
 b --version
 @if errorlevel 1 goto error
 
 bpkg --version
 @if errorlevel 1 goto error
 
+bdep --version
+@if errorlevel 1 goto error
+
 @rem Clean up stage.
 @rem
 cd %owd%
-b %verbose% uninstall
+b %verbose% uninstall: build2/ bpkg/
 @if errorlevel 1 goto error
 
 @echo off
-- 
cgit v1.1