summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2019-11-13 14:48:41 (GMT)
committerBoris Kolpackov <boris@codesynthesis.com>2019-11-13 14:48:41 (GMT)
commit8781778697abd0af08d98435c302c16f8b163e16 (patch)
treeed6b2151ec1c96c8224d943edee77f69edca36f4
parent6c7c9ae1f05e04a7dfc2dc462aad252f6c9622c6 (diff)
Add libbuild2-hello to stage script
-rwxr-xr-xstage13
1 files changed, 11 insertions, 2 deletions
diff --git a/stage b/stage
index f748e28..d0717ed 100755
--- a/stage
+++ b/stage
@@ -32,6 +32,12 @@ b --version >/dev/null
bpkg --version >/dev/null
bdep --version >/dev/null
+# Make sure the build system if up to date (otherwise update will be triggered
+# by libbuild2-hello distribution).
+#
+b build2/build2/
+b --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.
@@ -286,7 +292,6 @@ etc/stage-pkg -c $mode -d odb \
../odb/builds/default/libodb-boost \
../odb/builds/default/libodb-qt
-
etc/stage-pkg -c $mode build2 \
libbutl \
libbutl.bash \
@@ -298,7 +303,11 @@ etc/stage-pkg -c $mode build2 \
libbbot \
brep \
bbot \
- openssl-agent
+ openssl-agent \
+ libbuild2-hello/libbuild2-hello \
+ libbuild2-hello/libbuild2-hello-tests
+
+
# msvc-linux
# libstd-modules