From abb2bda6a183524bef5bd9bfe08d526763a73e62 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Wed, 20 Mar 2019 17:03:10 +0200
Subject: Updates for 0.10.0 release

---
 doc/release.cli  |  25 +++--
 intro2-tldr.orig |  37 +++----
 intro2-tour.orig | 327 ++++++++++++++++++++++++++++---------------------------
 stage            |   2 -
 version          |  12 +-
 5 files changed, 202 insertions(+), 201 deletions(-)

diff --git a/doc/release.cli b/doc/release.cli
index 386456a..a9ca45a 100644
--- a/doc/release.cli
+++ b/doc/release.cli
@@ -55,13 +55,13 @@ distribution from \c{etc/stage} and add the pre-distributed packages
   Review \c{@@} notes:
 
   \
-  ./review.sh | less -R
+  etc/review | less -R
   \
 
   At least look for \c{@@\ TMP}
 
   \
-  ./review.sh | grep TMP
+  etc/review.sh | grep TMP
   \
 
 \h#review-db|Review database schema changes|
@@ -226,12 +226,6 @@ distribution from \c{etc/stage} and add the pre-distributed packages
 
   Review \c{staging/0/} and \c{staging/repository/1/} for anything stray.
 
-  Update all submodules in \c{build2-toolchain}:
-
-  \
-  git submodule update --remote --checkout
-  \
-
   Restage with \c{baseutils}/\c{mingw} regeneration:
 
   \
@@ -302,6 +296,9 @@ distribution from \c{etc/stage} and add the pre-distributed packages
 
     \li|Change \c{BUILD2_STAGE} in \c{build2/build2/config.hxx.in} to \c{false}.|
 
+    \li|If necessary, update minimum \c{build2} and \c{bpkg} version
+        requirements in projects generated by \c{bdep-new}.|
+
     \li|Change version by updating (including with new modules) and then
         executing:
 
@@ -390,7 +387,7 @@ distribution from \c{etc/stage} and add the pre-distributed packages
         \c{build2-toolchain} itself.|
 
     \li|Update ODB by copying relevant files from the previous step (trust
-        me, this is the easy way).|
+        me, this is the easy way). Make sure all \c{*-odb.*} are copied!|
 
     \li|Change \c{BUILD2_REPO} in \c{build2-toolchain} build scripts to
     \c{queue}.||
@@ -411,6 +408,7 @@ distribution from \c{etc/stage} and add the pre-distributed packages
 
    Sort non-alpha packages from \c{cppget.org/queue/1/alpha/} into appropriate
    sections (we could probably automate this similar to \c{bdep-release(1)}).
+   Also check if any of them are already in \c{public}.
 
    Note also that we assume all the packages already have the corresponding
    ownership information either in \c{queue} or \c{public}. However, if any
@@ -466,6 +464,10 @@ distribution from \c{etc/stage} and add the pre-distributed packages
   Update \c{queue} \c{buildtab} based on the \c{stage} CI \c{buildtab}
   (normally just a copy sans the sanitized toolchain configurations).
 
+  \N|Note that the \c{queue} \c{buildtab} is shared between \c{public} and
+     \c{queue} builds. As a result, after this update, \c{public} build hosts
+     may not have some of the new (or renamed) build machines.|
+
   Adjust \c{stage} and \c{devel} build host configurations to enable the
   \c{queue} toolchain. Shift most instances from \c{stage} to \c{queue}
   in the hardware class-specific configurations. Regenerate affected
@@ -511,7 +513,8 @@ distribution from \c{etc/stage} and add the pre-distributed packages
   Update \c{public} \c{buildtab}s based on the \c{queue} \c{buildtab}
   (normally just a copy).
 
-  Adjust build host configurations and add/remove new/old machines.
+  Adjust build host configurations (hardware classes, etc) and add/remove
+  new/old build hosts.
 
   Replace the \c{public} \c{buildos} image on \c{build-cache} with the
   one for \c{stage}.
@@ -528,7 +531,7 @@ distribution from \c{etc/stage} and add the pre-distributed packages
 
   ./ls-machines -c public
 
-  ~/work/buildos/remove-machine <host> <machine>
+  ~/work/build2/buildos/remove-machine <host> <machine>
   \
 
   Also review deployed machines against the latest available versions and
diff --git a/intro2-tldr.orig b/intro2-tldr.orig
index b372340..c1edefb 100644
--- a/intro2-tldr.orig
+++ b/intro2-tldr.orig
@@ -1,6 +1,6 @@
 created new executable project hello in /tmp/hello.git/
-[master (root-commit) 0bd99a9] first commit
- 11 files changed, 99 insertions(+)
+[master (root-commit) 241bb46] first commit
+ 11 files changed, 100 insertions(+)
  create mode 100644 .gitignore
  create mode 100644 build/.gitignore
  create mode 100644 build/bootstrap.build
@@ -53,20 +53,19 @@ fetching git:build2.org/hello/libhello#v1.0.0 (prerequisite of dir:/tmp/hello)
 querying https://git.build2.org/hello/libhello.git
 fetching from https://git.build2.org/hello/libhello.git
 synchronizing /tmp/hello-gcc/:
-  new libhello/1.0.0+1 (required by hello)
+  new libhello/1.0.0+2 (required by hello)
   upgrade hello/0.1.0#1
-distributing libhello/1.0.0+1
-version.in ../hello-gcc/libhello-1.0.0+1/libhello/version.hxx.in
-c++ ../hello-gcc/libhello-1.0.0+1/libhello/cxx{hello}
+distributing libhello/1.0.0+2
+version.in ../hello-gcc/libhello-1.0.0+2/libhello/version.hxx.in
+c++ ../hello-gcc/libhello-1.0.0+2/libhello/cxx{hello}
 c++ hello/cxx{hello}@../hello-gcc/hello/hello/
