summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2019-11-20 14:56:28 (GMT)
committerBoris Kolpackov <boris@codesynthesis.com>2019-11-20 14:56:28 (GMT)
commitf07e14f7cc43baf76fd6916a85be5bf2b42c531a (patch)
tree725e31d32216b41469461a6c72bdaf573af25772
parent35219dcea1530755fc37713a70d49322ec169f48 (diff)
Updates for 0.12.0 releasev0.12.0
-rw-r--r--doc/release.cli81
-rw-r--r--git/modules7
-rw-r--r--intro2-tldr.orig28
-rwxr-xr-xintro2-tour4
-rw-r--r--intro2-tour.orig302
-rwxr-xr-xversion16
6 files changed, 238 insertions, 200 deletions
diff --git a/doc/release.cli b/doc/release.cli
index 66eaebd..3f716da 100644
--- a/doc/release.cli
+++ b/doc/release.cli
@@ -31,7 +31,7 @@ and then be queued and published (effectively released) as part of the
bundle the release of dependencies with the release of \c{build2} to keep
the process as streamlined as possible.
-\N|When unbu ndling the release of a dependency we need to remove its
+\N|When unbundling the release of a dependency we need to remove its
distribution from \c{etc/stage} and add the pre-distributed packages
(for example, from \c{public}) to \c{staging/repository/1/}.|
@@ -150,7 +150,8 @@ distribution from \c{etc/stage} and add the pre-distributed packages
\h#doc|Review documentation|
Review the following documentation for (1) sample output changes and (2)
- still being relevant/making sense.
+ still being relevant/making sense. Also (3) check the \c{NEWS} files for
+ anything new worth mentioning.
\N|Ideally this should be done during development but it's easy to forget.
Also, check if there is any new documentation that has been added that is
@@ -160,7 +161,7 @@ distribution from \c{etc/stage} and add the pre-distributed packages
\li|Install guide: 1 & 2.|
- \li|Toolchain introduction: 1 & 2 (use \c{intro} script output).|
+ \li|Toolchain introduction: 1, 2 & 3 (use \c{intro} script output for 2).|
\li|Introduction in the build system manual: 1 (uses \c{bdep-new(1)}
output).|
@@ -232,13 +233,35 @@ distribution from \c{etc/stage} and add the pre-distributed packages
Review \c{staging/0/} and \c{staging/repository/1/} for anything stray.
- Restage with \c{baseutils}/\c{mingw} regeneration:
+ If no upgrade is possible from the previous version, uncomment errors in
+ install scripts (and add a note to restore after the release).
- \
- etc/stage -b
- \
+ Restage and upgrade \c{brep} by performing the following steps:
+
+ \ol|
+
+ \li|Disable building of all repositories on \c{stage} by adding the
+ \c{buildable:no} field at the end of each line in \c{loadtab}.|
+
+ \li|Restage with \c{baseutils}/\c{mingw} regeneration:
+
+ \
+ etc/stage -b
+ \
+
+ |
- Upgrade \c{brep} on \c{stage} and sync latest \c{buildtab}s.
+ \li|While build machines are bootstrapping, upgrade \c{brep} on \c{stage},
+ sync latest \c{buildtab}s but do not restart the web server.|
+
+ \li|Once all build machines have bootstrapped, enabling build of all
+ repositories and restart the web server. To check bootstrap progress:
+
+ \
+ ./ls-machines -b stage -c stage -c devel
+ \
+
+ ||
Verify \c{stage} build is clean, nothing is unbuilt.
@@ -304,11 +327,15 @@ distribution from \c{etc/stage} and add the pre-distributed packages
\li|Close schema versions in \c{bpkg}, \c{bdep}, and \c{brep}.|
- \li|Change \c{BUILD2_STAGE} in \c{build2/build2/config.hxx.in} to \c{false}.|
+ \li|Change \c{LIBBUILD2_STAGE} in \c{build2/libbuild2/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}. \b{This must be
- done if created projects use new features.}|
+ done if created projects use new features.}
+
+ \N|Why shouldn't we always do this for simplicity? Maybe because then
+ we cannot run tests using \c{public} services? Also the below upgrade
+ steps will break since there is no continuity.||
\li|Change version by updating (including with new modules and/or new
dependencies) and then executing:
@@ -319,6 +346,9 @@ distribution from \c{etc/stage} and add the pre-distributed packages
git -C build2-toolchain commit --amend # \"Change version to X.Y.Z\"
\
+ Note that \c{libbuild2-hello} is independently versioned but may still
+ need to update minimum \c{build2} version requirements (see below).
+
|
\li|Tag by executing \c{tag.sh\ <version>}.|
@@ -360,13 +390,18 @@ distribution from \c{etc/stage} and add the pre-distributed packages
BDEP_SYNC=0 b ~/work/build2/builds/gcc7-asan/
\
- ||
+ |
+
+
+ \li|Update \c{libbuild2-hello} if required.||
Verify key tests pass (in particular, the \c{bdep} tests will now be running
against \c{public} services):
\
b test: build2/ bpkg/ bdep/
+ b test: bpkg/ config.bpkg.test.remote=true
+ b test: libbuild2-hello/libbuild2-hello-tests/
\
\N|We could have queued after this step before preparing
@@ -397,8 +432,8 @@ distribution from \c{etc/stage} and add the pre-distributed packages
\li|Regenerate documentation in each package inside as well as in
\c{build2-toolchain} itself.|
- \li|Update ODB by copying relevant files from the previous step (trust
- me, this is the easy way). Make sure all \c{*-odb.*} are copied!|
+ \li|Update ODB by copying relevant files from the previous step (trust me,
+ this is the easy way for now). Make sure all \c{*-odb.*} are copied!|
\li|Change \c{BUILD2_REPO} in \c{build2-toolchain} build scripts to
\c{queue}.||
@@ -436,7 +471,8 @@ distribution from \c{etc/stage} and add the pre-distributed packages
If queued package manifests contain new values, then the bpkg-rep-publish
script will fail to create repository due to unknown manifest values. To
- resolve this we temporarily add (to \c{crontab}) \c{--ignore-unknown}.
+ resolve this we temporarily add (to \c{crontab}) \c{--ignore-unknown} and
+ make a note to restore.
\h#build-public|Verify queued packages build with \c{public}|
@@ -483,17 +519,15 @@ distribution from \c{etc/stage} and add the pre-distributed packages
\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
- configurations and reboot build hosts:
+ Adjust \c{stage} and \c{devel} build host configurations (both \c{*-config}
+ and hardware classes) to enable the \c{queue} toolchain. Shift most
+ instances from \c{stage} to \c{queue} in the hardware class-specific
+ configurations. Regenerate affected configurations and reboot build hosts:
\
cd private/buildos/
- ./gen-config stage <class>
- ./gen-config devel <class>
-
+ ./regen
./po-hosts -r -c stage -c devel
\
@@ -550,6 +584,8 @@ distribution from \c{etc/stage} and add the pre-distributed packages
~/work/build2/buildos/remove-machine <host> <machine>
\
+ Then move now legacy machines to the \"legacy\" build host.
+
Also review deployed machines against the latest available versions and
upgrade those that are not the latest:
@@ -591,7 +627,8 @@ distribution from \c{etc/stage} and add the pre-distributed packages
Note that once published, the existing install instructions/download
links are no longer usable, so do not linger (in fact, may make sense
- to update Download and Install pages before publishing packages).
+ to update Download and Install pages before publishing packages and
+ sync only them immediately after).
\h#start-public|Start \c{public} builds|
diff --git a/git/modules b/git/modules
index d138b98..d1821ff 100644
--- a/git/modules
+++ b/git/modules
@@ -11,7 +11,8 @@ bdep \
brep \
libbbot \
bbot \
-libstd-modules"
+libstd-modules \
+libbuild2-hello"
# During release it is useful to exclude some of these so can do mass
# commits (like version updates).
@@ -26,7 +27,8 @@ modules="$modules openssl-agent"
modules="$modules etc"
modules="$modules private"
-# We don't tag git/, and etc/, private/, build2-toolchain/ are tagged manually.
+# We don't tag git/, libbuild2-hello.
+# And etc/, private/, build2-toolchain/ are tagged manually.
#
tag_modules=" \
libbutl \
@@ -60,6 +62,7 @@ brep \
libbbot \
bbot \
libstd-modules \
+libbuild2-hello \
buildos \
msvc-linux \
openssl-agent"
diff --git a/intro2-tldr.orig b/intro2-tldr.orig
index 434503b..7f3e9a0 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) db9119c] first commit
- 12 files changed, 103 insertions(+)
+[master (root-commit) 2fe4497] first commit
+ 12 files changed, 107 insertions(+)
create mode 100644 .gitignore
create mode 100644 README.md
create mode 100644 build/.gitignore
@@ -59,8 +59,8 @@ synchronizing /tmp/hello-gcc/:
upgrade hello/0.1.0#1
distributing libhello/1.0.0+4
version.in ../hello-gcc/libhello-1.0.0+4/libhello/version.hxx.in
-c++ hello/cxx{hello}@../hello-gcc/hello/hello/
c++ ../hello-gcc/libhello-1.0.0+4/libhello/cxx{hello}
+c++ hello/cxx{hello}@../hello-gcc/hello/hello/
ld ../hello-gcc/libhello-1.0.0+4/libhello/libs{hello}
ld ../hello-gcc/hello/hello/exe{hello}
ln ../hello-gcc/hello/hello/exe{hello} -> hello/
@@ -78,22 +78,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+4 available [1.1.0+4]
+ libhello ^1.0.0 configured 1.0.0+4 available [1.1.0+5] [1.0.0+5]
+ bdep sync libhello
synchronizing:
- new libformat/1.0.0+4 (required by libhello)
- new libprint/1.0.0+4 (required by libhello)
- upgrade libhello/1.1.0+4
+ new libformat/1.0.0+5 (required by libhello)
+ new libprint/1.0.0+5 (required by libhello)
+ upgrade libhello/1.1.0+5
reconfigure hello/0.1.0#1
-distributing libformat/1.0.0+4
-distributing libprint/1.0.0+4
-distributing libhello/1.1.0+4
+distributing libformat/1.0.0+5
+distributing libprint/1.0.0+5
+distributing libhello/1.1.0+5
+ bdep sync libhello/1.0.0
synchronizing:
- drop libprint/1.0.0+4 (unused)
- drop libformat/1.0.0+4 (unused)
- downgrade libhello/1.0.0+4
+ drop libprint/1.0.0+5 (unused)
+ drop libformat/1.0.0+5 (unused)
+ downgrade libhello/1.0.0+5
reconfigure hello/0.1.0#1
-distributing libhello/1.0.0+4
+distributing libhello/1.0.0+5
diff --git a/intro2-tour b/intro2-tour
index ab6fa64..4adbac7 100755
--- a/intro2-tour
+++ b/intro2-tour
@@ -113,9 +113,7 @@ cat <<EOF >>repositories.manifest
role: prerequisite
location: $repo
EOF
-cat <<EOF >>manifest
-depends: libhello ^1.0.0
-EOF
+sed -i -re 's/^#depends: libhello/depends: libhello/' manifest # ^1.0.0
sed -i -re 's/^#import/import/' hello/buildfile
cat <<EOF >hello/hello.cxx
#include <iostream>
diff --git a/intro2-tour.orig b/intro2-tour.orig
index c87a525..f3b1a52 100644
--- a/intro2-tour.orig
+++ b/intro2-tour.orig
@@ -64,8 +64,8 @@ license: proprietary
description-file: README.md
url: https://example.org/hello
email: boris@codesynthesis.com
-depends: * build2 >= 0.10.0
-depends: * bpkg >= 0.10.0
+depends: * build2 >= 0.11.0
+depends: * bpkg >= 0.11.0
#depends: libhello ^1.0.0
+ bdep init -C ../hello-gcc @gcc cc config.cxx=g++
@@ -80,13 +80,13 @@ created configuration @clang /tmp/hello-clang/ 2 auto-synchronized
synchronizing:
new hello/0.1.0-a.0.19700101000000
-+ ls -d -1 ../hello ../hello2 ../hello2.tar.gz ../hello-clang ../hello-gcc ../hello.git
++ ls -d -1 ../hello ../hello1 ../hello-clang ../hello.cxx ../hello-gcc ../hello.o
../hello
-../hello2
-../hello2.tar.gz
+../hello1
../hello-clang
+../hello.cxx
../hello-gcc
-../hello.git
+../hello.o
+ 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/
@@ -187,8 +187,8 @@ Hello, Windows!
+ git add .
+ git commit -m Initial implementation
-[master (root-commit) d81cc12] Initial implementation
- 12 files changed, 103 insertions(+)
+[master (root-commit) 83b57ed] Initial implementation
+ 12 files changed, 107 insertions(+)
create mode 100644 .gitignore
create mode 100644 README.md
create mode 100644 build/.gitignore
@@ -206,20 +206,20 @@ Hello, Windows!
+ git push origin master -u --force
To github.com:boris-kolpackov/hello.git
- + 609f764...d81cc12 master -> master (forced update)
+ + 7f613af...83b57ed 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@d81cc12cbafdfa7c052964932c174d43e23c00f7
+ in: https://github.com/boris-kolpackov/hello.git#master@83b57eddde8485a4f4aea49c71f5d4382cb58f85
package: hello
- version: 0.1.0-a.0.20190608073910.d81cc12cbafd
+ version: 0.1.0-a.0.20191118060612.83b57eddde84
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 79 812 0 0 100 649 0 419 0:00:01 0:00:01 --:--:-- 419 100 812 100 163 100 649 105 419 0:00:01 0:00:01 --:--:-- 419
-CI request is queued: https://ci.stage.build2.org/@bdf6dd05-d0a4-4a0e-b3c4-8dfb8c50a8cd
-reference: bdf6dd05-d0a4-4a0e-b3c4-8dfb8c50a8cd
+ 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 812 100 163 100 649 106 423 0:00:01 0:00:01 --:--:-- 423
+CI request is queued: https://ci.stage.build2.org/@613d3e21-151c-4c22-ae53-bba54f9eb6c4
+reference: 613d3e21-151c-4c22-ae53-bba54f9eb6c4
+ bdep deinit @gcc @clang
deinitializing in project /tmp/hello/
@@ -250,8 +250,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.1.0+4
-libhello/1.0.0+4
+libhello/1.1.0+5
+libhello/1.0.0+5
+ bpkg rep-info https://git.build2.org/hello/libhello.git#HEAD
querying https://git.build2.org/hello/libhello.git
@@ -260,7 +260,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+4
+libhello/1.1.0+5
+ bdep status
fetching pkg:stage.build2.org (prerequisite of dir:/tmp/hello)
@@ -275,7 +275,7 @@ synchronizing:
new libhello/1.0.0+4 (required by hello)
upgrade hello/0.1.0-a.0.19700101000000#1
- 0K ... 100% 88.9M=0s
+ 0K ... 100% 78.7M=0s
+ b
synchronizing /tmp/hello-gcc/:
upgrade hello/0.1.0-a.0.19700101000000#2
@@ -304,13 +304,13 @@ synchronizing:
new libhello/1.0.0+4 (required by hello)
upgrade hello/0.1.0-a.0.19700101000000#1
- 0K ... 100% 98.5M=0s
+ 0K ... 100% 81.6M=0s
+ bdep test -ai
in configuration @gcc:
c++ ../hello-gcc/libhello-1.0.0+4/tests/basics/cxx{driver}
ld ../hello-gcc/libhello-1.0.0+4/tests/basics/exe{driver}
-test ../hello-gcc/libhello-1.0.0+4/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+4/tests/basics/exe{driver}
in configuration @clang:
mkdir ../hello-clang/hello/fsdir{hello/}
@@ -335,7 +335,7 @@ synchronizing:
new libhello/1.0.0+4 (required by hello)
upgrade hello/0.1.0-a.0.19700101000000#4
- 0K ... 100% 100M=0s
+ 0K ... 100% 89.3M=0s
+ bdep fetch
fetching git:build2.org/hello/libhello (prerequisite of dir:/tmp/hello)
querying https://git.build2.org/hello/libhello.git
@@ -349,34 +349,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+4 available [1.1.0+4]
+libhello configured 1.0.0+4 available [1.1.0+5] [1.0.0+5]
+ bdep sync libhello
synchronizing:
- new libformat/1.0.0+4 (required by libhello)
- new libprint/1.0.0+4 (required by libhello)
- upgrade libhello/1.1.0+4
+ new libformat/1.0.0+5 (required by libhello)
+ new libprint/1.0.0+5 (required by libhello)
+ upgrade libhello/1.1.0+5
reconfigure hello/0.1.0-a.0.19700101000000#4
-distributing libformat/1.0.0+4
-distributing libprint/1.0.0+4
-distributing libhello/1.1.0+4
+distributing libformat/1.0.0+5
+distributing libprint/1.0.0+5
+distributing libhello/1.1.0+5
+ bdep status -r
hello configured 0.1.0-a.0.19700101000000#4
- libhello ^1.0.0 configured 1.1.0+4
- libformat ^1.0.0 configured 1.0.0+4
- libprint ^1.0.0 configured 1.0.0+4
+ libhello ^1.0.0 configured 1.1.0+5
+ libformat ^1.0.0 configured 1.0.0+5
+ libprint ^1.0.0 configured 1.0.0+5
+ bdep status -o libhello
-libhello configured 1.1.0+4 available (1.1.0+4) [1.0.0+4]
+libhello configured 1.1.0+5 available (1.1.0+5) [1.0.0+5] [1.0.0+4]
+ bdep sync libhello/1.0.0
synchronizing:
- drop libprint/1.0.0+4 (unused)
- drop libformat/1.0.0+4 (unused)
- downgrade libhello/1.0.0+4
+ drop libprint/1.0.0+5 (unused)
+ drop libformat/1.0.0+5 (unused)
+ downgrade libhello/1.0.0+5
reconfigure hello/0.1.0-a.0.19700101000000#4
-distributing libhello/1.0.0+4
+distributing libhello/1.0.0+5
+ bdep new -C libextra-gcc -t lib -l c++ libextra cc config.cxx=g++
created new library project libextra in /tmp/libextra/
@@ -441,48 +441,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+4 (required by libhello)
- new libprint/1.0.0+4 (required by libhello)
- new libhello/1.1.0+4 (required by hello)
+ new libformat/1.0.0+5 (required by libhello)
+ new libprint/1.0.0+5 (required by libhello)
+ new libhello/1.1.0+5 (required by hello)
new hello/0.1.0-a.0.19700101000000
-distributing libformat/1.0.0+4
-distributing libprint/1.0.0+4
-distributing libhello/1.1.0+4
+distributing libformat/1.0.0+5
+distributing libprint/1.0.0+5
+distributing libhello/1.1.0+5
+ b test: ../hello-gcc-1/
+version.in ../hello-gcc-1/libprint-1.0.0+5/libprint/version.hxx.in
mkdir ../hello-gcc-1/hello/fsdir{hello/}
-version.in ../hello-gcc-1/libprint-1.0.0+4/libprint/version.hxx.in
-version.in ../hello-gcc-1/libformat-1.0.0+4/libformat/version.hxx.in
-version.in ../hello-gcc-1/libhello-1.1.0+4/libhello/version.hxx.in
-c++ ../hello-gcc-1/libprint-1.0.0+4/libprint/cxx{print}
-c++ ../hello-gcc-1/libprint-1.0.0+4/tests/basics/cxx{driver}
-c++ ../hello-gcc-1/libformat-1.0.0+4/tests/basics/cxx{driver}
-c++ ../hello-gcc-1/libhello-1.1.0+4/libhello/cxx{hello}
-c++ ../hello-gcc-1/libformat-1.0.0+4/libformat/cxx{format}
-c++ ../hello-gcc-1/libhello-1.1.0+4/tests/basics/cxx{driver}
+version.in ../hello-gcc-1/libformat-1.0.0+5/libformat/version.hxx.in
+version.in ../hello-gcc-1/libhello-1.1.0+5/libhello/version.hxx.in
+c++ ../hello-gcc-1/libprint-1.0.0+5/tests/basics/cxx{driver}
+c++ ../hello-gcc-1/libprint-1.0.0+5/libprint/cxx{print}
+c++ ../hello-gcc-1/libformat-1.0.0+5/tests/basics/cxx{driver}
+c++ ../hello-gcc-1/libhello-1.1.0+5/libhello/cxx{hello}
+c++ ../hello-gcc-1/libhello-1.1.0+5/tests/basics/cxx{driver}
c++ hello/cxx{hello}@../hello-gcc-1/hello/hello/
-ld ../hello-gcc-1/libprint-1.0.0+4/libprint/libs{print}
-ld ../hello-gcc-1/libprint-1.0.0+4/tests/basics/exe{driver}
-ld ../hello-gcc-1/libformat-1.0.0+4/libformat/libs{format}
-ld ../hello-gcc-1/libformat-1.0.0+4/tests/basics/exe{driver}
-ld ../hello-gcc-1/libhello-1.1.0+4/libhello/libs{hello}
-ld ../hello-gcc-1/libhello-1.1.0+4/tests/basics/exe{driver}
+c++ ../hello-gcc-1/libformat-1.0.0+5/libformat/cxx{format}
+ld ../hello-gcc-1/libprint-1.0.0+5/libprint/libs{print}
+ld ../hello-gcc-1/libprint-1.0.0+5/tests/basics/exe{driver}
+ld ../hello-gcc-1/libformat-1.0.0+5/libformat/libs{format}
+ld ../hello-gcc-1/libformat-1.0.0+5/tests/basics/exe{driver}
+ld ../hello-gcc-1/libhello-1.1.0+5/libhello/libs{hello}
+ld ../hello-gcc-1/libhello-1.1.0+5/tests/basics/exe{driver}
ld ../hello-gcc-1/hello/hello/exe{hello}
+test ../hello-gcc-1/libprint-1.0.0+5/tests/basics/exe{driver}
test hello/testscript{testscript}@../hello-gcc-1/hello/hello/ ../hello-gcc-1/hello/hello/exe{hello}
-test ../hello-gcc-1/libhello-1.1.0+4/tests/basics/exe{driver}
-test ../hello-gcc-1/libformat-1.0.0+4/tests/basics/exe{driver}
-test ../hello-gcc-1/libprint-1.0.0+4/tests/basics/exe{driver}
+test ../hello-gcc-1/libhello-1.1.0+5/tests/basics/exe{driver}
+test ../hello-gcc-1/libformat-1.0.0+5/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+4/build/config.build
-save ../hello-gcc/libhello-1.0.0+4/tests/build/config.build
+save ../hello-gcc/libhello-1.0.0+5/build/config.build
+save ../hello-gcc/libhello-1.0.0+5/tests/build/config.build
+ b test
-c++ ../hello-gcc/libhello-1.0.0+4/libhello/cxx{hello}
+c++ ../hello-gcc/libhello-1.0.0+5/libhello/cxx{hello}
c++ hello/cxx{hello}@../hello-gcc/hello/hello/
-ld ../hello-gcc/libhello-1.0.0+4/libhello/libs{hello}
+ld ../hello-gcc/libhello-1.0.0+5/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}
@@ -503,8 +503,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) 29640f2] Initial implementation
- 12 files changed, 103 insertions(+)
+[master (root-commit) e92103a] Initial implementation
+ 12 files changed, 107 insertions(+)
create mode 100644 .gitignore
create mode 100644 README.md
create mode 100644 build/.gitignore
@@ -518,15 +518,15 @@ To github.com:boris-kolpackov/hello.git
create mode 100644 manifest
create mode 100644 repositories.manifest
To github.com:boris-kolpackov/hello.git
- + d81cc12...29640f2 master -> master (forced update)
+ + 83b57ed...e92103a 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.20190608074122.29640f28aadc
+hello configured 0.1.0-a.0.19700101000000 available 0.1.0-a.0.20191118060910.e92103a6ea2d
+ b info
project: hello
-version: 0.1.0-a.0.20190608074122.29640f28aadc
+version: 0.1.0-a.0.20191118060910.e92103a6ea2d
summary: hello C++ executable
url: https://example.org/hello
src_root: /tmp/hello/
@@ -538,15 +538,15 @@ meta-operations: perform configure disfigure dist info
+ bdep sync
synchronizing:
- upgrade hello/0.1.0-a.0.20190608074122.29640f28aadc
+ upgrade hello/0.1.0-a.0.20191118060910.e92103a6ea2d
+ bdep status
-hello configured 0.1.0-a.0.20190608074122.29640f28aadc
-[master 19fd457] Another commit
+hello configured 0.1.0-a.0.20191118060910.e92103a6ea2d
+[master f720ebb] Another commit
1 file changed, 1 insertion(+)
+ bdep status
-hello configured 0.1.0-a.0.20190608074122.29640f28aadc available 0.1.0-a.0.20190608074126.19fd45772762
+hello configured 0.1.0-a.0.20191118060910.e92103a6ea2d available 0.1.0-a.0.20191118060914.f720ebb7ae8e
+ bdep release --alpha --push
releasing:
@@ -557,9 +557,9 @@ releasing:
commit: yes
tag: v0.1.0-a.1
push: origin/master
-continue? [y/n] [master ef611b3] Release version 0.1.0-a.1
+continue? [y/n] [master b7765c6] Release version 0.1.0-a.1
1 file changed, 1 insertion(+), 1 deletion(-)
-[master 5fccf16] Change version to 0.1.0-a.1.z
+[master 0833250] 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
@@ -571,7 +571,7 @@ releasing:
commit: yes
tag: v0.1.0
push: origin/master
-continue? [y/n] [master e5bcd1e] Release version 0.1.0
+continue? [y/n] [master 0fadfca] Release version 0.1.0
1 file changed, 1 insertion(+), 1 deletion(-)
pushing branch master, tag v0.1.0
@@ -596,9 +596,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:00:01 --:--:-- 0 100 1981 0 0 100 1981 0 867 0:00:02 0:00:02 --:--:-- 868 100 2097 100 116 100 1981 48 832 0:00:02 0:00:02 --:--:-- 832
+ 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 0 0 0 0 0 0 0 0 --:--:-- 0:00:01 --:--:-- 0 100 1947 0 0 100 1947 0 876 0:00:02 0:00:02 --:--:-- 876 100 2063 100 116 100 1947 50 853 0:00:02 0:00:02 --:--:-- 853
package submission is queued: https://queue.cppget.org/hello/0.1.0
-reference: 6e90dc4ba2cc
+reference: 2f3bfe0b35f3
+ bdep release --open --push
opening:
@@ -607,7 +607,7 @@ opening:
open: 0.2.0-a.0.z
commit: yes
push: origin/master
-continue? [y/n] [master 3beffd1] Change version to 0.2.0-a.0.z
+continue? [y/n] [master d8fce33] Change version to 0.2.0-a.0.z
1 file changed, 1 insertion(+), 1 deletion(-)
pushing branch master
@@ -649,12 +649,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++ ../libhello/libhello/cxx{hello}@../hello-gcc/libhello/libhello/
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}
@@ -699,17 +699,17 @@ synchronizing:
synchronizing:
upgrade hello/0.1.0-a.0.19700101000000#2
mkdir ../hello-gcc/libhello/fsdir{libhello/}
-mkdir ../hello-gcc/hello/fsdir{hello/}
mkdir ../hello-gcc/libhello/tests/fsdir{basics/}
+mkdir ../hello-gcc/hello/fsdir{hello/}
version.in libhello/libhello/version.hxx.in
-c++ libhello/libhello/cxx{hello}@../hello-gcc/libhello/libhello/
c++ hello/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/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}
+ld ../hello-gcc/hello/hello/exe{hello}
test ../hello-gcc/libhello/tests/basics/exe{driver}
+test hello/hello/testscript{testscript}@../hello-gcc/hello/hello/ ../hello-gcc/hello/hello/exe{hello}
+ bpkg create -d tools cc config.cxx=g++ config.cc.coptions=-O3 config.install.root=/opt/tools config.install.sudo=sudo config.bin.rpath=/opt/tools/lib
created new configuration in /tmp/tools/
@@ -730,68 +730,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+4 (required by libhello)
- new libprint/1.0.0+4 (required by libhello)
- new libhello/1.1.0+4 (required by hello)
- new hello/1.0.0+3
-continue? [Y/n] distributing libformat/1.0.0+4
-checked out libformat/1.0.0+4
-configured libformat/1.0.0+4
-distributing libprint/1.0.0+4
-checked out libprint/1.0.0+4
-configured libprint/1.0.0+4
-distributing libhello/1.1.0+4
-checked out libhello/1.1.0+4
-configured libhello/1.1.0+4
-distributing hello/1.0.0+3
-checked out hello/1.0.0+3
-configured hello/1.0.0+3
-version.in libprint-1.0.0+4/libprint/version.hxx.in
-c++ libprint-1.0.0+4/libprint/cxx{print}
-version.in libhello-1.1.0+4/libhello/version.hxx.in
-c++ libformat-1.0.0+4/libformat/cxx{format}
-version.in libformat-1.0.0+4/libformat/version.hxx.in
-c++ libhello-1.1.0+4/libhello/cxx{hello}
-c++ hello-1.0.0+3/hello/cxx{hello}
-ld libprint-1.0.0+4/libprint/libs{print}
-ld libformat-1.0.0+4/libformat/libs{format}
-ld libhello-1.1.0+4/libhello/libs{hello}
-ld hello-1.0.0+3/hello/exe{hello}
-updated hello/1.0.0+3
+ new libformat/1.0.0+5 (required by libhello)
+ new libprint/1.0.0+5 (required by libhello)
+ new libhello/1.1.0+5 (required by hello)
+ new hello/1.0.0+4
+continue? [Y/n] distributing libformat/1.0.0+5
+checked out libformat/1.0.0+5
+configured libformat/1.0.0+5
+distributing libprint/1.0.0+5
+checked out libprint/1.0.0+5
+configured libprint/1.0.0+5
+distributing libhello/1.1.0+5
+checked out libhello/1.1.0+5
+configured libhello/1.1.0+5
+distributing hello/1.0.0+4
+checked out hello/1.0.0+4
+configured hello/1.0.0+4
+version.in libhello-1.1.0+5/libhello/version.hxx.in
+version.in libprint-1.0.0+5/libprint/version.hxx.in
+version.in libformat-1.0.0+5/libformat/version.hxx.in
+c++ libprint-1.0.0+5/libprint/cxx{print}
+c++ libhello-1.1.0+5/libhello/cxx{hello}
+c++ hello-1.0.0+4/hello/cxx{hello}
+c++ libformat-1.0.0+5/libformat/cxx{format}
+ld libprint-1.0.0+5/libprint/libs{print}
+ld libformat-1.0.0+5/libformat/libs{format}
+ld libhello-1.1.0+5/libhello/libs{hello}
+ld hello-1.0.0+4/hello/exe{hello}
+updated hello/1.0.0+4
+ bpkg install hello
-ld libhello-1.1.0+4/libhello/libs{hello}
-ld hello-1.0.0+3/hello/exe{hello}
+ld libhello-1.1.0+5/libhello/libs{hello}
+ld hello-1.0.0+4/hello/exe{hello}
install /opt/tools/
install /opt/tools/include/
install /opt/tools/include/libhello/
-install libhello-1.1.0+4/libhello/hxx{export}
-install libhello-1.1.0+4/libhello/hxx{hello}
+install libhello-1.1.0+5/libhello/hxx{export}
+install libhello-1.1.0+5/libhello/hxx{hello}
install /opt/tools/share/
install /opt/tools/share/doc/
install /opt/tools/share/doc/libhello/
-install libhello-1.1.0+4/manifest{manifest}
-install libhello-1.1.0+4/libhello/hxx{version}
+install libhello-1.1.0+5/manifest{manifest}
+install libhello-1.1.0+5/libhello/hxx{version}
install /opt/tools/include/libprint/
-install libprint-1.0.0+4/libprint/hxx{print}
-install libprint-1.0.0+4/libprint/hxx{export}
+install libprint-1.0.0+5/libprint/hxx{print}
+install libprint-1.0.0+5/libprint/hxx{export}
install /opt/tools/share/doc/libprint/
-install libprint-1.0.0+4/manifest{manifest}
-install libprint-1.0.0+4/libprint/hxx{version}
-install libprint-1.0.0+4/libprint/libs{print}
+install libprint-1.0.0+5/manifest{manifest}
+install libprint-1.0.0+5/libprint/hxx{version}
+install libprint-1.0.0+5/libprint/libs{print}
install /opt/tools/include/libformat/
-install libformat-1.0.0+4/libformat/hxx{export}
-install libformat-1.0.0+4/libformat/hxx{format}
+install libformat-1.0.0+5/libformat/hxx{export}
+install libformat-1.0.0+5/libformat/hxx{format}
install /opt/tools/share/doc/libformat/
-install libformat-1.0.0+4/manifest{manifest}
-install libformat-1.0.0+4/libformat/hxx{version}
-install libformat-1.0.0+4/libformat/libs{format}
-install libhello-1.1.0+4/libhello/libs{hello}
+install libformat-1.0.0+5/manifest{manifest}
+install libformat-1.0.0+5/libformat/hxx{version}
+install libformat-1.0.0+5/libformat/libs{format}
+install libhello-1.1.0+5/libhello/libs{hello}
install /opt/tools/bin/
-install hello-1.0.0+3/hello/exe{hello}
+install hello-1.0.0+4/hello/exe{hello}
install /opt/tools/share/doc/hello/
-install hello-1.0.0+3/manifest{manifest}
-installed hello/1.0.0+3
+install hello-1.0.0+4/manifest{manifest}
+installed hello/1.0.0+4
+ /opt/tools/bin/hello World
Hello, World!
@@ -838,36 +838,36 @@ Hello, World!
13 directories, 23 files
+ bpkg uninstall hello
-uninstall hello-1.0.0+3/manifest{manifest}
+uninstall hello-1.0.0+4/manifest{manifest}
uninstall /opt/tools/share/doc/hello/
-uninstall hello-1.0.0+3/hello/exe{hello}
+uninstall hello-1.0.0+4/hello/exe{hello}
uninstall /opt/tools/bin/
-uninstall libhello-1.1.0+4/libhello/libs{hello}
-uninstall libformat-1.0.0+4/libformat/libs{format}
-uninstall libformat-1.0.0+4/libformat/hxx{version}
-uninstall libformat-1.0.0+4/manifest{manifest}
+uninstall libhello-1.1.0+5/libhello/libs{hello}
+uninstall libformat-1.0.0+5/libformat/libs{format}
+uninstall libformat-1.0.0+5/libformat/hxx{version}
+uninstall libformat-1.0.0+5/manifest{manifest}
uninstall /opt/tools/share/doc/libformat/
-uninstall libformat-1.0.0+4/libformat/hxx{format}
-uninstall libformat-1.0.0+4/libformat/hxx{export}
+uninstall libformat-1.0.0+5/libformat/hxx{format}
+uninstall libformat-1.0.0+5/libformat/hxx{export}
uninstall /opt/tools/include/libformat/
-uninstall libprint-1.0.0+4/libprint/libs{print}
-uninstall libprint-1.0.0+4/libprint/hxx{version}
-uninstall libprint-1.0.0+4/manifest{manifest}
+uninstall libprint-1.0.0+5/libprint/libs{print}
+uninstall libprint-1.0.0+5/libprint/hxx{version}
+uninstall libprint-1.0.0+5/manifest{manifest}
uninstall /opt/tools/share/doc/libprint/
-uninstall libprint-1.0.0+4/libprint/hxx{export}
-uninstall libprint-1.0.0+4/libprint/hxx{print}
+uninstall libprint-1.0.0+5/libprint/hxx{export}
+uninstall libprint-1.0.0+5/libprint/hxx{print}
uninstall /opt/tools/include/libprint/
-uninstall libhello-1.1.0+4/libhello/hxx{version}
-uninstall libhello-1.1.0+4/manifest{manifest}
+uninstall libhello-1.1.0+5/libhello/hxx{version}
+uninstall libhello-1.1.0+5/manifest{manifest}
uninstall /opt/tools/share/doc/libhello/
uninstall /opt/tools/share/doc/
uninstall /opt/tools/share/
-uninstall libhello-1.1.0+4/libhello/hxx{hello}
-uninstall libhello-1.1.0+4/libhello/hxx{export}
+uninstall libhello-1.1.0+5/libhello/hxx{hello}
+uninstall libhello-1.1.0+5/libhello/hxx{export}
uninstall /opt/tools/include/libhello/
uninstall /opt/tools/include/
uninstall /opt/tools/
-uninstalled hello/1.0.0+3
+uninstalled hello/1.0.0+4
+ bpkg drop hello
following dependencies were automatically built but will no longer be used:
diff --git a/version b/version
index 2400dfa..e9b5633 100755
--- a/version
+++ b/version
@@ -10,19 +10,19 @@ usage="usage: etc/version"
#
# NOTE: also update in 'bdep new'?
#
-build2_min=0.11.0
-bpkg_min=0.11.0
+build2_min=0.12.0
+bpkg_min=0.12.0
-ver=0.12.0-a.0.z
-#ver=0.12.0
+#ver=0.13.0-a.0.z
+ver=0.12.0
mods=(libstd-modules libbutl libbutl.bash libbpkg libbbot bpkg)
-odb_ver=2.5.0-b.16.z
-#odb_ver=2.5.0-b.17
+#odb_ver=2.5.0-b.18.z
+odb_ver=2.5.0-b.17
odb_mods=(libodb libodb-sqlite libodb-pgsql)
-xml_ver=1.1.0-b.7.z
-#xml_ver=1.1.0-b.7
+#xml_ver=1.1.0-b.8.z
+xml_ver=1.1.0-b.8
xml_mods=(libstudxml)
# @@ NOTE: libpkgconf version constraint in build2 is updated manually.