diff options
| -rw-r--r-- | intro2-tour.orig | 62 |
1 files changed, 30 insertions, 32 deletions
diff --git a/intro2-tour.orig b/intro2-tour.orig index 6bff2d3..e129845 100644 --- a/intro2-tour.orig +++ b/intro2-tour.orig @@ -39,7 +39,7 @@ int main (int argc, char* argv[]) libs = #import libs += libhello%lib{hello} -exe{hello}: {hxx ixx txx cxx}{*} $libs testscript +exe{hello}: {hxx ixx txx cxx}{**} $libs testscript cxx.poptions =+ "-I$out_root" "-I$src_root" @@ -61,9 +61,9 @@ version: 0.1.0-a.0.z summary: hello executable license: TODO url: https://example.org/hello -email: you@example.org -depends: * build2 >= 0.7.0- -depends: * bpkg >= 0.7.0- +email: boris@codesynthesis.com +depends: * build2 >= 0.8.0- +depends: * bpkg >= 0.8.0- #depends: libhello ^1.0.0 + bdep init -C ../hello-gcc @gcc cc config.cxx=g++ @@ -78,10 +78,8 @@ 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-gcc ../hello.git ++ ls -d -1 ../hello ../hello-clang ../hello-gcc ../hello.git ../hello -../hello1 -../hello1-gccX ../hello-clang ../hello-gcc ../hello.git @@ -239,7 +237,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% 28.5M=0s + b synchronizing /tmp/hello-gcc/: upgrade hello/0.1.0-a.0.19700101000000#2 @@ -268,7 +266,7 @@ synchronizing: new libhello/1.0.0 (required by hello) upgrade hello/0.1.0-a.0.19700101000000#1 - 0K ... 100% 97.2M=0s + 0K ... 100% 112M=0s + bdep test -ai in configuration @gcc: c++ ../hello-gcc/libhello-1.0.0/tests/basics/cxx{driver} @@ -279,14 +277,14 @@ 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/tests/basics/cxx{driver} c++ ../hello-clang/libhello-1.0.0/libhello/cxx{hello} +c++ ../hello-clang/libhello-1.0.0/tests/basics/cxx{driver} 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} -test hello/test{testscript}@../hello-clang/hello/hello/ ../hello-clang/hello/hello/exe{hello} +ld ../hello-clang/hello/hello/exe{hello} test ../hello-clang/libhello-1.0.0/tests/basics/exe{driver} +test hello/test{testscript}@../hello-clang/hello/hello/ ../hello-clang/hello/hello/exe{hello} + bdep status hello configured 0.1.0-a.0.19700101000000#2 available 0.1.0-a.0.19700101000000#3 @@ -299,7 +297,7 @@ synchronizing: new libhello/1.0.0 (required by hello) upgrade hello/0.1.0-a.0.19700101000000#4 - 0K ... 100% 99.7M=0s + 0K ... 100% 102M=0s + bdep fetch fetching git:build2.org/hello/libhello (prerequisite of dir:/tmp/hello) querying https://git.build2.org/hello/libhello.git @@ -351,10 +349,10 @@ synchronizing: + b install: libextra/ config.install.root=/tmp/unpkg-gcc 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/libs{extra} +ver libextra/libextra/version.hxx.in 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/ @@ -416,9 +414,9 @@ 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/libprint-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/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} @@ -432,8 +430,8 @@ 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/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} +test ../hello-gcc-1/libprint-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 save ../hello-gcc/build/config.build @@ -453,7 +451,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) 66961fe] Start hello project +[master (root-commit) f713ffe] Start hello project 11 files changed, 118 insertions(+) create mode 100644 .gitignore create mode 100644 build/.gitignore @@ -468,11 +466,11 @@ synchronizing: create mode 100644 repositories.manifest + bdep status -hello configured 0.1.0-a.0.19700101000000#5 available 0.1.0-a.0.20180529051315.66961fe310a1 +hello configured 0.1.0-a.0.19700101000000#5 available 0.1.0-a.0.20180702103820.f713ffeb9b5d + b info project: hello -version: 0.1.0-a.0.20180529051315.66961fe310a1 +version: 0.1.0-a.0.20180702103820.f713ffeb9b5d summary: hello executable url: https://example.org/hello src_root: /tmp/hello/ @@ -482,15 +480,15 @@ subprojects: + bdep sync synchronizing: - upgrade hello/0.1.0-a.0.20180529051315.66961fe310a1 + upgrade hello/0.1.0-a.0.20180702103820.f713ffeb9b5d + bdep status -hello configured 0.1.0-a.0.20180529051315.66961fe310a1 -[master 78de8c6] Another commit +hello configured 0.1.0-a.0.20180702103820.f713ffeb9b5d +[master bd54110] Another commit 1 file changed, 1 insertion(+) + bdep status -hello configured 0.1.0-a.0.20180529051315.66961fe310a1 available 0.1.0-a.0.20180529051315.78de8c6971b9 +hello configured 0.1.0-a.0.20180702103820.f713ffeb9b5d available 0.1.0-a.0.20180702103821.bd541109ff8c + bdep new -C hello-gcc @gcc -t exe -l c++ hello cc config.cxx=g++ created new executable project hello in /tmp/hello/ @@ -531,11 +529,11 @@ mkdir ../hello-gcc/hello/fsdir{hello/} mkdir ../hello-gcc/libhello/tests/fsdir{basics/} ver ../libhello/libhello/version.hxx.in 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/ +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/test{testscript}@../hello-gcc/hello/hello/ ../hello-gcc/hello/hello/exe{hello} test ../hello-gcc/libhello/tests/basics/exe{driver} @@ -580,15 +578,15 @@ synchronizing: synchronizing: upgrade hello/0.1.0-a.0.19700101000000#2 mkdir ../hello-gcc/libhello/fsdir{libhello/} -mkdir ../hello-gcc/libhello/tests/fsdir{basics/} mkdir ../hello-gcc/hello/fsdir{hello/} +mkdir ../hello-gcc/libhello/tests/fsdir{basics/} 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/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/hello/test{testscript}@../hello-gcc/hello/hello/ ../hello-gcc/hello/hello/exe{hello} test ../hello-gcc/libhello/tests/basics/exe{driver} @@ -628,8 +626,8 @@ 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} |