-ld ../hello-gcc/libhello-1.0.0+1/libhello/libs{hello}
+ld ../hello-gcc/libhello-1.0.0+2/libhello/libs{hello}
 ld ../hello-gcc/hello/hello/exe{hello}
 ln ../hello-gcc/hello/hello/exe{hello} -> hello/
 
 + bdep fetch
 fetching git:build2.org/hello/libhello (prerequisite of dir:/tmp/hello)
 querying https://git.build2.org/hello/libhello.git
-fetching from https://git.build2.org/hello/libhello.git
 fetching git:build2.org/hello/libformat##HEAD (prerequisite of git:build2.org/hello/libhello)
 querying https://git.build2.org/hello/libformat.git
 fetching from https://git.build2.org/hello/libformat.git
@@ -76,22 +75,22 @@ fetching from https://git.build2.org/hello/libprint.git
 
 + bdep status -i
 hello configured 0.1.0#1
-  libhello ^1.0.0 configured 1.0.0+1 available [1.1.0+1]
+  libhello ^1.0.0 configured 1.0.0+2 available [1.1.0+2]
 
 + bdep sync libhello
 synchronizing:
-  new libformat/1.0.0+1 (required by libhello)
-  new libprint/1.0.0+1 (required by libhello)
-  upgrade libhello/1.1.0+1
+  new libformat/1.0.0+2 (required by libhello)
+  new libprint/1.0.0+2 (required by libhello)
+  upgrade libhello/1.1.0+2
   reconfigure hello/0.1.0#1
-distributing libformat/1.0.0+1
-distributing libprint/1.0.0+1
-distributing libhello/1.1.0+1
+distributing libformat/1.0.0+2
+distributing libprint/1.0.0+2
+distributing libhello/1.1.0+2
 
 + bdep sync libhello/1.0.0
 synchronizing:
-  drop libprint/1.0.0+1 (unused)
-  drop libformat/1.0.0+1 (unused)
-  downgrade libhello/1.0.0+1
+  drop libprint/1.0.0+2 (unused)
+  drop libformat/1.0.0+2 (unused)
+  downgrade libhello/1.0.0+2
   reconfigure hello/0.1.0#1
-distributing libhello/1.0.0+1
+distributing libhello/1.0.0+2
diff --git a/intro2-tour.orig b/intro2-tour.orig
index 7ba51c6..deb4ff1 100644
--- a/intro2-tour.orig
+++ b/intro2-tour.orig
@@ -62,8 +62,8 @@ summary: hello executable
 license: TODO
 url: https://example.org/hello
 email: boris@codesynthesis.com
-depends: * build2 >= 0.8.0-
-depends: * bpkg >= 0.8.0-
+depends: * build2 >= 0.9.0-
+depends: * bpkg >= 0.9.0-
 #depends: libhello ^1.0.0
 
 + bdep init -C ../hello-gcc @gcc cc config.cxx=g++
@@ -78,10 +78,11 @@ created configuration @clang /tmp/hello-clang/ 2 auto-synchronized
 synchronizing:
   new hello/0.1.0-a.0.19700101000000
 
-+ ls -d -1 ../hello ../hello-clang ../hello-gcc
++ ls -d -1 ../hello ../hello-clang ../hello-gcc ../hello.git
 ../hello
 ../hello-clang
 ../hello-gcc
+../hello.git
 
 + bdep init -C ../hello-vc-debug @debug cc config.cxx=cl-15 config.cc.coptions=/MDd /Z7 config.cc.loptions=/DEBUG
 initializing in project /tmp/hello/
@@ -182,8 +183,8 @@ Hello, Windows!
 + git add .
 
 + git commit -m Initial implementation
-[master (root-commit) e079761] Initial implementation
- 11 files changed, 99 insertions(+)
+[master (root-commit) 89f4b5e] Initial implementation
+ 11 files changed, 100 insertions(+)
  create mode 100644 .gitignore
  create mode 100644 build/.gitignore
  create mode 100644 build/bootstrap.build
@@ -200,20 +201,20 @@ Hello, Windows!
 
 + git push origin master -u --force
 To github.com:boris-kolpackov/hello.git
- + 1bcc569...e079761 master -> master (forced update)
+ + fea34a6...89f4b5e master -> master (forced update)
 Branch 'master' set up to track remote branch 'master' from 'origin'.
 
 + bdep ci --simulate success
 submitting:
   to:      https://ci.stage.build2.org
-  in:      https://github.com/boris-kolpackov/hello.git#master@e0797612bb402ce0fb69e748c588b44dc78a24f2
+  in:      https://github.com/boris-kolpackov/hello.git#master@89f4b5e1a0b610a5e4f2bc452ac2e3481de8c39b
   package: hello
-  version: 0.1.0-a.0.20190213073259.e0797612bb40
+  version: 0.1.0-a.0.20190318111903.89f4b5e1a0b6
 continue? [y/n]   % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
                                  Dload  Upload   Total   Spent    Left  Speed
-
  0     0    0     0    0     0      0      0 --:--:-- --:--:-- --:--:--     0
  0     0    0     0    0     0      0      0 --:--:-- --:--:-- --:--:--     0
  0   480    0     0    0     0      0      0 --:--:--  0:00:01 --:--:--     0
100   643  100   163  100   480     76    225  0:00:02  0:00:02 --:--:--   225
-CI request is queued: https://ci.stage.build2.org/@f90898a9-dfc0-4444-ad32-71ede41d7801
-reference: f90898a9-dfc0-4444-ad32-71ede41d7801
+
  0     0    0     0    0     0      0      0 --:--:-- --:--:-- --:--:--     0
  0     0    0     0    0     0      0      0 --:--:-- --:--:-- --:--:--     0
  0     0    0     0    0     0      0      0 --:--:--  0:00:01 --:--:--     0
