summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xintro2-tour3
-rw-r--r--intro2-tour.orig106
2 files changed, 85 insertions, 24 deletions
diff --git a/intro2-tour b/intro2-tour
index aca5085..38cd863 100755
--- a/intro2-tour
+++ b/intro2-tour
@@ -67,6 +67,8 @@ show b
show b test
show hello/hello World
+show tree ../hello-gcc
+
show bdep status @clang
show b ../hello-clang/hello/
show b test: ../hello-clang/hello/
@@ -300,5 +302,6 @@ show cd tools
show bpkg build hello@https://git.build2.org/hello/hello.git
show bpkg install hello
show /opt/tools/bin/hello World
+show tree /opt/tools
show bpkg uninstall hello
show bpkg drop hello
diff --git a/intro2-tour.orig b/intro2-tour.orig
index 8bfceaf..6bff2d3 100644
--- a/intro2-tour.orig
+++ b/intro2-tour.orig
@@ -59,7 +59,7 @@ EOE
name: hello
version: 0.1.0-a.0.z
summary: hello executable
-license: proprietary
+license: TODO
url: https://example.org/hello
email: you@example.org
depends: * build2 >= 0.7.0-
@@ -78,15 +78,12 @@ created configuration @clang /tmp/hello-clang/ 2 auto-synchronized
synchronizing:
new hello/0.1.0-a.0.19700101000000
-+ ls -d -1 ../hello ../hello1 ../hello1-gccX ../hello-clang ../hello-clang1 ../hello-gcc ../hello-gcc1 ../hello-gccY ../hello.git
++ ls -d -1 ../hello ../hello1 ../hello1-gccX ../hello-clang ../hello-gcc ../hello.git
../hello
../hello1
../hello1-gccX
../hello-clang
-../hello-clang1
../hello-gcc
-../hello-gcc1
-../hello-gccY
../hello.git
+ bdep init -C ../hello-vc-debug @debug cc config.cxx=cl-15 config.cc.coptions=/MDd /Z7 config.cc.loptions=/DEBUG
@@ -116,6 +113,28 @@ test hello/test{testscript}@../hello-gcc/hello/hello/ ../hello-gcc/hello/hello/e
+ hello/hello World
Hello, World!
++ tree ../hello-gcc
+../hello-gcc
+├── build
+│   ├── bootstrap
+│   │   └── pre-bdep-sync.build
+│   ├── bootstrap.build
+│   ├── config.build
+│   └── root.build
+├── buildfile
+└── hello
+ ├── build
+ │   ├── bootstrap
+ │   │   └── src-root.build
+ │   └── config.build
+ └── hello
+ ├── hello
+ ├── hello.d
+ ├── hello.o
+ └── hello.o.d
+
+6 directories, 11 files
+
+ bdep status @clang
hello configured 0.1.0-a.0.19700101000000
@@ -220,7 +239,7 @@ synchronizing:
new libhello/1.0.0 (required by hello)
upgrade hello/0.1.0-a.0.19700101000000#1
- 0K ... 100% 98.3M=0s
+ 0K ... 100% 98.4M=0s
+ b
synchronizing /tmp/hello-gcc/:
upgrade hello/0.1.0-a.0.19700101000000#2
@@ -249,7 +268,7 @@ synchronizing:
new libhello/1.0.0 (required by hello)
upgrade hello/0.1.0-a.0.19700101000000#1
- 0K ... 100% 97.1M=0s
+ 0K ... 100% 97.2M=0s
+ bdep test -ai
in configuration @gcc:
c++ ../hello-gcc/libhello-1.0.0/tests/basics/cxx{driver}
@@ -260,8 +279,8 @@ test ../hello-gcc/libhello-1.0.0/tests/basics/exe{driver}
in configuration @clang:
mkdir ../hello-clang/hello/fsdir{hello/}
ver ../hello-clang/libhello-1.0.0/libhello/version.hxx.in
-c++ ../hello-clang/libhello-1.0.0/libhello/cxx{hello}
c++ ../hello-clang/libhello-1.0.0/tests/basics/cxx{driver}
+c++ ../hello-clang/libhello-1.0.0/libhello/cxx{hello}
c++ hello/cxx{hello}@../hello-clang/hello/hello/
ld ../hello-clang/libhello-1.0.0/libhello/libs{hello}
ld ../hello-clang/hello/hello/exe{hello}
@@ -280,7 +299,7 @@ synchronizing:
new libhello/1.0.0 (required by hello)
upgrade hello/0.1.0-a.0.19700101000000#4
- 0K ... 100% 99.3M=0s
+ 0K ... 100% 99.7M=0s
+ bdep fetch
fetching git:build2.org/hello/libhello (prerequisite of dir:/tmp/hello)
querying https://git.build2.org/hello/libhello.git
@@ -334,8 +353,8 @@ mkdir libextra-gcc/libextra/fsdir{libextra/}
c++ libextra/libextra/cxx{extra}@libextra-gcc/libextra/libextra/
ver libextra/libextra/version.hxx.in
c++ libextra/libextra/cxx{extra}@libextra-gcc/libextra/libextra/
-ld libextra-gcc/libextra/libextra/liba{extra}
ld libextra-gcc/libextra/libextra/libs{extra}
+ld libextra-gcc/libextra/libextra/liba{extra}
install unpkg-gcc/
install unpkg-gcc/include/
install unpkg-gcc/include/libextra/
@@ -397,12 +416,12 @@ mkdir ../hello-gcc-1/hello/fsdir{hello/}
ver ../hello-gcc-1/libhello-1.1.0/libhello/version.hxx.in
ver ../hello-gcc-1/libformat-1.0.0/libformat/version.hxx.in
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/libformat-1.0.0/libformat/cxx{format}
c++ ../hello-gcc-1/libprint-1.0.0/tests/basics/cxx{driver}
-c++ ../hello-gcc-1/libformat-1.0.0/tests/basics/cxx{driver}
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}
c++ hello/cxx{hello}@../hello-gcc-1/hello/hello/
ld ../hello-gcc-1/libprint-1.0.0/libprint/libs{print}
ld ../hello-gcc-1/libprint-1.0.0/tests/basics/exe{driver}
@@ -412,8 +431,8 @@ ld ../hello-gcc-1/libhello-1.1.0/libhello/libs{hello}
ld ../hello-gcc-1/libhello-1.1.0/tests/basics/exe{driver}
ld ../hello-gcc-1/hello/hello/exe{hello}
test hello/test{testscript}@../hello-gcc-1/hello/hello/ ../hello-gcc-1/hello/hello/exe{hello}
-test ../hello-gcc-1/libprint-1.0.0/tests/basics/exe{driver}
test ../hello-gcc-1/libhello-1.1.0/tests/basics/exe{driver}
+test ../hello-gcc-1/libprint-1.0.0/tests/basics/exe{driver}
test ../hello-gcc-1/libformat-1.0.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
@@ -434,7 +453,7 @@ test hello/test{testscript}@../hello-gcc/hello/hello/ ../hello-gcc/hello/hello/e
synchronizing:
configure sys:libsqlite3/*
upgrade hello/0.1.0-a.0.19700101000000#5
-[master (root-commit) f892555] Start hello project
+[master (root-commit) 66961fe] Start hello project
11 files changed, 118 insertions(+)
create mode 100644 .gitignore
create mode 100644 build/.gitignore
@@ -449,11 +468,11 @@ synchronizing:
create mode 100644 repositories.manifest
+ bdep status
-hello configured 0.1.0-a.0.19700101000000#5 available 0.1.0-a.0.20180522061352.f8925550d04d
+hello configured 0.1.0-a.0.19700101000000#5 available 0.1.0-a.0.20180529051315.66961fe310a1
+ b info
project: hello
-version: 0.1.0-a.0.20180522061352.f8925550d04d
+version: 0.1.0-a.0.20180529051315.66961fe310a1
summary: hello executable
url: https://example.org/hello
src_root: /tmp/hello/
@@ -463,15 +482,15 @@ subprojects:
+ bdep sync
synchronizing:
- upgrade hello/0.1.0-a.0.20180522061352.f8925550d04d
+ upgrade hello/0.1.0-a.0.20180529051315.66961fe310a1
+ bdep status
-hello configured 0.1.0-a.0.20180522061352.f8925550d04d
-[master 5738026] Another commit
+hello configured 0.1.0-a.0.20180529051315.66961fe310a1
+[master 78de8c6] Another commit
1 file changed, 1 insertion(+)
+ bdep status
-hello configured 0.1.0-a.0.20180522061352.f8925550d04d available 0.1.0-a.0.20180522061353.5738026448c3
+hello configured 0.1.0-a.0.20180529051315.66961fe310a1 available 0.1.0-a.0.20180529051315.78de8c6971b9
+ bdep new -C hello-gcc @gcc -t exe -l c++ hello cc config.cxx=g++
created new executable project hello in /tmp/hello/
@@ -511,12 +530,12 @@ mkdir ../hello-gcc/libhello/fsdir{libhello/}
mkdir ../hello-gcc/hello/fsdir{hello/}
mkdir ../hello-gcc/libhello/tests/fsdir{basics/}
ver ../libhello/libhello/version.hxx.in
-c++ ../libhello/libhello/cxx{hello}@../hello-gcc/libhello/libhello/
c++ 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/
ld ../hello-gcc/libhello/libhello/libs{hello}
-ld ../hello-gcc/hello/hello/exe{hello}
ld ../hello-gcc/libhello/tests/basics/exe{driver}
+ld ../hello-gcc/hello/hello/exe{hello}
test hello/test{testscript}@../hello-gcc/hello/hello/ ../hello-gcc/hello/hello/exe{hello}
test ../hello-gcc/libhello/tests/basics/exe{driver}
@@ -564,12 +583,12 @@ mkdir ../hello-gcc/libhello/fsdir{libhello/}
mkdir ../hello-gcc/libhello/tests/fsdir{basics/}
mkdir ../hello-gcc/hello/fsdir{hello/}
ver libhello/libhello/version.hxx.in
+c++ libhello/tests/basics/cxx{driver}@../hello-gcc/libhello/tests/basics/
c++ libhello/libhello/cxx{hello}@../hello-gcc/libhello/libhello/
c++ hello/hello/cxx{hello}@../hello-gcc/hello/hello/
-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}
+ld ../hello-gcc/hello/hello/exe{hello}
test hello/hello/test{testscript}@../hello-gcc/hello/hello/ ../hello-gcc/hello/hello/exe{hello}
test ../hello-gcc/libhello/tests/basics/exe{driver}
@@ -656,6 +675,45 @@ installed hello/1.0.0
+ /opt/tools/bin/hello World
Hello, World!
++ tree /opt/tools
+/opt/tools
+├── bin
+│   └── hello
+├── include
+│   ├── libformat
+│   │   ├── export.hxx
+│   │   ├── format.hxx
+│   │   └── version.hxx
+│   ├── libhello
+│   │   ├── export.hxx
+│   │   ├── hello.hxx
+│   │   └── version.hxx
+│   └── libprint
+│   ├── export.hxx
+│   ├── print.hxx
+│   └── version.hxx
+├── lib
+│   ├── libformat-1.0.so
+│   ├── libformat.so -> libformat-1.0.so
+│   ├── libhello-1.1.so
+│   ├── libhello.so -> libhello-1.1.so
+│   ├── libprint-1.0.so
+│   ├── libprint.so -> libprint-1.0.so
+│   └── pkgconfig
+│   ├── libformat.shared.pc
+│   ├── libhello.shared.pc
+│   └── libprint.shared.pc
+└── share
+ └── doc
+ ├── libformat
+ │   └── manifest
+ ├── libhello
+ │   └── manifest
+ └── libprint
+ └── manifest
+
+12 directories, 22 files
+
+ bpkg uninstall hello
uninstall hello-1.0.0/hello/exe{hello}
uninstall /opt/tools/bin/