diff options
| -rw-r--r-- | intro2-tour.orig | 77 |
1 files changed, 47 insertions, 30 deletions
diff --git a/intro2-tour.orig b/intro2-tour.orig index 714eb2c..6406f61 100644 --- a/intro2-tour.orig +++ b/intro2-tour.orig @@ -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 ../hello.git ++ ls -d -1 ../hello ../hello-clang ../hello-gcc ../hello-gcc-1 ../hello.git ../hello ../hello-clang ../hello-gcc +../hello-gcc-1 ../hello.git + bdep init -C ../hello-vc-debug @debug cc config.cxx=cl-15 config.cc.coptions=/MDd /Z7 config.cc.loptions=/DEBUG @@ -187,10 +188,10 @@ 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 -libmhello/1.0.0 libhello/1.1.0 libmhello/1.1.0 +libhello/1.0.0 +libmhello/1.0.0 + bpkg rep-info https://git.build2.org/hello/libhello.git#HEAD querying https://git.build2.org/hello/libhello.git @@ -215,14 +216,14 @@ synchronizing: new libhello/1.0.0 (required by hello) upgrade hello/0.1.0-a.0.19700101000000#1 - 0K ... 100% 100M=0s + 0K ... 100% 101M=0s + b synchronizing /tmp/hello-gcc/: upgrade hello/0.1.0-a.0.19700101000000#2 mkdir ../hello-gcc/hello/fsdir{hello/} ver ../hello-gcc/libhello-1.0.0/libhello/version.hxx.in -c++ hello/cxx{hello}@../hello-gcc/hello/hello/ c++ ../hello-gcc/libhello-1.0.0/libhello/cxx{hello} +c++ hello/cxx{hello}@../hello-gcc/hello/hello/ 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/ @@ -244,23 +245,23 @@ synchronizing: new libhello/1.0.0 (required by hello) upgrade hello/0.1.0-a.0.19700101000000#1 - 0K ... 100% 100M=0s + 0K ... 100% 98.1M=0s + bdep test -ai in configuration @gcc: c++ ../hello-gcc/libhello-1.0.0/tests/basics/cxx{driver} ld ../hello-gcc/libhello-1.0.0/tests/basics/exe{driver} -test hello/test{testscript}@../hello-gcc/hello/hello/ ../hello-gcc/hello/hello/exe{hello} test ../hello-gcc/libhello-1.0.0/tests/basics/exe{driver} +test hello/test{testscript}@../hello-gcc/hello/hello/ ../hello-gcc/hello/hello/exe{hello} 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} ld ../hello-clang/libhello-1.0.0/tests/basics/exe{driver} +ld ../hello-clang/hello/hello/exe{hello} test hello/test{testscript}@../hello-clang/hello/hello/ ../hello-clang/hello/hello/exe{hello} test ../hello-clang/libhello-1.0.0/tests/basics/exe{driver} @@ -275,7 +276,7 @@ synchronizing: new libhello/1.0.0 (required by hello) upgrade hello/0.1.0-a.0.19700101000000#4 - 0K ... 100% 97.8M=0s + 0K ... 100% 17.9M=0s + bdep fetch fetching git:build2.org/hello/libhello (prerequisite of dir:/tmp/hello) querying https://git.build2.org/hello/libhello.git @@ -329,8 +330,8 @@ mkdir libextra-gcc/libextra/fsdir{libextra/} ver 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} ld 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/ @@ -389,23 +390,23 @@ distributing libhello/1.1.0 + b test: ../hello-gcc-1/ mkdir ../hello-gcc-1/hello/fsdir{hello/} -ver ../hello-gcc-1/libformat-1.0.0/libformat/version.hxx.in 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/libprint-1.0.0/libprint/cxx{print} -c++ ../hello-gcc-1/libformat-1.0.0/tests/basics/cxx{driver} c++ ../hello-gcc-1/libprint-1.0.0/tests/basics/cxx{driver} -c++ ../hello-gcc-1/libformat-1.0.0/libformat/cxx{format} +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/libhello-1.1.0/libhello/cxx{hello} -c++ ../hello-gcc-1/libhello-1.1.0/tests/basics/cxx{driver} c++ hello/cxx{hello}@../hello-gcc-1/hello/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/libhello-1.1.0/tests/basics/exe{driver} ld ../hello-gcc-1/hello/hello/exe{hello} +ld ../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/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} @@ -429,7 +430,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) 1e23c88] Start hello project +[master (root-commit) da9ce5a] Start hello project 11 files changed, 118 insertions(+) create mode 100644 .gitignore create mode 100644 build/.gitignore @@ -444,11 +445,11 @@ synchronizing: create mode 100644 repositories.manifest + bdep status -hello configured 0.1.0-a.0.19700101000000#5 available 0.1.0-a.0.20180519140826.1e23c888dd2a +hello configured 0.1.0-a.0.19700101000000#5 available 0.1.0-a.0.20180519161919.da9ce5af2580 + b info project: hello -version: 0.1.0-a.0.20180519140826.1e23c888dd2a +version: 0.1.0-a.0.20180519161919.da9ce5af2580 summary: hello executable url: https://example.org/hello src_root: /tmp/hello/ @@ -458,15 +459,15 @@ subprojects: + bdep sync synchronizing: - upgrade hello/0.1.0-a.0.20180519140826.1e23c888dd2a + upgrade hello/0.1.0-a.0.20180519161919.da9ce5af2580 + bdep status -hello configured 0.1.0-a.0.20180519140826.1e23c888dd2a -[master 15aa9a4] Another commit +hello configured 0.1.0-a.0.20180519161919.da9ce5af2580 +[master 0ccbfca] Another commit 1 file changed, 1 insertion(+) + bdep status -hello configured 0.1.0-a.0.20180519140826.1e23c888dd2a available 0.1.0-a.0.20180519140827.15aa9a4ede05 +hello configured 0.1.0-a.0.20180519161919.da9ce5af2580 available 0.1.0-a.0.20180519161920.0ccbfca20556 + bdep new -C hello-gcc @gcc -t exe -l c++ hello cc config.cxx=g++ created new executable project hello in /tmp/hello/ @@ -506,12 +507,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/libhello/tests/basics/exe{driver} ld ../hello-gcc/hello/hello/exe{hello} +ld ../hello-gcc/libhello/tests/basics/exe{driver} test hello/test{testscript}@../hello-gcc/hello/hello/ ../hello-gcc/hello/hello/exe{hello} test ../hello-gcc/libhello/tests/basics/exe{driver} @@ -556,12 +557,12 @@ 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/} ver 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/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/hello/hello/exe{hello} ld ../hello-gcc/libhello/tests/basics/exe{driver} @@ -606,10 +607,10 @@ 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 -c++ libprint-1.0.0/libprint/cxx{print} +c++ hello-1.0.0/hello/cxx{hello} c++ libformat-1.0.0/libformat/cxx{format} +c++ libprint-1.0.0/libprint/cxx{print} 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} ld libhello-1.1.0/libhello/libs{hello} @@ -624,15 +625,23 @@ install /opt/tools/include/ install /opt/tools/include/libhello/ install libhello-1.1.0/libhello/hxx{export} install libhello-1.1.0/libhello/hxx{hello} +install /opt/tools/share/ +install /opt/tools/share/doc/ +install /opt/tools/share/doc/libhello/ +install libhello-1.1.0/manifest{manifest} install libhello-1.1.0/libhello/hxx{version} install /opt/tools/include/libprint/ install libprint-1.0.0/libprint/hxx{print} install libprint-1.0.0/libprint/hxx{export} +install /opt/tools/share/doc/libprint/ +install libprint-1.0.0/manifest{manifest} install libprint-1.0.0/libprint/hxx{version} install libprint-1.0.0/libprint/libs{print} install /opt/tools/include/libformat/ install libformat-1.0.0/libformat/hxx{export} install libformat-1.0.0/libformat/hxx{format} +install /opt/tools/share/doc/libformat/ +install libformat-1.0.0/manifest{manifest} install libformat-1.0.0/libformat/hxx{version} install libformat-1.0.0/libformat/libs{format} install libhello-1.1.0/libhello/libs{hello} @@ -649,15 +658,23 @@ uninstall /opt/tools/bin/ uninstall libhello-1.1.0/libhello/libs{hello} uninstall libformat-1.0.0/libformat/libs{format} uninstall libformat-1.0.0/libformat/hxx{version} +uninstall libformat-1.0.0/manifest{manifest} +uninstall /opt/tools/share/doc/libformat/ uninstall libformat-1.0.0/libformat/hxx{format} uninstall libformat-1.0.0/libformat/hxx{export} uninstall /opt/tools/include/libformat/ uninstall libprint-1.0.0/libprint/libs{print} uninstall libprint-1.0.0/libprint/hxx{version} +uninstall libprint-1.0.0/manifest{manifest} +uninstall /opt/tools/share/doc/libprint/ uninstall libprint-1.0.0/libprint/hxx{export} uninstall libprint-1.0.0/libprint/hxx{print} uninstall /opt/tools/include/libprint/ uninstall libhello-1.1.0/libhello/hxx{version} +uninstall libhello-1.1.0/manifest{manifest} +uninstall /opt/tools/share/doc/libhello/ +uninstall /opt/tools/share/doc/ +uninstall /opt/tools/share/ uninstall libhello-1.1.0/libhello/hxx{hello} uninstall libhello-1.1.0/libhello/hxx{export} uninstall /opt/tools/include/libhello/ |