100   643  100   163  100   480     77    229  0:00:02  0:00:02 --:--:--   229
+CI request is queued: https://ci.stage.build2.org/@23649619-d204-44f4-8ddd-e4072a78a12d
+reference: 23649619-d204-44f4-8ddd-e4072a78a12d
 
 + bdep deinit @gcc @clang
 deinitializing in project /tmp/hello/
@@ -244,8 +245,8 @@ git:build2.org/hello/libhello https://git.build2.org/hello/libhello.git
 prerequisite git:build2.org/hello/libprint##HEAD https://git.build2.org/hello/libprint.git##HEAD
 prerequisite git:build2.org/hello/libformat##HEAD https://git.build2.org/hello/libformat.git##HEAD
 
-libhello/1.0.0+1
-libhello/1.1.0+1
+libhello/1.1.0+2
+libhello/1.0.0+2
 
 + bpkg rep-info https://git.build2.org/hello/libhello.git#HEAD
 querying https://git.build2.org/hello/libhello.git
@@ -254,7 +255,7 @@ git:build2.org/hello/libhello#HEAD https://git.build2.org/hello/libhello.git#HEA
 prerequisite git:build2.org/hello/libprint##HEAD https://git.build2.org/hello/libprint.git##HEAD
 prerequisite git:build2.org/hello/libformat##HEAD https://git.build2.org/hello/libformat.git##HEAD
 
-libhello/1.1.0+1
+libhello/1.1.0+2
 
 + bdep status
 fetching pkg:stage.build2.org (prerequisite of dir:/tmp/hello)
@@ -266,25 +267,25 @@ trust this certificate? [y/n] hello configured 0.1.0-a.0.19700101000000 availabl
 
 + bdep sync
 synchronizing:
-  new libhello/1.0.0+1 (required by hello)
+  new libhello/1.0.0+2 (required by hello)
   upgrade hello/0.1.0-a.0.19700101000000#1
 
-     0K ...                                                   100%  143M=0s
+     0K ...                                                   100%  123M=0s
 + b
 synchronizing /tmp/hello-gcc/:
   upgrade hello/0.1.0-a.0.19700101000000#2
 mkdir ../hello-gcc/hello/fsdir{hello/}
-version.in ../hello-gcc/libhello-1.0.0+1/libhello/version.hxx.in
+version.in ../hello-gcc/libhello-1.0.0+2/libhello/version.hxx.in
+c++ ../hello-gcc/libhello-1.0.0+2/libhello/cxx{hello}
 c++ hello/cxx{hello}@../hello-gcc/hello/hello/
-c++ ../hello-gcc/libhello-1.0.0+1/libhello/cxx{hello}
-ld ../hello-gcc/libhello-1.0.0+1/libhello/libs{hello}
+ld ../hello-gcc/libhello-1.0.0+2/libhello/libs{hello}
 ld ../hello-gcc/hello/hello/exe{hello}
 ln ../hello-gcc/hello/hello/exe{hello} -> hello/
 
 + bdep status -ai
 in configuration @gcc:
 hello configured 0.1.0-a.0.19700101000000#2
-  libhello ^1.0.0 configured 1.0.0+1
+  libhello ^1.0.0 configured 1.0.0+2
 
 in configuration @clang:
 fetching pkg:stage.build2.org (prerequisite of dir:/tmp/hello)
@@ -295,41 +296,41 @@ in configuration @gcc:
 
 in configuration @clang:
 synchronizing:
-  new libhello/1.0.0+1 (required by hello)
+  new libhello/1.0.0+2 (required by hello)
   upgrade hello/0.1.0-a.0.19700101000000#1
 
-     0K ...                                                   100%  114M=0s
+     0K ...                                                   100% 98.3M=0s
 + bdep test -ai
 in configuration @gcc:
-c++ ../hello-gcc/libhello-1.0.0+1/tests/basics/cxx{driver}
-ld ../hello-gcc/libhello-1.0.0+1/tests/basics/exe{driver}
+c++ ../hello-gcc/libhello-1.0.0+2/tests/basics/cxx{driver}
+ld ../hello-gcc/libhello-1.0.0+2/tests/basics/exe{driver}
 test hello/testscript{testscript}@../hello-gcc/hello/hello/ ../hello-gcc/hello/hello/exe{hello}
-test ../hello-gcc/libhello-1.0.0+1/tests/basics/exe{driver}
+test ../hello-gcc/libhello-1.0.0+2/tests/basics/exe{driver}
 
 in configuration @clang:
 mkdir ../hello-clang/hello/fsdir{hello/}
-version.in ../hello-clang/libhello-1.0.0+1/libhello/version.hxx.in
+version.in ../hello-clang/libhello-1.0.0+2/libhello/version.hxx.in
+c++ ../hello-clang/libhello-1.0.0+2/tests/basics/cxx{driver}
+c++ ../hello-clang/libhello-1.0.0+2/libhello/cxx{hello}
 c++ hello/cxx{hello}@../hello-clang/hello/hello/
-c++ ../hello-clang/libhello-1.0.0+1/tests/basics/cxx{driver}
-c++ ../hello-clang/libhello-1.0.0+1/libhello/cxx{hello}
-ld ../hello-clang/libhello-1.0.0+1/libhello/libs{hello}
-ld ../hello-clang/libhello-1.0.0+1/tests/basics/exe{driver}
+ld ../hello-clang/libhello-1.0.0+2/libhello/libs{hello}
 ld ../hello-clang/hello/hello/exe{hello}
