Update intro script/output with new commands

2 files changed, 120 insertions, 36 deletions

diff --git a/intro2-tour b/intro2-tour
index 33ccc09..1a4f21d 100755
--- a/intro2-tour
+++ b/intro2-tour
@@ -83,6 +83,12 @@ show bdep update @mingw
 show bdep test @mingw
 show ../hello-mingw/hello/hello/hello.exe Windows
 
+show git add .
+show git commit -m "Initial implementation"
+show git remote add origin git@github.com:boris-kolpackov/hello.git
+show git push origin master -u --force
+show bdep ci --simulate success
+
 show bdep deinit @gcc @clang
 
 cd ..
@@ -218,7 +224,7 @@ show bdep sync ?sys:libsqlite3
 # Versioning and Release Management.
 #
 git add .
-git commit -m "Start hello project"
+git commit -m "Initial implementation"
 
 show bdep status
 show b info
@@ -230,6 +236,12 @@ git commit -a -m "Another commit"
 
 show bdep status
 
+sed -i -re 's/^version: .*/version: 0.1.0/' manifest
+git commit -a -m "Release 0.1.0"
+git remote add origin git@github.com:boris-kolpackov/hello.git
+git push origin :build2-control
+show bdep publish --simulate success
+
 cd ..
 ## fi
 
@@ -286,6 +298,7 @@ EOF
 sed -i -re 's/^#import/import/' hello/hello/buildfile
 
 show bdep test
+cd ..
 
 # Package Consumption.
 #
diff --git a/intro2-tour.orig b/intro2-tour.orig
index 96b9e85..eb0f2cf 100644
--- a/intro2-tour.orig
+++ b/intro2-tour.orig
@@ -106,7 +106,7 @@ ld ../hello-gcc/hello/hello/exe{hello}
 ln ../hello-gcc/hello/hello/exe{hello} -> hello/
 
 + b test
-test hello/test{testscript}@../hello-gcc/hello/hello/ ../hello-gcc/hello/hello/exe{hello}
+test hello/testscript{testscript}@../hello-gcc/hello/hello/ ../hello-gcc/hello/hello/exe{hello}
 
 + hello/hello World
 Hello, World!
@@ -142,7 +142,7 @@ c++ hello/cxx{hello}@../hello-clang/hello/hello/
 ld ../hello-clang/hello/hello/exe{hello}
 
 + b test: ../hello-clang/hello/
-test hello/test{testscript}@../hello-clang/hello/hello/ ../hello-clang/hello/hello/exe{hello}
+test hello/testscript{testscript}@../hello-clang/hello/hello/ ../hello-clang/hello/hello/exe{hello}
 
 + ../hello-clang/hello/hello/hello World
 Hello, World!
@@ -154,14 +154,14 @@ rm ../hello-clang/hello/fsdir{hello/}
 mkdir ../hello-clang/hello/fsdir{hello/}
 c++ hello/cxx{hello}@../hello-clang/hello/hello/
 ld ../hello-clang/hello/hello/exe{hello}
-test hello/test{testscript}@../hello-clang/hello/hello/ ../hello-clang/hello/hello/exe{hello}
+test hello/testscript{testscript}@../hello-clang/hello/hello/ ../hello-clang/hello/hello/exe{hello}
 
 + bdep test @gcc @clang
 in configuration @gcc:
-test hello/test{testscript}@../hello-gcc/hello/hello/ ../hello-gcc/hello/hello/exe{hello}
+test hello/testscript{testscript}@../hello-gcc/hello/hello/ ../hello-gcc/hello/hello/exe{hello}
 
 in configuration @clang:
-test hello/test{testscript}@../hello-clang/hello/hello/ ../hello-clang/hello/hello/exe{hello}
+test hello/testscript{testscript}@../hello-clang/hello/hello/ ../hello-clang/hello/hello/exe{hello}
 
 + bdep init -C ../hello-mingw @mingw cc config.cxx=x86_64-w64-mingw32-g++
 initializing in project /tmp/hello/
@@ -175,11 +175,47 @@ c++ hello/cxx{hello}@../hello-mingw/hello/hello/
 ld ../hello-mingw/hello/hello/exe{hello}
 
 + bdep test @mingw
