diff options
| -rw-r--r-- | intro2-tldr.orig | 4 | ||||
| -rw-r--r-- | intro2-tour.orig | 79 |
2 files changed, 46 insertions, 37 deletions
diff --git a/intro2-tldr.orig b/intro2-tldr.orig index 02a2f65..a4e19fa 100644 --- a/intro2-tldr.orig +++ b/intro2-tldr.orig @@ -1,5 +1,5 @@ created new executable project hello in /tmp/hello.git/ -[master (root-commit) 6782952] first commit +[master (root-commit) 6874b82] first commit 11 files changed, 99 insertions(+) create mode 100644 .gitignore create mode 100644 build/.gitignore @@ -34,7 +34,7 @@ hello + cd hello + bdep init --config-create ../hello-gcc cc config.cxx=g++ -initializing project /tmp/hello/ +initializing in project /tmp/hello/ created configuration /tmp/hello-gcc/ (1, default, forwarded, auto-synchronized) synchronizing: new hello/0.1.0 diff --git a/intro2-tour.orig b/intro2-tour.orig index 48228aa..714eb2c 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 test{testscript} +exe{hello}: {hxx ixx txx cxx}{*} $libs testscript cxx.poptions =+ "-I$out_root" "-I$src_root" @@ -58,7 +58,7 @@ EOE : 1 name: hello version: 0.1.0-a.0.z -summary: hello executable project +summary: hello executable license: proprietary url: https://example.org/hello email: you@example.org @@ -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 ++ ls -d -1 ../hello ../hello-clang ../hello-gcc ../hello.git ../hello ../hello-clang ../hello-gcc +../hello.git + bdep init -C ../hello-vc-debug @debug cc config.cxx=cl-15 config.cc.coptions=/MDd /Z7 config.cc.loptions=/DEBUG initializing in project /tmp/hello/ @@ -214,14 +215,14 @@ synchronizing: new libhello/1.0.0 (required by hello) upgrade hello/0.1.0-a.0.19700101000000#1 - 0K ... 100% 101M=0s + 0K ... 100% 100M=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-gcc/libhello-1.0.0/libhello/cxx{hello} c++ hello/cxx{hello}@../hello-gcc/hello/hello/ +c++ ../hello-gcc/libhello-1.0.0/libhello/cxx{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/ @@ -243,7 +244,7 @@ synchronizing: new libhello/1.0.0 (required by hello) upgrade hello/0.1.0-a.0.19700101000000#1 - 0K ... 100% 95.1M=0s + 0K ... 100% 100M=0s + bdep test -ai in configuration @gcc: c++ ../hello-gcc/libhello-1.0.0/tests/basics/cxx{driver} @@ -260,8 +261,8 @@ 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-clang/libhello-1.0.0/tests/basics/exe{driver} 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} + bdep status hello configured 0.1.0-a.0.19700101000000#2 available 0.1.0-a.0.19700101000000#3 @@ -274,7 +275,7 @@ synchronizing: new libhello/1.0.0 (required by hello) upgrade hello/0.1.0-a.0.19700101000000#4 - 0K ... 100% 94.7M=0s + 0K ... 100% 97.8M=0s + bdep fetch fetching git:build2.org/hello/libhello (prerequisite of dir:/tmp/hello) querying https://git.build2.org/hello/libhello.git @@ -335,6 +336,10 @@ install unpkg-gcc/include/ install unpkg-gcc/include/libextra/ install libextra/libextra/hxx{export}@libextra-gcc/libextra/libextra/ install libextra/libextra/hxx{extra}@libextra-gcc/libextra/libextra/ +install unpkg-gcc/share/ +install unpkg-gcc/share/doc/ +install unpkg-gcc/share/doc/libextra/ +install libextra/manifest{manifest}@libextra-gcc/libextra/ install libextra-gcc/libextra/libextra/hxx{version} install libextra-gcc/libextra/libextra/liba{extra} install libextra-gcc/libextra/libextra/libs{extra} @@ -346,15 +351,19 @@ unpkg-gcc │ ├── export.hxx │ ├── extra.hxx │ └── version.hxx -└── lib - ├── libextra-0.1.0-a.0.19700101000000.so - ├── libextra.a - ├── libextra.so -> libextra-0.1.0-a.0.19700101000000.so - └── pkgconfig - ├── libextra.shared.pc - └── libextra.static.pc - -4 directories, 8 files +├── lib +│ ├── libextra-0.1.0-a.0.19700101000000.so +│ ├── libextra.a +│ ├── libextra.so -> libextra-0.1.0-a.0.19700101000000.so +│ └── pkgconfig +│ ├── libextra.shared.pc +│ └── libextra.static.pc +└── share + └── doc + └── libextra + └── manifest + +7 directories, 9 files + bdep init -C ../hello-gcc-1 @gcc1 cc config.cxx=g++ config.cc.poptions=-I/tmp/unpkg-gcc/include config.cc.loptions=-L/tmp/unpkg-gcc/lib initializing in project /tmp/hello/ @@ -380,14 +389,14 @@ distributing libhello/1.1.0 + b test: ../hello-gcc-1/ 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/libhello-1.1.0/libhello/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/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/libprint-1.0.0/tests/basics/cxx{driver} 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/cxx{hello}@../hello-gcc-1/hello/hello/ ld ../hello-gcc-1/libprint-1.0.0/libprint/libs{print} @@ -397,8 +406,8 @@ 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} -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/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-gcc-1/libhello-1.1.0/tests/basics/exe{driver} @@ -420,7 +429,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) 3743acb] Start hello project +[master (root-commit) 1e23c88] Start hello project 11 files changed, 118 insertions(+) create mode 100644 .gitignore create mode 100644 build/.gitignore @@ -435,12 +444,12 @@ synchronizing: create mode 100644 repositories.manifest + bdep status -hello configured 0.1.0-a.0.19700101000000#5 available 0.1.0-a.0.20180514120938.3743acb50ddf +hello configured 0.1.0-a.0.19700101000000#5 available 0.1.0-a.0.20180519140826.1e23c888dd2a + b info project: hello -version: 0.1.0-a.0.20180514120938.3743acb50ddf -summary: hello executable project +version: 0.1.0-a.0.20180519140826.1e23c888dd2a +summary: hello executable url: https://example.org/hello src_root: /tmp/hello/ out_root: /tmp/hello-gcc/hello/ @@ -449,15 +458,15 @@ subprojects: + bdep sync synchronizing: - upgrade hello/0.1.0-a.0.20180514120938.3743acb50ddf + upgrade hello/0.1.0-a.0.20180519140826.1e23c888dd2a + bdep status -hello configured 0.1.0-a.0.20180514120938.3743acb50ddf -[master 366545b] Another commit +hello configured 0.1.0-a.0.20180519140826.1e23c888dd2a +[master 15aa9a4] Another commit 1 file changed, 1 insertion(+) + bdep status -hello configured 0.1.0-a.0.20180514120938.3743acb50ddf available 0.1.0-a.0.20180514120939.366545be657d +hello configured 0.1.0-a.0.20180519140826.1e23c888dd2a available 0.1.0-a.0.20180519140827.15aa9a4ede05 + bdep new -C hello-gcc @gcc -t exe -l c++ hello cc config.cxx=g++ created new executable project hello in /tmp/hello/ @@ -494,15 +503,15 @@ synchronizing: synchronizing: upgrade hello/0.1.0-a.0.19700101000000#1 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/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} @@ -550,12 +559,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++ hello/hello/cxx{hello}@../hello-gcc/hello/hello/ 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/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} @@ -598,8 +607,8 @@ 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++ 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} |