+ld ../hello-clang/libhello-1.0.0+2/tests/basics/exe{driver}
 test hello/testscript{testscript}@../hello-clang/hello/hello/ ../hello-clang/hello/hello/exe{hello}
-test ../hello-clang/libhello-1.0.0+1/tests/basics/exe{driver}
+test ../hello-clang/libhello-1.0.0+2/tests/basics/exe{driver}
 
 + bdep status
 hello configured 0.1.0-a.0.19700101000000#2 available 0.1.0-a.0.19700101000000#3
 
 + bdep sync
 synchronizing:
-  drop libhello/1.0.0+1 (unused)
+  drop libhello/1.0.0+2 (unused)
   upgrade hello/0.1.0-a.0.19700101000000#3
 synchronizing:
-  new libhello/1.0.0+1 (required by hello)
+  new libhello/1.0.0+2 (required by hello)
   upgrade hello/0.1.0-a.0.19700101000000#4
 
-     0K ...                                                   100% 97.2M=0s
+     0K ...                                                   100% 99.2M=0s
 + bdep fetch
 fetching git:build2.org/hello/libhello (prerequisite of dir:/tmp/hello)
 querying https://git.build2.org/hello/libhello.git
@@ -343,34 +344,34 @@ fetching from https://git.build2.org/hello/libprint.git
 fetching pkg:stage.build2.org (prerequisite of dir:/tmp/hello)
 
 + bdep status libhello
-libhello configured 1.0.0+1 available [1.1.0+1]
+libhello configured 1.0.0+2 available [1.1.0+2]
 
 + bdep sync libhello
 synchronizing:
-  new libformat/1.0.0+1 (required by libhello)
-  new libprint/1.0.0+1 (required by libhello)
-  upgrade libhello/1.1.0+1
+  new libformat/1.0.0+2 (required by libhello)
+  new libprint/1.0.0+2 (required by libhello)
+  upgrade libhello/1.1.0+2
   reconfigure hello/0.1.0-a.0.19700101000000#4
-distributing libformat/1.0.0+1
-distributing libprint/1.0.0+1
-distributing libhello/1.1.0+1
+distributing libformat/1.0.0+2
+distributing libprint/1.0.0+2
+distributing libhello/1.1.0+2
 
 + bdep status -r
 hello configured 0.1.0-a.0.19700101000000#4
-  libhello ^1.0.0 configured 1.1.0+1
-    libformat ^1.0.0 configured 1.0.0+1
-    libprint ^1.0.0 configured 1.0.0+1
+  libhello ^1.0.0 configured 1.1.0+2
+    libformat ^1.0.0 configured 1.0.0+2
+    libprint ^1.0.0 configured 1.0.0+2
 
 + bdep status -o libhello
-libhello configured 1.1.0+1 available (1.1.0+1) [1.0.0+1]
+libhello configured 1.1.0+2 available (1.1.0+2) [1.0.0+2]
 
 + bdep sync libhello/1.0.0
 synchronizing:
-  drop libprint/1.0.0+1 (unused)
-  drop libformat/1.0.0+1 (unused)
-  downgrade libhello/1.0.0+1
+  drop libprint/1.0.0+2 (unused)
+  drop libformat/1.0.0+2 (unused)
+  downgrade libhello/1.0.0+2
   reconfigure hello/0.1.0-a.0.19700101000000#4
-distributing libhello/1.0.0+1
+distributing libhello/1.0.0+2
 
 + bdep new -C libextra-gcc -t lib -l c++ libextra cc config.cxx=g++
 created new library project libextra in /tmp/libextra/
@@ -383,8 +384,8 @@ mkdir libextra-gcc/libextra/fsdir{libextra/}
 version.in libextra/libextra/version.hxx.in
 c++ libextra/libextra/cxx{extra}@libextra-gcc/libextra/libextra/
 c++ libextra/libextra/cxx{extra}@libextra-gcc/libextra/libextra/
-ld libextra-gcc/libextra/libextra/libs{extra}
 ar libextra-gcc/libextra/libextra/liba{extra}
+ld libextra-gcc/libextra/libextra/libs{extra}
 install unpkg-gcc/
 install unpkg-gcc/include/
 install unpkg-gcc/include/libextra/
@@ -433,48 +434,48 @@ querying https://git.build2.org/hello/libprint.git
 fetching from https://git.build2.org/hello/libprint.git
 fetching pkg:stage.build2.org (prerequisite of dir:/tmp/hello)
 synchronizing:
-  new libformat/1.0.0+1 (required by libhello)
-  new libprint/1.0.0+1 (required by libhello)
-  new libhello/1.1.0+1 (required by hello)
+  new libformat/1.0.0+2 (required by libhello)
+  new libprint/1.0.0+2 (required by libhello)
+  new libhello/1.1.0+2 (required by hello)
   new hello/0.1.0-a.0.19700101000000
-distributing libformat/1.0.0+1
-distributing libprint/1.0.0+1
-distributing libhello/1.1.0+1
+distributing libformat/1.0.0+2
+distributing libprint/1.0.0+2
+distributing libhello/1.1.0+2
 
 + b test: ../hello-gcc-1/
 mkdir ../hello-gcc-1/hello/fsdir{hello/}