-test hello/test{testscript}@../hello-mingw/hello/hello/ ../hello-mingw/hello/hello/exe{hello}
+test hello/testscript{testscript}@../hello-mingw/hello/hello/ ../hello-mingw/hello/hello/exe{hello}
 
 + ../hello-mingw/hello/hello/hello.exe Windows
 Hello, Windows!

 
++ git add .
+
++ git commit -m Initial implementation
+[master (root-commit) 5003ebb] Initial implementation
+ 11 files changed, 99 insertions(+)
+ create mode 100644 .gitignore
+ create mode 100644 build/.gitignore
+ create mode 100644 build/bootstrap.build
+ create mode 100644 build/root.build
+ create mode 100644 buildfile
+ create mode 100644 hello/.gitignore
+ create mode 100644 hello/buildfile
+ create mode 100644 hello/hello.cxx
+ create mode 100644 hello/testscript
+ create mode 100644 manifest
+ create mode 100644 repositories.manifest
+
++ git remote add origin git@github.com:boris-kolpackov/hello.git
+
++ git push origin master -u --force
+To github.com:boris-kolpackov/hello.git
+ + faadd78...5003ebb master -> master (forced update)
+Branch 'master' set up to track remote branch 'master' from 'origin'.
+
++ bdep ci --simulate success
+submitting:
+  to:      https://ci.cppget.org
+  in:      https://github.com/boris-kolpackov/hello.git#master@5003ebb7735684a8a78c5c7dc758cb7eeaceb643
+  package: hello
+  version: 0.1.0-a.0.20180910124221.5003ebb77356
+continue? [y/n]   % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
+                                 Dload  Upload   Total   Spent    Left  Speed
+
  0     0    0     0    0     0      0      0 --:--:-- --:--:-- --:--:--     0
  0     0    0     0    0     0      0      0 --:--:-- --:--:-- --:--:--     0
  0   480    0     0    0     0      0      0 --:--:--  0:00:01 --:--:--     0
100   637  100   157  100   480    104    318  0:00:01  0:00:01 --:--:--   318
+CI request is queued: https://ci.cppget.org/@4a365563-03a5-4417-bfa1-1e2d4e76a9b1
+reference: 4a365563-03a5-4417-bfa1-1e2d4e76a9b1
+
 + bdep deinit @gcc @clang
 deinitializing in project /tmp/hello/
 in configuration @gcc:
@@ -237,14 +273,14 @@ synchronizing:
   new libhello/1.0.0 (required by hello)
   upgrade hello/0.1.0-a.0.19700101000000#1
 
-     0K ...                                                   100% 43.1M=0s
+     0K ...                                                   100% 96.7M=0s
 + b
 synchronizing /tmp/hello-gcc/:
   upgrade hello/0.1.0-a.0.19700101000000#2
 mkdir ../hello-gcc/hello/fsdir{hello/}
 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/
+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/
@@ -266,24 +302,24 @@ synchronizing:
   new libhello/1.0.0 (required by hello)
   upgrade hello/0.1.0-a.0.19700101000000#1
 
-     0K ...                                                   100% 47.8M=0s
+     0K ...                                                   100% 97.4M=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/testscript{testscript}@../hello-gcc/hello/hello/ ../hello-gcc/hello/hello/exe{hello}
 test ../hello-gcc/libhello-1.0.0/tests/basics/exe{driver}
 
 in configuration @clang:
 mkdir ../hello-clang/hello/fsdir{hello/}
 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/cxx{hello}@../hello-clang/hello/hello/
 c++ ../hello-clang/libhello-1.0.0/tests/basics/cxx{driver}
 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/test{testscript}@../hello-clang/hello/hello/ ../hello-clang/hello/hello/exe{hello}
+test hello/testscript{testscript}@../hello-clang/hello/hello/ ../hello-clang/hello/hello/exe{hello}
 test ../hello-clang/libhello-1.0.0/tests/basics/exe{driver}
 
 + bdep status
@@ -297,7 +333,7 @@ synchronizing:
   new libhello/1.0.0 (required by hello)
   upgrade hello/0.1.0-a.0.19700101000000#4
 
