summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2018-05-10 14:47:43 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2018-05-10 14:48:38 +0200
commitd522e894f5ae1e899da5a23f0cfcafd2bd331797 (patch)
treee9dcef8da75ac9950c91765690b52d08f638a86e
parent4d18b3968b7b18b7da63da5a35733df638c744c0 (diff)
Add command for Using System-Installed Dependencies section to intro2-tour
-rwxr-xr-xintro2-tour14
-rw-r--r--intro2-tour.orig41
2 files changed, 36 insertions, 19 deletions
diff --git a/intro2-tour b/intro2-tour
index 2a2c8bc..d457b7a 100755
--- a/intro2-tour
+++ b/intro2-tour
@@ -163,7 +163,7 @@ show bdep status -r
show bdep status -o libhello
show bdep sync libhello/1.0.0
-# Unpackaged Dependencies.
+# Using Unpackaged Dependencies.
#
cd ..
rm -rf libextra libextra-gcc unpkg-gcc hello-gcc-1
@@ -193,6 +193,18 @@ config.cc.poptions+=-I$tmp/unpkg-gcc/include \
config.cc.loptions+=-L$tmp/unpkg-gcc/lib
show b test
+# Using System-Installed Dependencies.
+#
+cat <<EOF >>manifest
+depends: libsqlite3 ^3.18.0
+EOF
+sed -i -re 's/^import libs =/import libs = libsqlite3%lib{sqlite3}/' hello/buildfile
+cat <<EOF >>hello/hello.cxx
+#include <sqlite3.h>
+EOF
+
+show bdep sync ?sys:libsqlite3
+
# Versioning and Release Management.
#
git add .
diff --git a/intro2-tour.orig b/intro2-tour.orig
index 224e86f..9d7d50a 100644
--- a/intro2-tour.orig
+++ b/intro2-tour.orig
@@ -194,7 +194,7 @@ synchronizing:
new libhello/1.0.0 (required by hello)
upgrade hello/0.1.0-a.0.19700101000000#1
- 0K ... 100% 107M=0s
+ 0K ... 100% 101M=0s
+ b
synchronizing /tmp/hello-gcc/:
upgrade hello/0.1.0-a.0.19700101000000#2
@@ -223,7 +223,7 @@ synchronizing:
new libhello/1.0.0 (required by hello)
upgrade hello/0.1.0-a.0.19700101000000#1
- 0K ... 100% 98.4M=0s
+ 0K ... 100% 100M=0s
+ bdep status
hello configured 0.1.0-a.0.19700101000000#2 available 0.1.0-a.0.19700101000000#3
@@ -235,7 +235,7 @@ synchronizing:
new libhello/1.0.0 (required by hello)
upgrade hello/0.1.0-a.0.19700101000000#4
- 0K ... 100% 87.8M=0s
+ 0K ... 100% 110M=0s
+ bdep fetch
fetching git:build2.org/hello/libhello (prerequisite of dir:/tmp/hello)
querying https://git.build2.org/hello/libhello.git
@@ -347,21 +347,21 @@ ver ../hello-gcc-1/libprint-1.0.0/libprint/version.hxx.in
c++ ../hello-gcc-1/libformat-1.0.0/tests/basics/cxx{driver}
c++ ../hello-gcc-1/libprint-1.0.0/libprint/cxx{print}
c++ ../hello-gcc-1/libprint-1.0.0/tests/basics/cxx{driver}
-c++ ../hello-gcc-1/libhello-1.1.0/libhello/cxx{hello}
c++ hello/cxx{hello}@../hello-gcc-1/hello/hello/
-c++ ../hello-gcc-1/libformat-1.0.0/libformat/cxx{format}
+c++ ../hello-gcc-1/libhello-1.1.0/libhello/cxx{hello}
c++ ../hello-gcc-1/libhello-1.1.0/tests/basics/cxx{driver}
+c++ ../hello-gcc-1/libformat-1.0.0/libformat/cxx{format}
ld ../hello-gcc-1/libprint-1.0.0/libprint/libs{print}
ld ../hello-gcc-1/libprint-1.0.0/tests/basics/exe{driver}
ld ../hello-gcc-1/libformat-1.0.0/libformat/libs{format}
ld ../hello-gcc-1/libformat-1.0.0/tests/basics/exe{driver}
ld ../hello-gcc-1/libhello-1.1.0/libhello/libs{hello}
-ld ../hello-gcc-1/hello/hello/exe{hello}
ld ../hello-gcc-1/libhello-1.1.0/tests/basics/exe{driver}
-test ../hello-gcc-1/libhello-1.1.0/tests/basics/exe{driver}
+ld ../hello-gcc-1/hello/hello/exe{hello}
test ../hello-gcc-1/libprint-1.0.0/tests/basics/exe{driver}
-test hello/test{testscript}@../hello-gcc-1/hello/hello/ ../hello-gcc-1/hello/hello/exe{hello}
test ../hello-gcc-1/libformat-1.0.0/tests/basics/exe{driver}
+test hello/test{testscript}@../hello-gcc-1/hello/hello/ ../hello-gcc-1/hello/hello/exe{hello}
+test ../hello-gcc-1/libhello-1.1.0/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
@@ -376,8 +376,13 @@ ld ../hello-gcc/libhello-1.0.0/libhello/libs{hello}
ld ../hello-gcc/hello/hello/exe{hello}
ln ../hello-gcc/hello/hello/exe{hello} -> hello/
test hello/test{testscript}@../hello-gcc/hello/hello/ ../hello-gcc/hello/hello/exe{hello}
-[master (root-commit) cf3bc7a] Start hello project
- 11 files changed, 116 insertions(+)
+
++ bdep sync ?sys:libsqlite3
+synchronizing:
+ configure sys:libsqlite3/*
+ upgrade hello/0.1.0-a.0.19700101000000#5
+[master (root-commit) 5b25d75] Start hello project
+ 11 files changed, 118 insertions(+)
create mode 100644 .gitignore
create mode 100644 build/.gitignore
create mode 100644 build/bootstrap.build
@@ -391,11 +396,11 @@ test hello/test{testscript}@../hello-gcc/hello/hello/ ../hello-gcc/hello/hello/e
create mode 100644 repositories.manifest
+ bdep status
-hello configured 0.1.0-a.0.19700101000000#4 available 0.1.0-a.0.20180509125102.cf3bc7a9e17f
+hello configured 0.1.0-a.0.19700101000000#5 available 0.1.0-a.0.20180510124033.5b25d75685ae
+ b info
project: hello
-version: 0.1.0-a.0.20180509125102.cf3bc7a9e17f
+version: 0.1.0-a.0.20180510124033.5b25d75685ae
summary: hello executable project
url: https://example.org/hello
src_root: /tmp/hello/
@@ -405,15 +410,15 @@ subprojects:
+ bdep sync
synchronizing:
- upgrade hello/0.1.0-a.0.20180509125102.cf3bc7a9e17f
+ upgrade hello/0.1.0-a.0.20180510124033.5b25d75685ae
+ bdep status
-hello configured 0.1.0-a.0.20180509125102.cf3bc7a9e17f
-[master aa6d12e] Another commit
+hello configured 0.1.0-a.0.20180510124033.5b25d75685ae
+[master eb8aa04] Another commit
1 file changed, 1 insertion(+)
+ bdep status
-hello configured 0.1.0-a.0.20180509125102.cf3bc7a9e17f available 0.1.0-a.0.20180509125103.aa6d12e561fe
+hello configured 0.1.0-a.0.20180510124033.5b25d75685ae available 0.1.0-a.0.20180510124033.eb8aa0400c02
+ 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/
@@ -451,11 +456,11 @@ distributing hello/1.0.0
checked out hello/1.0.0
configured hello/1.0.0
ver libhello-1.1.0/libhello/version.hxx.in
-ver libformat-1.0.0/libformat/version.hxx.in
ver libprint-1.0.0/libprint/version.hxx.in
+ver libformat-1.0.0/libformat/version.hxx.in
c++ libprint-1.0.0/libprint/cxx{print}
-c++ libhello-1.1.0/libhello/cxx{hello}
c++ libformat-1.0.0/libformat/cxx{format}
+c++ libhello-1.1.0/libhello/cxx{hello}
c++ hello-1.0.0/hello/cxx{hello}
ld libprint-1.0.0/libprint/libs{print}
ld libformat-1.0.0/libformat/libs{format}