-version.in ../hello-gcc-1/libformat-1.0.0+1/libformat/version.hxx.in
-version.in ../hello-gcc-1/libprint-1.0.0+1/libprint/version.hxx.in
-version.in ../hello-gcc-1/libhello-1.1.0+1/libhello/version.hxx.in
-c++ ../hello-gcc-1/libformat-1.0.0+1/tests/basics/cxx{driver}
-c++ ../hello-gcc-1/libprint-1.0.0+1/libprint/cxx{print}
-c++ ../hello-gcc-1/libprint-1.0.0+1/tests/basics/cxx{driver}
-c++ ../hello-gcc-1/libhello-1.1.0+1/tests/basics/cxx{driver}
+version.in ../hello-gcc-1/libprint-1.0.0+2/libprint/version.hxx.in
+version.in ../hello-gcc-1/libhello-1.1.0+2/libhello/version.hxx.in
+version.in ../hello-gcc-1/libformat-1.0.0+2/libformat/version.hxx.in
+c++ ../hello-gcc-1/libhello-1.1.0+2/libhello/cxx{hello}
+c++ ../hello-gcc-1/libprint-1.0.0+2/libprint/cxx{print}
+c++ ../hello-gcc-1/libformat-1.0.0+2/tests/basics/cxx{driver}
+c++ ../hello-gcc-1/libprint-1.0.0+2/tests/basics/cxx{driver}
+c++ ../hello-gcc-1/libformat-1.0.0+2/libformat/cxx{format}
+c++ ../hello-gcc-1/libhello-1.1.0+2/tests/basics/cxx{driver}
 c++ hello/cxx{hello}@../hello-gcc-1/hello/hello/
-c++ ../hello-gcc-1/libhello-1.1.0+1/libhello/cxx{hello}
-c++ ../hello-gcc-1/libformat-1.0.0+1/libformat/cxx{format}
-ld ../hello-gcc-1/libprint-1.0.0+1/libprint/libs{print}
-ld ../hello-gcc-1/libprint-1.0.0+1/tests/basics/exe{driver}
-ld ../hello-gcc-1/libformat-1.0.0+1/libformat/libs{format}
-ld ../hello-gcc-1/libformat-1.0.0+1/tests/basics/exe{driver}
-ld ../hello-gcc-1/libhello-1.1.0+1/libhello/libs{hello}
+ld ../hello-gcc-1/libprint-1.0.0+2/libprint/libs{print}
+ld ../hello-gcc-1/libprint-1.0.0+2/tests/basics/exe{driver}
+ld ../hello-gcc-1/libformat-1.0.0+2/libformat/libs{format}
+ld ../hello-gcc-1/libformat-1.0.0+2/tests/basics/exe{driver}
+ld ../hello-gcc-1/libhello-1.1.0+2/libhello/libs{hello}
+ld ../hello-gcc-1/libhello-1.1.0+2/tests/basics/exe{driver}
 ld ../hello-gcc-1/hello/hello/exe{hello}
-ld ../hello-gcc-1/libhello-1.1.0+1/tests/basics/exe{driver}
+test ../hello-gcc-1/libhello-1.1.0+2/tests/basics/exe{driver}
 test hello/testscript{testscript}@../hello-gcc-1/hello/hello/ ../hello-gcc-1/hello/hello/exe{hello}
-test ../hello-gcc-1/libformat-1.0.0+1/tests/basics/exe{driver}
-test ../hello-gcc-1/libprint-1.0.0+1/tests/basics/exe{driver}
-test ../hello-gcc-1/libhello-1.1.0+1/tests/basics/exe{driver}
+test ../hello-gcc-1/libformat-1.0.0+2/tests/basics/exe{driver}
+test ../hello-gcc-1/libprint-1.0.0+2/tests/basics/exe{driver}
 
 + b configure: ../hello-gcc/ config.cc.poptions+=-I/tmp/unpkg-gcc/include config.cc.loptions+=-L/tmp/unpkg-gcc/lib
 save ../hello-gcc/build/config.build
 save ../hello-gcc/hello/build/config.build
-save ../hello-gcc/libhello-1.0.0+1/build/config.build
-save ../hello-gcc/libhello-1.0.0+1/tests/build/config.build
+save ../hello-gcc/libhello-1.0.0+2/build/config.build
+save ../hello-gcc/libhello-1.0.0+2/tests/build/config.build
 
 + b test
-c++ ../hello-gcc/libhello-1.0.0+1/libhello/cxx{hello}
+c++ ../hello-gcc/libhello-1.0.0+2/libhello/cxx{hello}
 c++ hello/cxx{hello}@../hello-gcc/hello/hello/
-ld ../hello-gcc/libhello-1.0.0+1/libhello/libs{hello}
+ld ../hello-gcc/libhello-1.0.0+2/libhello/libs{hello}
 ld ../hello-gcc/hello/hello/exe{hello}
 ln ../hello-gcc/hello/hello/exe{hello} -> hello/
 test hello/testscript{testscript}@../hello-gcc/hello/hello/ ../hello-gcc/hello/hello/exe{hello}
@@ -495,8 +496,8 @@ To github.com:boris-kolpackov/hello.git
  - [deleted]         v0.1.0-a.1
 To github.com:boris-kolpackov/hello.git
  - [deleted]         v0.1.0
-[master (root-commit) ba0a54c] Initial implementation
- 11 files changed, 99 insertions(+)
+[master (root-commit) fad01cd] Initial implementation
+ 11 files changed, 100 insertions(+)
  create mode 100644 .gitignore
  create mode 100644 build/.gitignore
  create mode 100644 build/bootstrap.build
@@ -509,15 +510,15 @@ To github.com:boris-kolpackov/hello.git
  create mode 100644 manifest
  create mode 100644 repositories.manifest
 To github.com:boris-kolpackov/hello.git
- + e079761...ba0a54c master -> master (forced update)
+ + 89f4b5e...fad01cd master -> master (forced update)
 Branch 'master' set up to track remote branch 'master' from 'origin'.
 
 + bdep status
-hello configured 0.1.0-a.0.19700101000000 available 0.1.0-a.0.20190213073719.ba0a54c20481
+hello configured 0.1.0-a.0.19700101000000 available 0.1.0-a.0.20190318112403.fad01cd3755d
 
 + b info
 project: hello
