summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2018-07-25 10:45:25 (GMT)
committerBoris Kolpackov <boris@codesynthesis.com>2018-07-25 10:45:25 (GMT)
commit3a88c3b9a85f44eadc35c1df23a3633004b876fc (patch)
tree60c169fa16a726ae0d63da007185b111916cbf16
parent3cda1a6d423f1fd1c9e2117316b7124113a5d7d8 (diff)
Update intro scripts
-rw-r--r--intro2-tldr.orig6
-rwxr-xr-xintro2-tour1
-rw-r--r--intro2-tour.orig78
3 files changed, 43 insertions, 42 deletions
diff --git a/intro2-tldr.orig b/intro2-tldr.orig
index f8862ef..eb852d4 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) 7bff778] first commit
+[master (root-commit) 9a4b648] first commit
11 files changed, 99 insertions(+)
create mode 100644 .gitignore
create mode 100644 build/.gitignore
@@ -56,9 +56,9 @@ synchronizing /tmp/hello-gcc/:
new libhello/1.0.0 (required by hello)
upgrade hello/0.1.0#1
distributing libhello/1.0.0
-ver ../hello-gcc/libhello-1.0.0/libhello/version.hxx.in
-c++ ../hello-gcc/libhello-1.0.0/libhello/cxx{hello}
+version.in ../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}
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/
diff --git a/intro2-tour b/intro2-tour
index 38cd863..33ccc09 100755
--- a/intro2-tour
+++ b/intro2-tour
@@ -256,6 +256,7 @@ EOF
sed -i -re 's/^#import/import/' hello/buildfile
show bdep test -i
+cd ..
# Developing Multiple Packages and Projects (multi-package).
#
diff --git a/intro2-tour.orig b/intro2-tour.orig
index e129845..96b9e85 100644
--- a/intro2-tour.orig
+++ b/intro2-tour.orig
@@ -78,11 +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
../hello-clang
../hello-gcc
-../hello.git
+../hello-gcc-1
+ 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/
@@ -237,12 +237,12 @@ synchronizing:
new libhello/1.0.0 (required by hello)
upgrade hello/0.1.0-a.0.19700101000000#1
- 0K ... 100% 28.5M=0s
+ 0K ... 100% 43.1M=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
+version.in ../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/
ld ../hello-gcc/libhello-1.0.0/libhello/libs{hello}
@@ -266,7 +266,7 @@ synchronizing:
new libhello/1.0.0 (required by hello)
upgrade hello/0.1.0-a.0.19700101000000#1
- 0K ... 100% 112M=0s
+ 0K ... 100% 47.8M=0s
+ bdep test -ai
in configuration @gcc:
c++ ../hello-gcc/libhello-1.0.0/tests/basics/cxx{driver}
@@ -276,15 +276,15 @@ 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
+version.in ../hello-clang/libhello-1.0.0/libhello/version.hxx.in
+c++ hello/cxx{hello}@../hello-clang/hello/hello/
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/libhello-1.0.0/tests/basics/exe{driver}
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}
+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
@@ -297,7 +297,7 @@ synchronizing:
new libhello/1.0.0 (required by hello)
upgrade hello/0.1.0-a.0.19700101000000#4
- 0K ... 100% 102M=0s
+ 0K ... 100% 96.1M=0s
+ bdep fetch
fetching git:build2.org/hello/libhello (prerequisite of dir:/tmp/hello)
querying https://git.build2.org/hello/libhello.git
@@ -348,9 +348,9 @@ synchronizing:
+ b install: libextra/ config.install.root=/tmp/unpkg-gcc
mkdir libextra-gcc/libextra/fsdir{libextra/}
+version.in libextra/libextra/version.hxx.in
c++ libextra/libextra/cxx{extra}@libextra-gcc/libextra/libextra/
c++ libextra/libextra/cxx{extra}@libextra-gcc/libextra/libextra/
-ver libextra/libextra/version.hxx.in
ld libextra-gcc/libextra/libextra/liba{extra}
ld libextra-gcc/libextra/libextra/libs{extra}
install unpkg-gcc/
@@ -411,16 +411,16 @@ 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/libprint-1.0.0/libprint/version.hxx.in
-c++ ../hello-gcc-1/libprint-1.0.0/tests/basics/cxx{driver}
+version.in ../hello-gcc-1/libhello-1.1.0/libhello/version.hxx.in
+version.in ../hello-gcc-1/libformat-1.0.0/libformat/version.hxx.in
+version.in ../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/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/
+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}
@@ -429,8 +429,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/libhello-1.1.0/tests/basics/exe{driver}
test ../hello-gcc-1/libformat-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}
+ b configure: ../hello-gcc/ config.cc.poptions+=-I/tmp/unpkg-gcc/include config.cc.loptions+=-L/tmp/unpkg-gcc/lib
@@ -451,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) f713ffe] Start hello project
+[master (root-commit) d4c935e] Start hello project
11 files changed, 118 insertions(+)
create mode 100644 .gitignore
create mode 100644 build/.gitignore
@@ -466,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.20180702103820.f713ffeb9b5d
+hello configured 0.1.0-a.0.19700101000000#5 available 0.1.0-a.0.20180725104140.d4c935eb4bb6
+ b info
project: hello
-version: 0.1.0-a.0.20180702103820.f713ffeb9b5d
+version: 0.1.0-a.0.20180725104140.d4c935eb4bb6
summary: hello executable
url: https://example.org/hello
src_root: /tmp/hello/
@@ -480,15 +480,15 @@ subprojects:
+ bdep sync
synchronizing:
- upgrade hello/0.1.0-a.0.20180702103820.f713ffeb9b5d
+ upgrade hello/0.1.0-a.0.20180725104140.d4c935eb4bb6
+ bdep status
-hello configured 0.1.0-a.0.20180702103820.f713ffeb9b5d
-[master bd54110] Another commit
+hello configured 0.1.0-a.0.20180725104140.d4c935eb4bb6
+[master 6acc288] Another commit
1 file changed, 1 insertion(+)
+ bdep status
-hello configured 0.1.0-a.0.20180702103820.f713ffeb9b5d available 0.1.0-a.0.20180702103821.bd541109ff8c
+hello configured 0.1.0-a.0.20180725104140.d4c935eb4bb6 available 0.1.0-a.0.20180725104141.6acc2886fc59
+ bdep new -C hello-gcc @gcc -t exe -l c++ hello cc config.cxx=g++
created new executable project hello in /tmp/hello/
@@ -527,9 +527,9 @@ synchronizing:
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/cxx{hello}@../hello-gcc/hello/hello/
+version.in ../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/
ld ../hello-gcc/libhello/libhello/libs{hello}
ld ../hello-gcc/hello/hello/exe{hello}
@@ -538,21 +538,21 @@ test hello/test{testscript}@../hello-gcc/hello/hello/ ../hello-gcc/hello/hello/e
test ../hello-gcc/libhello/tests/basics/exe{driver}
+ bdep new -C hello-gcc @gcc -t exe -l c++ hello cc config.cxx=g++
-created new executable project hello in /tmp/hello/hello/
-created configuration @gcc /tmp/hello/hello-gcc/ 1 default,forwarded,auto-synchronized
+created new executable project hello in /tmp/hello/
+created configuration @gcc /tmp/hello-gcc/ 1 default,forwarded,auto-synchronized
synchronizing:
new hello/0.1.0-a.0.19700101000000
+ cd hello
+ bdep init -C ../hello-clang @clang cc config.cxx=clang++-5.0
-initializing in project /tmp/hello/hello/
-created configuration @clang /tmp/hello/hello-clang/ 2 auto-synchronized
+initializing in project /tmp/hello/
+created configuration @clang /tmp/hello-clang/ 2 auto-synchronized
synchronizing:
new hello/0.1.0-a.0.19700101000000
+ bdep new --package -t lib -l c++ libhello
-created new library package libhello in /tmp/hello/hello/libhello/
+created new library package libhello in /tmp/hello/libhello/
+ cat packages.manifest
: 1
@@ -561,7 +561,7 @@ location: libhello/
+ cd libhello
+ bdep init -a
-initializing in project /tmp/hello/hello/
+initializing in project /tmp/hello/
in configuration @gcc:
synchronizing:
upgrade hello/0.1.0-a.0.19700101000000#1
@@ -580,18 +580,18 @@ synchronizing:
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/
+version.in libhello/libhello/version.hxx.in
c++ libhello/libhello/cxx{hello}@../hello-gcc/libhello/libhello/
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}
+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}
+ 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/hello/hello/tools/
+created new configuration in /tmp/hello/tools/
+ cd tools
@@ -625,12 +625,12 @@ configured libhello/1.1.0
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 libprint-1.0.0/libprint/version.hxx.in
-ver libformat-1.0.0/libformat/version.hxx.in
+version.in libhello-1.1.0/libhello/version.hxx.in
+version.in libformat-1.0.0/libformat/version.hxx.in
+version.in 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}