-     0K ...                                                   100% 96.1M=0s
+     0K ...                                                   100%  167M=0s
 + bdep fetch
 fetching git:build2.org/hello/libhello (prerequisite of dir:/tmp/hello)
 querying https://git.build2.org/hello/libhello.git
@@ -348,11 +384,11 @@ 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/
-ld libextra-gcc/libextra/libextra/liba{extra}
+version.in libextra/libextra/version.hxx.in
 ld libextra-gcc/libextra/libextra/libs{extra}
+ar libextra-gcc/libextra/libextra/liba{extra}
 install unpkg-gcc/
 install unpkg-gcc/include/
 install unpkg-gcc/include/libextra/
@@ -414,13 +450,13 @@ mkdir ../hello-gcc-1/hello/fsdir{hello/}
 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/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/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/cxx{hello}@../hello-gcc-1/hello/hello/
 c++ ../hello-gcc-1/libformat-1.0.0/libformat/cxx{format}
+c++ hello/cxx{hello}@../hello-gcc-1/hello/hello/
+c++ ../hello-gcc-1/libhello-1.1.0/tests/basics/cxx{driver}
 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}
@@ -428,10 +464,10 @@ 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/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}
+test hello/testscript{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}
 
 + 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
@@ -445,13 +481,13 @@ 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/
-test hello/test{testscript}@../hello-gcc/hello/hello/ ../hello-gcc/hello/hello/exe{hello}
+test hello/testscript{testscript}@../hello-gcc/hello/hello/ ../hello-gcc/hello/hello/exe{hello}
 
 + bdep sync ?sys:libsqlite3
 synchronizing:
   configure sys:libsqlite3/*
   upgrade hello/0.1.0-a.0.19700101000000#5
-[master (root-commit) d4c935e] Start hello project
+[master (root-commit) 9dc6e42] Initial implementation
  11 files changed, 118 insertions(+)
  create mode 100644 .gitignore
  create mode 100644 build/.gitignore
@@ -466,11 +502,11 @@ synchronizing:
  create mode 100644 repositories.manifest
 
 + bdep status
-hello configured 0.1.0-a.0.19700101000000#5 available 0.1.0-a.0.20180725104140.d4c935eb4bb6
+hello configured 0.1.0-a.0.19700101000000#5 available 0.1.0-a.0.20180910124424.9dc6e426468f
 
 + b info
 project: hello
-version: 0.1.0-a.0.20180725104140.d4c935eb4bb6
+version: 0.1.0-a.0.20180910124424.9dc6e426468f
 summary: hello executable
 url: https://example.org/hello
 src_root: /tmp/hello/
@@ -480,15 +516,44 @@ subprojects:
 
 + bdep sync
 synchronizing:
-  upgrade hello/0.1.0-a.0.20180725104140.d4c935eb4bb6
+  upgrade hello/0.1.0-a.0.20180910124424.9dc6e426468f
 
 + bdep status
-hello configured 0.1.0-a.0.20180725104140.d4c935eb4bb6
-[master 6acc288] Another commit
+hello configured 0.1.0-a.0.20180910124424.9dc6e426468f
+[master 576f0ac] Another commit
  1 file changed, 1 insertion(+)
 
 + bdep status
-hello configured 0.1.0-a.0.20180725104140.d4c935eb4bb6 available 0.1.0-a.0.20180725104141.6acc2886fc59
+hello configured 0.1.0-a.0.20180910124424.9dc6e426468f available 0.1.0-a.0.20180910124425.576f0ac0fd29
+[master 226e8bf] Release 0.1.0
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+To github.com:boris-kolpackov/hello.git
+ - [deleted]         build2-control
+
++ bdep publish --simulate success
+synchronizing:
+  upgrade hello/0.1.0
+publishing:
+  to:      https://cppget.org
+  as:      Boris Kolpackov <boris@codesynthesis.com>
+  package: hello
+  version: 0.1.0
+  project: hello
+  section: alpha
+  control: https://github.com/boris-kolpackov/hello.git
+continue? [y/n] pushing build2-control
+Counting objects: 6, done.
+Delta compression using up to 8 threads.
+Compressing objects:  33% (1/3)   
Compressing objects:  66% (2/3)   
Compressing objects: 100% (3/3)   
Compressing objects: 100% (3/3), done.
+Writing objects:  16% (1/6)   
Writing objects:  33% (2/6)   
Writing objects:  50% (3/6)   
Writing objects:  66% (4/6)   
Writing objects:  83% (5/6)   
Writing objects: 100% (6/6)   
Writing objects: 100% (6/6), 467 bytes | 467.00 KiB/s, done.
+Total 6 (delta 1), reused 0 (delta 0)
+Branch 'build2-control' set up to track remote branch 'build2-control' from 'origin'.
+submitting hello-0.1.0.tar.gz
+  % Total    % Received % Xferd  Average Speed   Time    Time     Time  Current
+                                 Dload  Upload   Total   Spent    Left  Speed
+
  0     0    0     0    0     0      0      0 --:--:-- --:--:-- --:--:--     0
  0     0    0     0    0     0      0      0 --:--:--  0:00:01 --:--:--     0
 95  2038    0     0  100  1956      0    928  0:00:02  0:00:02 --:--:--   928
100  2038  100    82  100  1956     38    928  0:00:02  0:00:02 --:--:--   928
+hello/0.1.0 submission is queued
+reference: ff40ea647eb3
 
 + bdep new -C hello-gcc @gcc -t exe -l c++ hello cc config.cxx=g++
 created new executable project hello in /tmp/hello/
@@ -532,9 +597,9 @@ 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}
 ld ../hello-gcc/libhello/tests/basics/exe{driver}
-test hello/test{testscript}@../hello-gcc/hello/hello/ ../hello-gcc/hello/hello/exe{hello}
+ld ../hello-gcc/hello/hello/exe{hello}
+test hello/testscript{testscript}@../hello-gcc/hello/hello/ ../hello-gcc/hello/hello/exe{hello}
 test ../hello-gcc/libhello/tests/basics/exe{driver}
 
 + bdep new -C hello-gcc @gcc -t exe -l c++ hello cc config.cxx=g++
@@ -582,16 +647,16 @@ mkdir ../hello-gcc/hello/fsdir{hello/}
 mkdir ../hello-gcc/libhello/tests/fsdir{basics/}
 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/
+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}
-test hello/hello/test{testscript}@../hello-gcc/hello/hello/ ../hello-gcc/hello/hello/exe{hello}
 test ../hello-gcc/libhello/tests/basics/exe{driver}
+test hello/hello/testscript{testscript}@../hello-gcc/hello/hello/ ../hello-gcc/hello/hello/exe{hello}
 
 + 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/tools/
+created new configuration in /tmp/tools/
 
 + cd tools
 
@@ -629,9 +694,9 @@ 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++ libformat-1.0.0/libformat/cxx{format}
 c++ libhello-1.1.0/libhello/cxx{hello}
 c++ hello-1.0.0/hello/cxx{hello}
+c++ libformat-1.0.0/libformat/cxx{format}
 ld libprint-1.0.0/libprint/libs{print}
 ld libformat-1.0.0/libformat/libs{format}
 ld libhello-1.1.0/libhello/libs{hello}
@@ -668,6 +733,8 @@ install libformat-1.0.0/libformat/libs{format}
 install libhello-1.1.0/libhello/libs{hello}
 install /opt/tools/bin/
 install hello-1.0.0/hello/exe{hello}
+install /opt/tools/share/doc/hello/
+install hello-1.0.0/manifest{manifest}
 installed hello/1.0.0
 
 + /opt/tools/bin/hello World
@@ -703,6 +770,8 @@ Hello, World!
 │       └── libprint.shared.pc
 └── share
     └── doc
+        ├── hello
+        │   └── manifest
         ├── libformat
         │   └── manifest
         ├── libhello
@@ -710,9 +779,11 @@ Hello, World!
         └── libprint
             └── manifest
 
-12 directories, 22 files
+13 directories, 23 files
 
 + bpkg uninstall hello
+uninstall hello-1.0.0/manifest{manifest}
+uninstall /opt/tools/share/doc/hello/
 uninstall hello-1.0.0/hello/exe{hello}
 uninstall /opt/tools/bin/
 uninstall libhello-1.1.0/libhello/libs{hello}