-version: 0.1.0-a.0.20190213073719.ba0a54c20481
+version: 0.1.0-a.0.20190318112403.fad01cd3755d
 summary: hello executable
 url: https://example.org/hello
 src_root: /tmp/hello/
@@ -529,15 +530,15 @@ meta-operations: perform configure disfigure dist info
 
 + bdep sync
 synchronizing:
-  upgrade hello/0.1.0-a.0.20190213073719.ba0a54c20481
+  upgrade hello/0.1.0-a.0.20190318112403.fad01cd3755d
 
 + bdep status
-hello configured 0.1.0-a.0.20190213073719.ba0a54c20481
-[master f67043c] Another commit
+hello configured 0.1.0-a.0.20190318112403.fad01cd3755d
+[master fc66e59] Another commit
  1 file changed, 1 insertion(+)
 
 + bdep status
-hello configured 0.1.0-a.0.20190213073719.ba0a54c20481 available 0.1.0-a.0.20190213073723.f67043c870f7
+hello configured 0.1.0-a.0.20190318112403.fad01cd3755d available 0.1.0-a.0.20190318112408.fc66e591d04b
 
 + bdep release --alpha --push
 releasing:
@@ -548,9 +549,9 @@ releasing:
   commit:  yes
   tag:     v0.1.0-a.1
   push:    origin/master
-continue? [y/n] [master 4f6c42d] Release version 0.1.0-a.1
+continue? [y/n] [master 6e43d0c] Release version 0.1.0-a.1
  1 file changed, 1 insertion(+), 1 deletion(-)
-[master 4eab5a3] Change version to 0.1.0-a.1.z
+[master c3a8811] Change version to 0.1.0-a.1.z
  1 file changed, 1 insertion(+), 1 deletion(-)
 pushing branch master, tag v0.1.0-a.1
 
@@ -562,7 +563,7 @@ releasing:
   commit:  yes
   tag:     v0.1.0
   push:    origin/master
-continue? [y/n] [master a914bd9] Release version 0.1.0
+continue? [y/n] [master a0297d8] Release version 0.1.0
  1 file changed, 1 insertion(+), 1 deletion(-)
 pushing branch master, tag v0.1.0
 
@@ -587,9 +588,9 @@ Branch 'build2-control' set up to track remote branch 'build2-control' from 'ori
 submitting hello-0.1.0.tar.gz
   % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
                                  Dload  Upload   Total   Spent    Left  Speed
-
  0     0    0     0    0     0      0      0 --:--:-- --:--:-- --:--:--     0
  0     0    0     0    0     0      0      0 --:--:-- --:--:-- --:--:--     0
  0     0    0     0    0     0      0      0 --:--:--  0:00:01 --:--:--     0
100  1877    0     0  100  1877      0    800  0:00:02  0:00:02 --:--:--   800
100  1993  100   116  100  1877     46    758  0:00:02  0:00:02 --:--:--   758
+
  0     0    0     0    0     0      0      0 --:--:-- --:--:-- --:--:--     0
  0     0    0     0    0     0      0      0 --:--:-- --:--:-- --:--:--     0
  0     0    0     0    0     0      0      0 --:--:--  0:00:01 --:--:--     0
100  1889    0     0  100  1889      0    856  0:00:02  0:00:02 --:--:--   855
100  2005  100   116  100  1889     51    834  0:00:02  0:00:02 --:--:--   834
 package submission is queued: https://queue.cppget.org/hello/0.1.0
-reference: 358b079b307d
+reference: d8c68e1b97c8
 
 + bdep release --open --push
 opening:
@@ -598,7 +599,7 @@ opening:
   open:    0.2.0-a.0.z
   commit:  yes
   push:    origin/master
-continue? [y/n] [master fea34a6] Change version to 0.2.0-a.0.z
+continue? [y/n] [master 609f764] Change version to 0.2.0-a.0.z
  1 file changed, 1 insertion(+), 1 deletion(-)
 pushing branch master
 
@@ -644,8 +645,8 @@ c++ hello/cxx{hello}@../hello-gcc/hello/hello/
 c++ ../libhello/libhello/cxx{hello}@../hello-gcc/libhello/libhello/
 c++ ../libhello/tests/basics/cxx{driver}@../hello-gcc/libhello/tests/basics/
 ld ../hello-gcc/libhello/libhello/libs{hello}
-ld ../hello-gcc/libhello/tests/basics/exe{driver}
 ld ../hello-gcc/hello/hello/exe{hello}
+ld ../hello-gcc/libhello/tests/basics/exe{driver}
 test hello/testscript{testscript}@../hello-gcc/hello/hello/ ../hello-gcc/hello/hello/exe{hello}
 test ../hello-gcc/libhello/tests/basics/exe{driver}
 
@@ -693,12 +694,12 @@ mkdir ../hello-gcc/libhello/fsdir{libhello/}
 mkdir ../hello-gcc/hello/fsdir{hello/}
 mkdir ../hello-gcc/libhello/tests/fsdir{basics/}
 version.in libhello/libhello/version.hxx.in
-c++ hello/hello/cxx{hello}@../hello-gcc/hello/hello/
-c++ libhello/tests/basics/cxx{driver}@../hello-gcc/libhello/tests/basics/
 c++ libhello/libhello/cxx{hello}@../hello-gcc/libhello/libhello/
+c++ libhello/tests/basics/cxx{driver}@../hello-gcc/libhello/tests/basics/
+c++ hello/hello/cxx{hello}@../hello-gcc/hello/hello/
 ld ../hello-gcc/libhello/libhello/libs{hello}
-ld ../hello-gcc/libhello/tests/basics/exe{driver}
 ld ../hello-gcc/hello/hello/exe{hello}
+ld ../hello-gcc/libhello/tests/basics/exe{driver}
 test hello/hello/testscript{testscript}@../hello-gcc/hello/hello/ ../hello-gcc/hello/hello/exe{hello}
 test ../hello-gcc/libhello/tests/basics/exe{driver}
 
@@ -721,68 +722,68 @@ fetching from https://git.build2.org/hello/libformat.git
 fetching git:build2.org/hello/libprint##HEAD (prerequisite of git:build2.org/hello/libhello)
 querying https://git.build2.org/hello/libprint.git
 fetching from https://git.build2.org/hello/libprint.git
-  new libformat/1.0.0+1 (required by libhello)
-  new libprint/1.0.0+1 (required by libhello)
-  new libhello/1.1.0+1 (required by hello)
-  new hello/1.0.0+1
-continue? [Y/n] distributing libformat/1.0.0+1
-checked out libformat/1.0.0+1
-configured libformat/1.0.0+1
-distributing libprint/1.0.0+1
-checked out libprint/1.0.0+1
-configured libprint/1.0.0+1
-distributing libhello/1.1.0+1
-checked out libhello/1.1.0+1
-configured libhello/1.1.0+1
-distributing hello/1.0.0+1
-checked out hello/1.0.0+1
-configured hello/1.0.0+1
-version.in libhello-1.1.0+1/libhello/version.hxx.in
-version.in libformat-1.0.0+1/libformat/version.hxx.in
-version.in libprint-1.0.0+1/libprint/version.hxx.in
-c++ libprint-1.0.0+1/libprint/cxx{print}
-c++ libhello-1.1.0+1/libhello/cxx{hello}
-c++ hello-1.0.0+1/hello/cxx{hello}
-c++ libformat-1.0.0+1/libformat/cxx{format}
-ld libprint-1.0.0+1/libprint/libs{print}
-ld libformat-1.0.0+1/libformat/libs{format}
-ld libhello-1.1.0+1/libhello/libs{hello}
-ld hello-1.0.0+1/hello/exe{hello}
-updated hello/1.0.0+1
+  new libformat/1.0.0+2 (required by libhello)
+  new libprint/1.0.0+2 (required by libhello)
+  new libhello/1.1.0+2 (required by hello)
+  new hello/1.0.0+2
+continue? [Y/n] distributing libformat/1.0.0+2
+checked out libformat/1.0.0+2
+configured libformat/1.0.0+2
+distributing libprint/1.0.0+2
+checked out libprint/1.0.0+2
+configured libprint/1.0.0+2
+distributing libhello/1.1.0+2
+checked out libhello/1.1.0+2
+configured libhello/1.1.0+2
+distributing hello/1.0.0+2
+checked out hello/1.0.0+2
+configured hello/1.0.0+2
+version.in libhello-1.1.0+2/libhello/version.hxx.in
+version.in libprint-1.0.0+2/libprint/version.hxx.in
+version.in libformat-1.0.0+2/libformat/version.hxx.in
+c++ libprint-1.0.0+2/libprint/cxx{print}
+c++ libhello-1.1.0+2/libhello/cxx{hello}
+c++ libformat-1.0.0+2/libformat/cxx{format}
+c++ hello-1.0.0+2/hello/cxx{hello}
+ld libprint-1.0.0+2/libprint/libs{print}
+ld libformat-1.0.0+2/libformat/libs{format}
+ld libhello-1.1.0+2/libhello/libs{hello}
+ld hello-1.0.0+2/hello/exe{hello}
+updated hello/1.0.0+2
 
 + bpkg install hello
-ld libhello-1.1.0+1/libhello/libs{hello}
-ld hello-1.0.0+1/hello/exe{hello}
+ld libhello-1.1.0+2/libhello/libs{hello}
+ld hello-1.0.0+2/hello/exe{hello}
 install /opt/tools/
 install /opt/tools/include/
 install /opt/tools/include/libhello/
-install libhello-1.1.0+1/libhello/hxx{export}
-install libhello-1.1.0+1/libhello/hxx{hello}
+install libhello-1.1.0+2/libhello/hxx{export}
+install libhello-1.1.0+2/libhello/hxx{hello}
 install /opt/tools/share/
 install /opt/tools/share/doc/
 install /opt/tools/share/doc/libhello/
-install libhello-1.1.0+1/manifest{manifest}
-install libhello-1.1.0+1/libhello/hxx{version}
+install libhello-1.1.0+2/manifest{manifest}
+install libhello-1.1.0+2/libhello/hxx{version}
 install /opt/tools/include/libprint/
-install libprint-1.0.0+1/libprint/hxx{print}
-install libprint-1.0.0+1/libprint/hxx{export}
+install libprint-1.0.0+2/libprint/hxx{print}
+install libprint-1.0.0+2/libprint/hxx{export}
 install /opt/tools/share/doc/libprint/
-install libprint-1.0.0+1/manifest{manifest}
-install libprint-1.0.0+1/libprint/hxx{version}
-install libprint-1.0.0+1/libprint/libs{print}
+install libprint-1.0.0+2/manifest{manifest}
+install libprint-1.0.0+2/libprint/hxx{version}
+install libprint-1.0.0+2/libprint/libs{print}
 install /opt/tools/include/libformat/
-install libformat-1.0.0+1/libformat/hxx{export}
-install libformat-1.0.0+1/libformat/hxx{format}
+install libformat-1.0.0+2/libformat/hxx{export}
+install libformat-1.0.0+2/libformat/hxx{format}
 install /opt/tools/share/doc/libformat/
-install libformat-1.0.0+1/manifest{manifest}
-install libformat-1.0.0+1/libformat/hxx{version}
-install libformat-1.0.0+1/libformat/libs{format}
-install libhello-1.1.0+1/libhello/libs{hello}
+install libformat-1.0.0+2/manifest{manifest}
+install libformat-1.0.0+2/libformat/hxx{version}
+install libformat-1.0.0+2/libformat/libs{format}
+install libhello-1.1.0+2/libhello/libs{hello}
 install /opt/tools/bin/
-install hello-1.0.0+1/hello/exe{hello}
+install hello-1.0.0+2/hello/exe{hello}
 install /opt/tools/share/doc/hello/
-install hello-1.0.0+1/manifest{manifest}
-installed hello/1.0.0+1
+install hello-1.0.0+2/manifest{manifest}
+installed hello/1.0.0+2
 
 + /opt/tools/bin/hello World
 Hello, World!
@@ -829,36 +830,36 @@ Hello, World!
 13 directories, 23 files
 
 + bpkg uninstall hello
-uninstall hello-1.0.0+1/manifest{manifest}
+uninstall hello-1.0.0+2/manifest{manifest}
 uninstall /opt/tools/share/doc/hello/
-uninstall hello-1.0.0+1/hello/exe{hello}
+uninstall hello-1.0.0+2/hello/exe{hello}
 uninstall /opt/tools/bin/
-uninstall libhello-1.1.0+1/libhello/libs{hello}
-uninstall libformat-1.0.0+1/libformat/libs{format}
-uninstall libformat-1.0.0+1/libformat/hxx{version}
-uninstall libformat-1.0.0+1/manifest{manifest}
+uninstall libhello-1.1.0+2/libhello/libs{hello}
+uninstall libformat-1.0.0+2/libformat/libs{format}
+uninstall libformat-1.0.0+2/libformat/hxx{version}
+uninstall libformat-1.0.0+2/manifest{manifest}
 uninstall /opt/tools/share/doc/libformat/
-uninstall libformat-1.0.0+1/libformat/hxx{format}
-uninstall libformat-1.0.0+1/libformat/hxx{export}
+uninstall libformat-1.0.0+2/libformat/hxx{format}
+uninstall libformat-1.0.0+2/libformat/hxx{export}
 uninstall /opt/tools/include/libformat/
-uninstall libprint-1.0.0+1/libprint/libs{print}
-uninstall libprint-1.0.0+1/libprint/hxx{version}
-uninstall libprint-1.0.0+1/manifest{manifest}
+uninstall libprint-1.0.0+2/libprint/libs{print}
+uninstall libprint-1.0.0+2/libprint/hxx{version}
+uninstall libprint-1.0.0+2/manifest{manifest}
 uninstall /opt/tools/share/doc/libprint/
-uninstall libprint-1.0.0+1/libprint/hxx{export}
-uninstall libprint-1.0.0+1/libprint/hxx{print}
+uninstall libprint-1.0.0+2/libprint/hxx{export}
+uninstall libprint-1.0.0+2/libprint/hxx{print}
 uninstall /opt/tools/include/libprint/
-uninstall libhello-1.1.0+1/libhello/hxx{version}
-uninstall libhello-1.1.0+1/manifest{manifest}
+uninstall libhello-1.1.0+2/libhello/hxx{version}
+uninstall libhello-1.1.0+2/manifest{manifest}
 uninstall /opt/tools/share/doc/libhello/
 uninstall /opt/tools/share/doc/
 uninstall /opt/tools/share/
-uninstall libhello-1.1.0+1/libhello/hxx{hello}
-uninstall libhello-1.1.0+1/libhello/hxx{export}
+uninstall libhello-1.1.0+2/libhello/hxx{hello}
+uninstall libhello-1.1.0+2/libhello/hxx{export}
 uninstall /opt/tools/include/libhello/
 uninstall /opt/tools/include/
 uninstall /opt/tools/
-uninstalled hello/1.0.0+1
+uninstalled hello/1.0.0+2
 
 + bpkg drop hello
 following dependencies were automatically built but will no longer be used:
diff --git a/stage b/stage
index e1af1cc..1efa9a3 100755
--- a/stage
+++ b/stage
@@ -238,8 +238,6 @@ fi
 
 # These are just for testing (though libodb-mysql needs libmysqlclient).
 #
-#etc/stage-pkg -c $mode -d vcpkg packaging/vcpkg/vcpkg
-
 etc/stage-pkg -c $mode -d openssl packaging/openssl/libcrypto
 etc/stage-pkg -c $mode -d openssl packaging/openssl/libssl
 etc/stage-pkg -c $mode -d openssl packaging/openssl/openssl
diff --git a/version b/version
index b8ea8e2..b9dfc5d 100755
--- a/version
+++ b/version
@@ -13,16 +13,16 @@ usage="usage: etc/version"
 build2_min=0.9.0
 bpkg_min=0.9.0
 
-ver=0.10.0-a.0.z
-#ver=0.10.0
+#ver=0.11.0-a.0.z
+ver=0.10.0
 mods=(libstd-modules libbutl libbutl.bash libbpkg libbbot bpkg)
 
-odb_ver=2.5.0-b.12.z
-#odb_ver=2.5.0-b.13
+#odb_ver=2.5.0-b.14.z
+odb_ver=2.5.0-b.13
 odb_mods=(libodb libodb-sqlite libodb-pgsql)
 
-xml_ver=1.1.0-b.5.z
-#xml_ver=1.1.0-b.6
+#xml_ver=1.1.0-b.7.z
+xml_ver=1.1.0-b.6
 xml_mods=(libstudxml)
 
 # @@ NOTE: libpkgconf version constraint is updated manually.
-- 
cgit v1.1