diff options
| -rw-r--r-- | LICENSE | 2 | ||||
| -rw-r--r-- | doc/release.cli | 14 | ||||
| -rw-r--r-- | git/modules | 43 | ||||
| -rw-r--r-- | intro2-tldr.orig | 32 | ||||
| -rwxr-xr-x | intro2-tour | 4 | ||||
| -rw-r--r-- | intro2-tour.orig | 529 | ||||
| -rwxr-xr-x | stage-queue | 9 | ||||
| -rwxr-xr-x | version | 12 |
8 files changed, 336 insertions, 309 deletions
@@ -1,6 +1,6 @@ MIT License -Copyright (c) 2014-2022 the build2 authors (see the AUTHORS file). +Copyright (c) 2014-2023 the build2 authors (see the AUTHORS file). Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/doc/release.cli b/doc/release.cli index b24fb71..8aba681 100644 --- a/doc/release.cli +++ b/doc/release.cli @@ -250,6 +250,9 @@ distribution from \c{etc/stage} and add the pre-distributed packages \h#stage-machines|Update \c{stage} \c{buildtab}s and build machines| + NOTE: may want to keep old machines around for public testing (since we use + existing public buildtabs, none of the new machines will be used). + Note: normally, we try to do all of this as part of normal development (e.g., when adding new machines, etc). @@ -336,14 +339,18 @@ distribution from \c{etc/stage} and add the pre-distributed packages \h#test-extra|Perform extra testing| - CI \c{libauto-symexport}. + CI: (check for any new repositories in github.com/build2/)\n + \n + \c{libauto-symexport}\n + \c{hello-thrift}\n + \c{assembler-with-cpp}\n Test \c{cxx20-modules-examples} (see \c{test} script). Test any third-party/demos (\c{build2-dynamic-module-demo}, \c{cherimcu}, \c{boost-dependency}). - Test on ARM Mac (run tests for \c{libbutl/build2/bpkg/bdep}. + Test on ARM Mac (run tests for \c{libbutl/build2/bpkg/bdep}). Test build system modules (especially standard pre-installed). @@ -603,6 +610,9 @@ distribution from \c{etc/stage} and add the pre-distributed packages manifest values. To resolve this we temporarily add (to \c{crontab}) \c{--ignore-unknown} and make a note to restore. + Also change \c{--min-bpkg-version} from previous to current release + (not the one being released). + \h#build-public|Verify queued packages build with \c{public}| This makes sure that the new version can be built with the old toolchain. diff --git a/git/modules b/git/modules index 4975ad2..415c795 100644 --- a/git/modules +++ b/git/modules @@ -1,21 +1,22 @@ -modules=" \ -git \ -change \ -libbutl \ -libbutl.bash \ -build2 \ -libbpkg \ -bpkg \ -bpkg-util \ -bdep \ -bdep-util \ -brep \ -libbbot \ -bbot \ -libbuild2-hello \ -libbuild2-rust \ -libbuild2-kconfig \ -libbuild2-autoconf" +modules=" \ +git \ +change \ +libbutl \ +libbutl.bash \ +build2 \ +libbpkg \ +bpkg \ +bpkg-util \ +bdep \ +bdep-util \ +brep \ +libbbot \ +bbot \ +libbuild2-hello \ +libbuild2-rust \ +libbuild2-kconfig \ +libbuild2-autoconf \ +libbuild2-qt" # During release it is useful to exclude some of these so can do mass # commits (like version updates). @@ -31,7 +32,7 @@ modules="$modules libpkg-config" modules="$modules etc" modules="$modules private" -# We don't tag git/, libbuild2-hello. +# We don't tag git/, libbuild2-*. # And etc/, private/, build2-toolchain/ are tagged manually. # tag_modules=" \ @@ -70,6 +71,8 @@ libbuild2-hello \ libbuild2-rust \ libbuild2-kconfig \ libbuild2-autoconf \ +libbuild2-qt \ buildos \ msvc-linux \ -openssl-agent" +openssl-agent \ +libpkg-config" diff --git a/intro2-tldr.orig b/intro2-tldr.orig index 37b10b8..445493d 100644 --- a/intro2-tldr.orig +++ b/intro2-tldr.orig @@ -1,7 +1,7 @@ -Script started on Tue 26 Jul 2022 11:35:07 AM SAST +Script started on 2023-06-28 11:17:30+02:00 [COMMAND="./intro2-tldr" TERM="xterm-256color" TTY="/dev/pts/21" COLUMNS="160" LINES="47"] created new executable project hello in /tmp/hello.git/ -[master (root-commit) 8db934f] first commit - 13 files changed, 141 insertions(+) +[master (root-commit) ddbbb0a] first commit + 13 files changed, 143 insertions(+) create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 README.md @@ -33,7 +33,7 @@ hello ├── README.md └── repositories.manifest -2 directories, 9 files +3 directories, 9 files + cd hello @@ -45,7 +45,7 @@ synchronizing: + b mkdir ../hello-gcc/hello/fsdir{hello/} -c++ hello/cxx{hello}@../hello-gcc/hello/hello/ +c++ hello/cxx{hello} -> ../hello-gcc/hello/hello/obje{hello} ld ../hello-gcc/hello/hello/exe{hello} ln ../hello-gcc/hello/hello/exe{hello} -> hello/ @@ -57,9 +57,9 @@ fetching git:build2.org/hello/libhello#v1.0.0 (prerequisite of dir:/tmp/hello) synchronizing /tmp/hello-gcc/: new libhello/1.0.0+4 (required by hello) upgrade hello/0.1.0#1 -version.in ../hello-gcc/libhello-1.0.0+4/libhello/version.hxx.in -c++ ../hello-gcc/libhello-1.0.0+4/libhello/cxx{hello} -c++ hello/cxx{hello}@../hello-gcc/hello/hello/ +version ../hello-gcc/libhello-1.0.0+4/libhello/in{version} -> ../hello-gcc/libhello-1.0.0+4/libhello/hxx{version} +c++ ../hello-gcc/libhello-1.0.0+4/libhello/cxx{hello} -> ../hello-gcc/libhello-1.0.0+4/libhello/objs{hello} +c++ hello/cxx{hello} -> ../hello-gcc/hello/hello/obje{hello} ld ../hello-gcc/libhello-1.0.0+4/libhello/libs{hello} ld ../hello-gcc/hello/hello/exe{hello} ln ../hello-gcc/hello/hello/exe{hello} -> hello/ @@ -71,18 +71,20 @@ fetching git:build2.org/hello/libprint##HEAD (prerequisite of git:build2.org/hel + bdep status -i hello configured 0.1.0#1 - libhello ^1.0.0 configured 1.0.0+4 available [1.1.0+10] [1.0.0+10] + libhello ^1.0.0 configured 1.0.0+4 available [1.1.0+11] [1.0.0+11] + bdep sync libhello synchronizing: - new libformat/1.0.0+10 (required by libhello) - new libprint/1.0.0+10 (required by libhello) - upgrade libhello/1.1.0+10 + new libformat/1.0.0+11 (required by libhello) + new libprint/1.0.0+11 (required by libhello) + upgrade libhello/1.1.0+11 reconfigure hello/0.1.0#1 + bdep sync libhello/1.0.0 synchronizing: - drop libprint/1.0.0+10 (unused) - drop libformat/1.0.0+10 (unused) - downgrade libhello/1.0.0+10 + drop libprint/1.0.0+11 (unused) + drop libformat/1.0.0+11 (unused) + downgrade libhello/1.0.0+11 reconfigure hello/0.1.0#1 + +Script done on 2023-06-28 11:17:55+02:00 [COMMAND_EXIT_CODE="0"] diff --git a/intro2-tour b/intro2-tour index aa92b5e..8af8fea 100755 --- a/intro2-tour +++ b/intro2-tour @@ -18,7 +18,7 @@ tmp=/tmp show=y gcc=g++ -clang=clang++-5.0 +clang=clang++-16 msvc=cl-15 repo=https://stage.build2.org/1/ trust="EC:50:13:E2:3D:F7:92:B4:50:0B:BF:2A:1F:7D:31:04:C6:57:6F:BC:BE:04:2E:E0:58:14:FA:66:66:21:1F:14" @@ -358,7 +358,7 @@ show bdep status show bdep release --alpha --push show bdep release --no-open --push -show bdep publish --simulate success +show bdep publish --simulate success --repository https://stage.build2.org show bdep release --open --push diff --git a/intro2-tour.orig b/intro2-tour.orig index be85de2..53015a0 100644 --- a/intro2-tour.orig +++ b/intro2-tour.orig @@ -1,4 +1,4 @@ -Script started on Tue 26 Jul 2022 01:15:30 PM SAST +Script started on 2023-06-28 11:58:39+02:00 [COMMAND="./intro2-tour" TERM="xterm-256color" TTY="/dev/pts/21" COLUMNS="160" LINES="47"] + bdep new -t exe -l c++ hello created new executable project hello in /tmp/hello/ @@ -17,7 +17,7 @@ hello ├── README.md └── repositories.manifest -2 directories, 9 files +3 directories, 9 files + cd hello @@ -60,14 +60,15 @@ EOE : 1 name: hello version: 0.1.0-a.0.z +language: c++ summary: hello C++ executable license: other: proprietary ; Not free/open source. description-file: README.md url: https://example.org/hello email: boris@codesynthesis.com #build-error-email: boris@codesynthesis.com -depends: * build2 >= 0.15.0- -depends: * bpkg >= 0.15.0- +depends: * build2 >= 0.15.0 +depends: * bpkg >= 0.15.0 #depends: libhello ^1.0.0 + bdep init -C ../hello-gcc @gcc cc config.cxx=g++ @@ -76,7 +77,7 @@ created configuration @gcc /tmp/hello-gcc/ 1 target default,forwarded,auto-synch synchronizing: new hello/0.1.0-a.0.19700101000000 -+ bdep init -C ../hello-clang @clang cc config.cxx=clang++-5.0 ++ bdep init -C ../hello-clang @clang cc config.cxx=clang++-16 initializing in project /tmp/hello/ created configuration @clang /tmp/hello-clang/ 2 target auto-synchronized synchronizing: @@ -104,12 +105,12 @@ hello configured 0.1.0-a.0.19700101000000 + b mkdir ../hello-gcc/hello/fsdir{hello/} -c++ hello/cxx{hello}@../hello-gcc/hello/hello/ +c++ hello/cxx{hello} -> ../hello-gcc/hello/hello/obje{hello} ld ../hello-gcc/hello/hello/exe{hello} ln ../hello-gcc/hello/hello/exe{hello} -> hello/ + b test -test hello/testscript{testscript}@../hello-gcc/hello/hello/ ../hello-gcc/hello/hello/exe{hello} +test ../hello-gcc/hello/hello/exe{hello} + hello/testscript{testscript} + hello/hello World Hello, World! @@ -134,37 +135,37 @@ Hello, World! ├── hello.o └── hello.o.d -6 directories, 11 files +7 directories, 11 files + bdep status @clang hello configured 0.1.0-a.0.19700101000000 + b ../hello-clang/hello/ mkdir ../hello-clang/hello/fsdir{hello/} -c++ hello/cxx{hello}@../hello-clang/hello/hello/ +c++ hello/cxx{hello} -> ../hello-clang/hello/hello/obje{hello} ld ../hello-clang/hello/hello/exe{hello} + b test: ../hello-clang/hello/ -test hello/testscript{testscript}@../hello-clang/hello/hello/ ../hello-clang/hello/hello/exe{hello} +test ../hello-clang/hello/hello/exe{hello} + hello/testscript{testscript} + ../hello-clang/hello/hello/hello World Hello, World! rm ../hello-clang/hello/hello/exe{hello} rm ../hello-clang/hello/hello/obje{hello} -rm ../hello-clang/hello/fsdir{hello/} +rmdir ../hello-clang/hello/fsdir{hello/} + bdep test @clang mkdir ../hello-clang/hello/fsdir{hello/} -c++ hello/cxx{hello}@../hello-clang/hello/hello/ +c++ hello/cxx{hello} -> ../hello-clang/hello/hello/obje{hello} ld ../hello-clang/hello/hello/exe{hello} -test hello/testscript{testscript}@../hello-clang/hello/hello/ ../hello-clang/hello/hello/exe{hello} +test ../hello-clang/hello/hello/exe{hello} + hello/testscript{testscript} + bdep test @gcc @clang in configuration @gcc: -test hello/testscript{testscript}@../hello-gcc/hello/hello/ ../hello-gcc/hello/hello/exe{hello} +test ../hello-gcc/hello/hello/exe{hello} + hello/testscript{testscript} in configuration @clang: -test hello/testscript{testscript}@../hello-clang/hello/hello/ ../hello-clang/hello/hello/exe{hello} +test ../hello-clang/hello/hello/exe{hello} + hello/testscript{testscript} + bdep init -C ../hello-mingw @mingw cc config.cxx=x86_64-w64-mingw32-g++ initializing in project /tmp/hello/ @@ -174,11 +175,11 @@ synchronizing: + bdep update @mingw mkdir ../hello-mingw/hello/fsdir{hello/} -c++ hello/cxx{hello}@../hello-mingw/hello/hello/ +c++ hello/cxx{hello} -> ../hello-mingw/hello/hello/obje{hello} ld ../hello-mingw/hello/hello/exe{hello} + bdep test @mingw -test hello/testscript{testscript}@../hello-mingw/hello/hello/ ../hello-mingw/hello/hello/exe{hello} +test ../hello-mingw/hello/hello/exe{hello} + hello/testscript{testscript} + ../hello-mingw/hello/hello/hello.exe Windows Hello, Windows! @@ -186,8 +187,8 @@ Hello, Windows! + git add . + git commit -m Initial implementation -[master (root-commit) 39e8769] Initial implementation - 13 files changed, 141 insertions(+) +[master (root-commit) 014a3ac] Initial implementation + 13 files changed, 143 insertions(+) create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 README.md @@ -206,18 +207,18 @@ Hello, Windows! + git push --no-progress origin master -u --force To github.com:boris-kolpackov/hello.git - + 342c509...39e8769 master -> master (forced update) -Branch 'master' set up to track remote branch 'master' from 'origin'. + + 943049b...014a3ac master -> master (forced update) +branch 'master' set up to track 'origin/master'. + bdep ci --simulate success submitting: to: https://ci.stage.build2.org - in: https://github.com/boris-kolpackov/hello.git#master@39e8769fd4cf680ddf9ee24d36074f912002ddc9 + in: https://github.com/boris-kolpackov/hello.git#master@014a3ac5e6132b6951f6bd8c2d759ae881dea3f6 package: hello - version: 0.1.0-a.0.20220726111554.39e8769fd4cf -continue? [y/n] y -CI request is queued: https://ci.stage.build2.org/@e250b05e-a618-4765-8177-37688a473592 -reference: e250b05e-a618-4765-8177-37688a473592 + version: 0.1.0-a.0.20230628095907.014a3ac5e613 +continue? [Y/n] y +CI request is queued: https://ci.stage.build2.org/@8338f18e-8ebf-4def-9520-473748b4d6f4 +reference: 8338f18e-8ebf-4def-9520-473748b4d6f4 + bdep deinit @gcc @clang deinitializing in project /tmp/hello/ @@ -235,7 +236,7 @@ created configuration @gcc /tmp/hello-gcc/ 1 target default,forwarded,auto-synch synchronizing: new hello/0.1.0-a.0.19700101000000 -+ bdep init -C ../hello-clang @clang cc config.cxx=clang++-5.0 ++ bdep init -C ../hello-clang @clang cc config.cxx=clang++-16 initializing in project /tmp/hello/ created configuration @clang /tmp/hello-clang/ 2 target auto-synchronized synchronizing: @@ -246,15 +247,15 @@ 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+10 -libhello/1.1.0+10 +libhello/1.0.0+11 +libhello/1.1.0+11 + bpkg rep-info https://git.build2.org/hello/libhello.git#HEAD git:build2.org/hello/libhello#HEAD https://git.build2.org/hello/libhello.git#HEAD 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.1.0+10 +libhello/1.1.0+11 + bdep status fetching pkg:stage.build2.org (prerequisite of dir:/tmp/hello) @@ -267,24 +268,24 @@ hello configured 0.1.0-a.0.19700101000000 available 0.1.0-a.0.19700101000000#1 + bdep sync synchronizing: - new libhello/1.0.0+10 (required by hello) + new libhello/1.0.0+11 (required by hello) upgrade hello/0.1.0-a.0.19700101000000#1 + b synchronizing /tmp/hello-gcc/: upgrade hello/0.1.0-a.0.19700101000000#2 -version.in ../hello-gcc/libhello-1.0.0+10/libhello/version.hxx.in +version ../hello-gcc/libhello-1.0.0+11/libhello/in{version} -> ../hello-gcc/libhello-1.0.0+11/libhello/hxx{version} mkdir ../hello-gcc/hello/fsdir{hello/} -c++ ../hello-gcc/libhello-1.0.0+10/libhello/cxx{hello} -c++ hello/cxx{hello}@../hello-gcc/hello/hello/ -ld ../hello-gcc/libhello-1.0.0+10/libhello/libs{hello} +c++ hello/cxx{hello} -> ../hello-gcc/hello/hello/obje{hello} +c++ ../hello-gcc/libhello-1.0.0+11/libhello/cxx{hello} -> ../hello-gcc/libhello-1.0.0+11/libhello/objs{hello} +ld ../hello-gcc/libhello-1.0.0+11/libhello/libs{hello} ld ../hello-gcc/hello/hello/exe{hello} ln ../hello-gcc/hello/hello/exe{hello} -> hello/ + bdep status -ai in configuration @gcc: hello configured 0.1.0-a.0.19700101000000#2 - libhello ^1.0.0 configured 1.0.0+10 + libhello ^1.0.0 configured 1.0.0+11 in configuration @clang: fetching pkg:stage.build2.org (prerequisite of dir:/tmp/hello) @@ -295,37 +296,37 @@ in configuration @gcc: in configuration @clang: synchronizing: - new libhello/1.0.0+10 (required by hello) + new libhello/1.0.0+11 (required by hello) upgrade hello/0.1.0-a.0.19700101000000#1 + bdep test -ai in configuration @gcc: -c++ ../hello-gcc/libhello-1.0.0+10/tests/basics/cxx{driver} -ld ../hello-gcc/libhello-1.0.0+10/tests/basics/exe{driver} -test ../hello-gcc/libhello-1.0.0+10/tests/basics/exe{driver} -test hello/testscript{testscript}@../hello-gcc/hello/hello/ ../hello-gcc/hello/hello/exe{hello} +c++ ../hello-gcc/libhello-1.0.0+11/tests/basics/cxx{driver} -> ../hello-gcc/libhello-1.0.0+11/tests/basics/obje{driver} +ld ../hello-gcc/libhello-1.0.0+11/tests/basics/exe{driver} +test ../hello-gcc/libhello-1.0.0+11/tests/basics/exe{driver} +test ../hello-gcc/hello/hello/exe{hello} + hello/testscript{testscript} in configuration @clang: -version.in ../hello-clang/libhello-1.0.0+10/libhello/version.hxx.in +version ../hello-clang/libhello-1.0.0+11/libhello/in{version} -> ../hello-clang/libhello-1.0.0+11/libhello/hxx{version} mkdir ../hello-clang/hello/fsdir{hello/} -c++ ../hello-clang/libhello-1.0.0+10/libhello/cxx{hello} -c++ ../hello-clang/libhello-1.0.0+10/tests/basics/cxx{driver} -c++ hello/cxx{hello}@../hello-clang/hello/hello/ -ld ../hello-clang/libhello-1.0.0+10/libhello/libs{hello} +c++ ../hello-clang/libhello-1.0.0+11/libhello/cxx{hello} -> ../hello-clang/libhello-1.0.0+11/libhello/objs{hello} +c++ ../hello-clang/libhello-1.0.0+11/tests/basics/cxx{driver} -> ../hello-clang/libhello-1.0.0+11/tests/basics/obje{driver} +c++ hello/cxx{hello} -> ../hello-clang/hello/hello/obje{hello} +ld ../hello-clang/libhello-1.0.0+11/libhello/libs{hello} ld ../hello-clang/hello/hello/exe{hello} -ld ../hello-clang/libhello-1.0.0+10/tests/basics/exe{driver} -test ../hello-clang/libhello-1.0.0+10/tests/basics/exe{driver} -test hello/testscript{testscript}@../hello-clang/hello/hello/ ../hello-clang/hello/hello/exe{hello} +ld ../hello-clang/libhello-1.0.0+11/tests/basics/exe{driver} +test ../hello-clang/hello/hello/exe{hello} + hello/testscript{testscript} +test ../hello-clang/libhello-1.0.0+11/tests/basics/exe{driver} + bdep status hello configured 0.1.0-a.0.19700101000000#2 available 0.1.0-a.0.19700101000000#3 + bdep sync synchronizing: - drop libhello/1.0.0+10 (unused) + drop libhello/1.0.0+11 (unused) upgrade hello/0.1.0-a.0.19700101000000#3 synchronizing: - new libhello/1.0.0+10 (required by hello) + new libhello/1.0.0+11 (required by hello) upgrade hello/0.1.0-a.0.19700101000000#4 + bdep fetch @@ -335,29 +336,29 @@ fetching git:build2.org/hello/libprint##HEAD (prerequisite of git:build2.org/hel fetching pkg:stage.build2.org (prerequisite of dir:/tmp/hello) + bdep status libhello -libhello configured 1.0.0+10 available [1.1.0+10] +libhello configured 1.0.0+11 available [1.1.0+11] + bdep sync libhello synchronizing: - new libformat/1.0.0+10 (required by libhello) - new libprint/1.0.0+10 (required by libhello) - upgrade libhello/1.1.0+10 + new libformat/1.0.0+11 (required by libhello) + new libprint/1.0.0+11 (required by libhello) + upgrade libhello/1.1.0+11 reconfigure hello/0.1.0-a.0.19700101000000#4 + bdep status -r hello configured 0.1.0-a.0.19700101000000#4 - libhello ^1.0.0 configured 1.1.0+10 - libformat ^1.0.0 configured 1.0.0+10 - libprint ^1.0.0 configured 1.0.0+10 + libhello ^1.0.0 configured 1.1.0+11 + libformat ^1.0.0 configured 1.0.0+11 + libprint ^1.0.0 configured 1.0.0+11 + bdep status -o libhello -libhello configured 1.1.0+10 available (1.1.0+10) [1.0.0+10] +libhello configured 1.1.0+11 available (1.1.0+11) [1.0.0+11] + bdep sync libhello/1.0.0 synchronizing: - drop libprint/1.0.0+10 (unused) - drop libformat/1.0.0+10 (unused) - downgrade libhello/1.0.0+10 + drop libprint/1.0.0+11 (unused) + drop libformat/1.0.0+11 (unused) + downgrade libhello/1.0.0+11 reconfigure hello/0.1.0-a.0.19700101000000#4 + bdep new -C libextra-gcc -t lib -l c++ libextra cc config.cxx=g++ @@ -368,27 +369,27 @@ 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/ -pc libextra-gcc/libextra/libextra/pca{extra} -pc libextra-gcc/libextra/libextra/pc{extra} -ar libextra-gcc/libextra/libextra/liba{extra} -pc libextra-gcc/libextra/libextra/pcs{extra} +version libextra/libextra/in{version} -> libextra-gcc/libextra/libextra/hxx{version} +c++ libextra/libextra/cxx{extra} -> libextra-gcc/libextra/libextra/objs{extra} +c++ libextra/libextra/cxx{extra} -> libextra-gcc/libextra/libextra/obja{extra} +pc libextra-gcc/libextra/libextra/libs{extra} -> libextra-gcc/libextra/libextra/pcs{extra} +pc libextra-gcc/libextra/libextra/liba{extra} -> libextra-gcc/libextra/libextra/pca{extra} +pc libextra-gcc/libextra/libextra/lib{extra} -> libextra-gcc/libextra/libextra/pc{extra} ld libextra-gcc/libextra/libextra/libs{extra} -install unpkg-gcc/ -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} -install libextra/doc{README.md}@libextra-gcc/libextra/ +ar libextra-gcc/libextra/libextra/liba{extra} +install -d unpkg-gcc/ +install -d unpkg-gcc/include/ +install -d unpkg-gcc/include/libextra/ +install libextra/libextra/hxx{export}@libextra-gcc/libextra/libextra/ -> unpkg-gcc/include/libextra/ +install libextra/libextra/hxx{extra}@libextra-gcc/libextra/libextra/ -> unpkg-gcc/include/libextra/ +install -d unpkg-gcc/share/ +install -d unpkg-gcc/share/doc/ +install -d unpkg-gcc/share/doc/libextra/ +install libextra/manifest{manifest}@libextra-gcc/libextra/ -> unpkg-gcc/share/doc/libextra/manifest +install libextra-gcc/libextra/libextra/hxx{version} -> unpkg-gcc/include/libextra/ +install libextra-gcc/libextra/libextra/liba{extra} -> unpkg-gcc/lib/ +install libextra-gcc/libextra/libextra/libs{extra} -> unpkg-gcc/lib/ +install libextra/doc{README.md}@libextra-gcc/libextra/ -> unpkg-gcc/share/doc/libextra/ + tree unpkg-gcc unpkg-gcc @@ -411,7 +412,7 @@ unpkg-gcc ├── manifest └── README.md -7 directories, 11 files +8 directories, 11 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/ @@ -421,53 +422,53 @@ fetching git:build2.org/hello/libformat##HEAD (prerequisite of git:build2.org/he fetching git:build2.org/hello/libprint##HEAD (prerequisite of git:build2.org/hello/libhello) fetching pkg:stage.build2.org (prerequisite of dir:/tmp/hello) synchronizing: - new libformat/1.0.0+10 (required by libhello) - new libprint/1.0.0+10 (required by libhello) - new libhello/1.1.0+10 (required by hello) + new libformat/1.0.0+11 (required by libhello) + new libprint/1.0.0+11 (required by libhello) + new libhello/1.1.0+11 (required by hello) new hello/0.1.0-a.0.19700101000000 + b test: ../hello-gcc-1/ -version.in ../hello-gcc-1/libformat-1.0.0+10/libformat/version.hxx.in -version.in ../hello-gcc-1/libprint-1.0.0+10/libprint/version.hxx.in -version.in ../hello-gcc-1/libhello-1.1.0+10/libhello/version.hxx.in +version ../hello-gcc-1/libprint-1.0.0+11/libprint/in{version} -> ../hello-gcc-1/libprint-1.0.0+11/libprint/hxx{version} +version ../hello-gcc-1/libformat-1.0.0+11/libformat/in{version} -> ../hello-gcc-1/libformat-1.0.0+11/libformat/hxx{version} +version ../hello-gcc-1/libhello-1.1.0+11/libhello/in{version} -> ../hello-gcc-1/libhello-1.1.0+11/libhello/hxx{version} mkdir ../hello-gcc-1/hello/fsdir{hello/} -c++ ../hello-gcc-1/libprint-1.0.0+10/tests/basics/cxx{driver} -c++ ../hello-gcc-1/libhello-1.1.0+10/libhello/cxx{hello} -c++ ../hello-gcc-1/libprint-1.0.0+10/libprint/cxx{print} -c++ ../hello-gcc-1/libformat-1.0.0+10/tests/basics/cxx{driver} -c++ ../hello-gcc-1/libhello-1.1.0+10/tests/basics/cxx{driver} -c++ hello/cxx{hello}@../hello-gcc-1/hello/hello/ -c++ ../hello-gcc-1/libformat-1.0.0+10/libformat/cxx{format} -ld ../hello-gcc-1/libprint-1.0.0+10/libprint/libs{print} -ld ../hello-gcc-1/libprint-1.0.0+10/tests/basics/exe{driver} -ld ../hello-gcc-1/libformat-1.0.0+10/libformat/libs{format} -ld ../hello-gcc-1/libformat-1.0.0+10/tests/basics/exe{driver} -ld ../hello-gcc-1/libhello-1.1.0+10/libhello/libs{hello} +c++ ../hello-gcc-1/libformat-1.0.0+11/tests/basics/cxx{driver} -> ../hello-gcc-1/libformat-1.0.0+11/tests/basics/obje{driver} +c++ ../hello-gcc-1/libformat-1.0.0+11/libformat/cxx{format} -> ../hello-gcc-1/libformat-1.0.0+11/libformat/objs{format} +c++ ../hello-gcc-1/libprint-1.0.0+11/tests/basics/cxx{driver} -> ../hello-gcc-1/libprint-1.0.0+11/tests/basics/obje{driver} +c++ ../hello-gcc-1/libhello-1.1.0+11/libhello/cxx{hello} -> ../hello-gcc-1/libhello-1.1.0+11/libhello/objs{hello} +c++ ../hello-gcc-1/libprint-1.0.0+11/libprint/cxx{print} -> ../hello-gcc-1/libprint-1.0.0+11/libprint/objs{print} +c++ hello/cxx{hello} -> ../hello-gcc-1/hello/hello/obje{hello} +c++ ../hello-gcc-1/libhello-1.1.0+11/tests/basics/cxx{driver} -> ../hello-gcc-1/libhello-1.1.0+11/tests/basics/obje{driver} +ld ../hello-gcc-1/libprint-1.0.0+11/libprint/libs{print} +ld ../hello-gcc-1/libformat-1.0.0+11/libformat/libs{format} +ld ../hello-gcc-1/libprint-1.0.0+11/tests/basics/exe{driver} +ld ../hello-gcc-1/libformat-1.0.0+11/tests/basics/exe{driver} +ld ../hello-gcc-1/libhello-1.1.0+11/libhello/libs{hello} ld ../hello-gcc-1/hello/hello/exe{hello} -ld ../hello-gcc-1/libhello-1.1.0+10/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+10/tests/basics/exe{driver} -test ../hello-gcc-1/libhello-1.1.0+10/tests/basics/exe{driver} -test ../hello-gcc-1/libprint-1.0.0+10/tests/basics/exe{driver} +ld ../hello-gcc-1/libhello-1.1.0+11/tests/basics/exe{driver} +test ../hello-gcc-1/libhello-1.1.0+11/tests/basics/exe{driver} +test ../hello-gcc-1/libformat-1.0.0+11/tests/basics/exe{driver} +test ../hello-gcc-1/hello/hello/exe{hello} + hello/testscript{testscript} +test ../hello-gcc-1/libprint-1.0.0+11/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 save ../hello-gcc/hello/build/config.build -save ../hello-gcc/libhello-1.0.0+10/build/config.build -save ../hello-gcc/libhello-1.0.0+10/tests/build/config.build +save ../hello-gcc/libhello-1.0.0+11/build/config.build +save ../hello-gcc/libhello-1.0.0+11/tests/build/config.build + b test -version.in ../hello-gcc/libhello-1.0.0+10/libhello/version.hxx.in -c++ ../hello-gcc/libhello-1.0.0+10/libhello/cxx{hello} -c++ hello/cxx{hello}@../hello-gcc/hello/hello/ -ld ../hello-gcc/libhello-1.0.0+10/libhello/libs{hello} +version ../hello-gcc/libhello-1.0.0+11/libhello/in{version} -> ../hello-gcc/libhello-1.0.0+11/libhello/hxx{version} +c++ ../hello-gcc/libhello-1.0.0+11/libhello/cxx{hello} -> ../hello-gcc/libhello-1.0.0+11/libhello/objs{hello} +c++ hello/cxx{hello} -> ../hello-gcc/hello/hello/obje{hello} +ld ../hello-gcc/libhello-1.0.0+11/libhello/libs{hello} ld ../hello-gcc/hello/hello/exe{hello} ln ../hello-gcc/hello/hello/exe{hello} -> hello/ -test hello/testscript{testscript}@../hello-gcc/hello/hello/ ../hello-gcc/hello/hello/exe{hello} +test ../hello-gcc/hello/hello/exe{hello} + hello/testscript{testscript} + bdep sync ?sys:libsqlite3 synchronizing: - configure sys:libsqlite3/* (required by hello) + configure sys:libsqlite3/3.40.1 (required by hello) upgrade hello/0.1.0-a.0.19700101000000#5 + bdep new -t exe -l c++ hello @@ -479,7 +480,7 @@ created configuration @gcc /tmp/hello-gcc/ 1 target default,forwarded,auto-synch synchronizing: new hello/0.1.0-a.0.19700101000000 -+ bdep init -C @clang cc config.cxx=clang++-5.0 ++ bdep init -C @clang cc config.cxx=clang++-16 initializing in project /tmp/hello/ created configuration @clang /tmp/hello-clang/ 2 target auto-synchronized synchronizing: @@ -506,14 +507,14 @@ synchronizing /tmp/hello-gcc/: new xxd/8.2.3075+1 [/tmp/hello-host/] (required by hello) upgrade hello/0.1.0-a.0.19700101000000#1 mkdir ../hello-gcc/hello/fsdir{hello/} -c ../hello-host/xxd-8.2.3075+1/c{xxd} +c ../hello-host/xxd-8.2.3075+1/c{xxd} -> ../hello-host/xxd-8.2.3075+1/obje{xxd} ld ../hello-host/xxd-8.2.3075+1/exe{xxd} -xxd ../hello-gcc/hello/hello/cxx{names} -c++ ../hello-gcc/hello/hello/cxx{names} -c++ hello/cxx{hello}@../hello-gcc/hello/hello/ +xxd hello/file{names.txt} -> ../hello-gcc/hello/hello/cxx{names} +c++ ../hello-gcc/hello/hello/cxx{names} -> ../hello-gcc/hello/hello/obje{names} +c++ hello/cxx{hello} -> ../hello-gcc/hello/hello/obje{hello} ld ../hello-gcc/hello/hello/exe{hello} ln ../hello-gcc/hello/hello/exe{hello} -> hello/ -test hello/testscript{testscript}@../hello-gcc/hello/hello/ ../hello-gcc/hello/hello/exe{hello} +test ../hello-gcc/hello/hello/exe{hello} + hello/testscript{testscript} + bdep config list @gcc /tmp/hello-gcc/ 1 target default,forwarded,auto-synchronized @@ -528,9 +529,9 @@ fetching pkg:cppget.org/stable (complements pkg:cppget.org/testing) synchronizing: upgrade hello/0.1.0-a.0.19700101000000#1 mkdir ../hello-clang/hello/fsdir{hello/} -xxd ../hello-clang/hello/hello/cxx{names} -c++ ../hello-clang/hello/hello/cxx{names} -c++ hello/cxx{hello}@../hello-clang/hello/hello/ +xxd hello/file{names.txt} -> ../hello-clang/hello/hello/cxx{names} +c++ ../hello-clang/hello/hello/cxx{names} -> ../hello-clang/hello/hello/obje{names} +c++ hello/cxx{hello} -> ../hello-clang/hello/hello/obje{hello} ld ../hello-clang/hello/hello/exe{hello} + b @@ -543,11 +544,11 @@ while searching for configuration for build-time dependency libbuild2-hello of p while synchronizing configuration /tmp/hello-gcc/ continue? [Y/n] y synchronizing /tmp/hello-gcc/: - new libbuild2-hello/0.1.0-a.0.20210928065245.4c3109c2b741 [/tmp/hello-build2/] (required by hello [/tmp/hello-clang/], hello [/tmp/hello-gcc/]) + new libbuild2-hello/0.1.0 [/tmp/hello-build2/] (required by hello [/tmp/hello-clang/], hello [/tmp/hello-gcc/]) upgrade hello/0.1.0-a.0.19700101000000#2 [/tmp/hello-gcc/] upgrade hello/0.1.0-a.0.19700101000000#2 [/tmp/hello-clang/] -c++ ../hello-build2/libbuild2-hello-0.1.0-a.0.20210928065245.4c3109c2b741/libbuild2/hello/cxx{init} -ld ../hello-build2/libbuild2-hello-0.1.0-a.0.20210928065245.4c3109c2b741/libbuild2/hello/libs{build2-hello} +c++ ../hello-build2/libbuild2-hello-0.1.0/libbuild2/hello/cxx{init} -> ../hello-build2/libbuild2-hello-0.1.0/libbuild2/hello/objs{init} +ld ../hello-build2/libbuild2-hello-0.1.0/libbuild2/hello/libs{build2-hello} hello/buildfile:10:7: info: module hello initialized hello/buildfile:10:7: info: module hello initialized hello/buildfile:10:7: info: module hello initialized @@ -574,7 +575,7 @@ created configuration @base /tmp/hello-base/ 1 target auto-synchronized + bdep config create ../hello-gcc @gcc --default cc config.cxx=g++ created configuration @gcc /tmp/hello-gcc/ 2 target default,forwarded,auto-synchronized -+ bdep config create ../hello-clang @clang cc config.cxx=clang++-5.0 ++ bdep config create ../hello-clang @clang cc config.cxx=clang++-16 created configuration @clang /tmp/hello-clang/ 3 target auto-synchronized + bdep config link @gcc @base @@ -587,7 +588,7 @@ linked configuration @clang (target) with configuration @base (target) initializing in project /tmp/hello/ fetching pkg:stage.build2.org (prerequisite of dir:/tmp/hello) synchronizing: - new libhello/1.0.0+10 [/tmp/hello-base/] (required by hello) + new libhello/1.0.0+11 [/tmp/hello-base/] (required by hello) new hello/0.1.0-a.0.19700101000000 + bdep init @clang @@ -597,16 +598,17 @@ synchronizing: new hello/0.1.0-a.0.19700101000000 [/tmp/hello-clang/] + bdep update @gcc -version.in ../hello-base/libhello-1.0.0+10/libhello/version.hxx.in +version ../hello-base/libhello-1.0.0+11/libhello/in{version} -> ../hello-base/libhello-1.0.0+11/libhello/hxx{version} mkdir ../hello-gcc/hello/fsdir{hello/} -c++ ../hello-base/libhello-1.0.0+10/libhello/cxx{hello} -c++ hello/cxx{hello}@../hello-gcc/hello/hello/ -ld ../hello-base/libhello-1.0.0+10/libhello/libs{hello} +c++ ../hello-base/libhello-1.0.0+11/libhello/cxx{hello} -> ../hello-base/libhello-1.0.0+11/libhello/objs{hello} +c++ hello/cxx{hello} -> ../hello-gcc/hello/hello/obje{hello} +ld ../hello-base/libhello-1.0.0+11/libhello/libs{hello} ld ../hello-gcc/hello/hello/exe{hello} +ln ../hello-gcc/hello/hello/exe{hello} -> hello/ + bdep update @clang mkdir ../hello-clang/hello/fsdir{hello/} -c++ hello/cxx{hello}@../hello-clang/hello/hello/ +c++ hello/cxx{hello} -> ../hello-clang/hello/hello/obje{hello} ld ../hello-clang/hello/hello/exe{hello} + bdep new -C hello-gcc @gcc -t exe -l c++ hello cc config.cxx=g++ @@ -620,8 +622,8 @@ To github.com:boris-kolpackov/hello.git - [deleted] v0.1.0-a.1 To github.com:boris-kolpackov/hello.git - [deleted] v0.1.0 -[master (root-commit) dbb0b20] Initial implementation - 13 files changed, 141 insertions(+) +[master (root-commit) ba9d966] Initial implementation + 13 files changed, 143 insertions(+) create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 README.md @@ -636,15 +638,15 @@ To github.com:boris-kolpackov/hello.git create mode 100644 manifest create mode 100644 repositories.manifest To github.com:boris-kolpackov/hello.git - + 39e8769...dbb0b20 master -> master (forced update) -Branch 'master' set up to track remote branch 'master' from 'origin'. + + 014a3ac...ba9d966 master -> master (forced update) +branch 'master' set up to track 'origin/master'. + bdep status -hello configured 0.1.0-a.0.19700101000000 available 0.1.0-a.0.20220726111944.dbb0b209a4f2 +hello configured 0.1.0-a.0.19700101000000 available 0.1.0-a.0.20230628100234.ba9d966a610f + b info project: hello -version: 0.1.0-a.0.20220726111944.dbb0b209a4f2 +version: 0.1.0-a.0.20230628100234.ba9d966a610f summary: hello C++ executable url: https://example.org/hello src_root: /tmp/hello @@ -657,15 +659,15 @@ modules: version config test install dist + bdep sync synchronizing: - upgrade hello/0.1.0-a.0.20220726111944.dbb0b209a4f2 + upgrade hello/0.1.0-a.0.20230628100234.ba9d966a610f + bdep status -hello configured 0.1.0-a.0.20220726111944.dbb0b209a4f2 -[master 33e97d9] Another commit +hello configured 0.1.0-a.0.20230628100234.ba9d966a610f +[master be5bffa] Another commit 1 file changed, 1 insertion(+) + bdep status -hello configured 0.1.0-a.0.20220726111944.dbb0b209a4f2 available 0.1.0-a.0.20220726111948.33e97d934d6d +hello configured 0.1.0-a.0.20230628100234.ba9d966a610f available 0.1.0-a.0.20230628100238.be5bffafe2fe + bdep release --alpha --push releasing: @@ -677,9 +679,9 @@ releasing: tag: v0.1.0-a.1 push: origin/master continue? [y/n] y -[master 76c861c] Release version 0.1.0-a.1 +[master ed894b0] Release version 0.1.0-a.1 1 file changed, 1 insertion(+), 1 deletion(-) -[master cc09a1c] Change version to 0.1.0-a.1.z +[master 2bd66ae] Change version to 0.1.0-a.1.z 1 file changed, 1 insertion(+), 1 deletion(-) + bdep release --no-open --push @@ -691,14 +693,14 @@ releasing: tag: v0.1.0 push: origin/master continue? [y/n] y -[master acf02b4] Release version 0.1.0 +[master 2cc1068] Release version 0.1.0 1 file changed, 1 insertion(+), 1 deletion(-) -+ bdep publish --simulate success ++ bdep publish --simulate success --repository https://stage.build2.org synchronizing: upgrade hello/0.1.0 publishing: - to: https://cppget.org + to: https://stage.build2.org as: Boris Kolpackov <boris@codesynthesis.com> package: hello version: 0.1.0 @@ -707,13 +709,12 @@ publishing: control: https://github.com/boris-kolpackov/hello.git warning: publishing using staged build2 toolchain continue? [y/n] y -remote: +remote: remote: Create a pull request for 'build2-control' on GitHub by visiting:[K remote: https://github.com/boris-kolpackov/hello/pull/new/build2-control[K -remote: -Branch 'build2-control' set up to track remote branch 'build2-control' from 'origin'. -package submission is queued: https://queue.cppget.org/hello/0.1.0 -reference: 1ba1d57aebbb +remote: +package submission is queued: https://queue.stage.build2.org/hello/0.1.0 +reference: 75d918f69585 + bdep release --open --push opening: @@ -723,7 +724,7 @@ opening: commit: yes push: origin/master continue? [y/n] y -[master 2807863] Change version to 0.2.0-a.0.z +[master 1b709b0] Change version to 0.2.0-a.0.z 1 file changed, 1 insertion(+), 1 deletion(-) + bdep new -C hello-gcc @gcc -t exe -l c++ hello cc config.cxx=g++ @@ -732,7 +733,7 @@ created configuration @gcc /tmp/hello-gcc/ 1 target default,forwarded,auto-synch synchronizing: new hello/0.1.0-a.0.19700101000000 -+ bdep init -C ../hello-clang @clang cc config.cxx=clang++-5.0 ++ bdep init -C ../hello-clang @clang cc config.cxx=clang++-16 initializing in project /tmp/hello/ created configuration @clang /tmp/hello-clang/ 2 target auto-synchronized synchronizing: @@ -766,7 +767,7 @@ libhello │ └── root.build └── buildfile -5 directories, 17 files +6 directories, 17 files + cd libhello @@ -788,17 +789,19 @@ synchronizing: synchronizing: upgrade hello/0.1.0-a.0.19700101000000#1 mkdir ../hello-gcc/libhello/fsdir{libhello/} -version.in ../libhello/libhello/version.hxx.in +version ../libhello/libhello/in{version} -> ../hello-gcc/libhello/libhello/hxx{version} mkdir ../hello-gcc/hello/fsdir{hello/} mkdir ../hello-gcc/libhello/tests/fsdir{basics/} -c++ ../libhello/libhello/cxx{hello}@../hello-gcc/libhello/libhello/ -c++ ../libhello/tests/basics/cxx{driver}@../hello-gcc/libhello/tests/basics/ -c++ hello/cxx{hello}@../hello-gcc/hello/hello/ +c++ ../libhello/tests/basics/cxx{driver} -> ../hello-gcc/libhello/tests/basics/obje{driver} +c++ ../libhello/libhello/cxx{hello} -> ../hello-gcc/libhello/libhello/objs{hello} +c++ hello/cxx{hello} -> ../hello-gcc/hello/hello/obje{hello} ld ../hello-gcc/libhello/libhello/libs{hello} ld ../hello-gcc/hello/hello/exe{hello} ld ../hello-gcc/libhello/tests/basics/exe{driver} +ln ../hello-gcc/hello/hello/exe{hello} -> hello/ +ln ../hello-gcc/libhello/tests/basics/exe{driver} -> ../libhello/tests/basics/ test ../hello-gcc/libhello/tests/basics/exe{driver} -test hello/testscript{testscript}@../hello-gcc/hello/hello/ ../hello-gcc/hello/hello/exe{hello} +test ../hello-gcc/hello/hello/exe{hello} + hello/testscript{testscript} + bdep new -C hello-gcc @gcc -t exe -l c++ hello cc config.cxx=g++ created new executable project hello in /tmp/hello/ @@ -808,7 +811,7 @@ synchronizing: + cd hello -+ bdep init -C ../hello-clang @clang cc config.cxx=clang++-5.0 ++ bdep init -C ../hello-clang @clang cc config.cxx=clang++-16 initializing in project /tmp/hello/ created configuration @clang /tmp/hello-clang/ 2 target auto-synchronized synchronizing: @@ -841,21 +844,23 @@ synchronizing: synchronizing: upgrade hello/0.1.0-a.0.19700101000000#2 mkdir ../hello-gcc/libhello/fsdir{libhello/} -version.in libhello/libhello/version.hxx.in -mkdir ../hello-gcc/libhello/tests/fsdir{basics/} +version libhello/libhello/in{version} -> ../hello-gcc/libhello/libhello/hxx{version} mkdir ../hello-gcc/hello/fsdir{hello/} -c++ hello/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/ +mkdir ../hello-gcc/libhello/tests/fsdir{basics/} +c++ hello/hello/cxx{hello} -> ../hello-gcc/hello/hello/obje{hello} +c++ libhello/libhello/cxx{hello} -> ../hello-gcc/libhello/libhello/objs{hello} +c++ libhello/tests/basics/cxx{driver} -> ../hello-gcc/libhello/tests/basics/obje{driver} ld ../hello-gcc/libhello/libhello/libs{hello} ld ../hello-gcc/hello/hello/exe{hello} ld ../hello-gcc/libhello/tests/basics/exe{driver} +ln ../hello-gcc/hello/hello/exe{hello} -> hello/hello/ +ln ../hello-gcc/libhello/tests/basics/exe{driver} -> libhello/tests/basics/ +test ../hello-gcc/hello/hello/exe{hello} + hello/hello/testscript{testscript} 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/tools/ - uuid: 37be367a-66c7-4f83-a1a0-22534165fcf4 + uuid: c835ee18-540c-40ca-a727-977c2cb1fd2d type: target + cd tools @@ -866,69 +871,69 @@ fetching git:build2.org/hello/hello fetching git:build2.org/hello/libhello (prerequisite of git:build2.org/hello/hello) fetching git:build2.org/hello/libformat##HEAD (prerequisite of git:build2.org/hello/libhello) fetching git:build2.org/hello/libprint##HEAD (prerequisite of git:build2.org/hello/libhello) - new libformat/1.0.0+10 (required by libhello) - new libprint/1.0.0+10 (required by libhello) - new libhello/1.1.0+10 (required by hello) - new hello/1.0.0+9 + new libformat/1.0.0+11 (required by libhello) + new libprint/1.0.0+11 (required by libhello) + new libhello/1.1.0+11 (required by hello) + new hello/1.0.0+10 continue? [Y/n] y -checked out libformat/1.0.0+10 -checked out libprint/1.0.0+10 -checked out libhello/1.1.0+10 -checked out hello/1.0.0+9 -configured libformat/1.0.0+10 -configured libprint/1.0.0+10 -configured libhello/1.1.0+10 -configured hello/1.0.0+9 -version.in libprint-1.0.0+10/libprint/version.hxx.in -version.in libformat-1.0.0+10/libformat/version.hxx.in -version.in libhello-1.1.0+10/libhello/version.hxx.in -c++ libformat-1.0.0+10/libformat/cxx{format} -c++ libprint-1.0.0+10/libprint/cxx{print} -c++ libhello-1.1.0+10/libhello/cxx{hello} -c++ hello-1.0.0+9/hello/cxx{hello} -ld libprint-1.0.0+10/libprint/libs{print} -ld libformat-1.0.0+10/libformat/libs{format} -ld libhello-1.1.0+10/libhello/libs{hello} -ld hello-1.0.0+9/hello/exe{hello} -updated hello/1.0.0+9 +checked out libformat/1.0.0+11 +checked out libprint/1.0.0+11 +checked out libhello/1.1.0+11 +checked out hello/1.0.0+10 +configured libformat/1.0.0+11 +configured libprint/1.0.0+11 +configured libhello/1.1.0+11 +configured hello/1.0.0+10 +version libprint-1.0.0+11/libprint/in{version} -> libprint-1.0.0+11/libprint/hxx{version} +version libformat-1.0.0+11/libformat/in{version} -> libformat-1.0.0+11/libformat/hxx{version} +version libhello-1.1.0+11/libhello/in{version} -> libhello-1.1.0+11/libhello/hxx{version} +c++ libprint-1.0.0+11/libprint/cxx{print} -> libprint-1.0.0+11/libprint/objs{print} +c++ libformat-1.0.0+11/libformat/cxx{format} -> libformat-1.0.0+11/libformat/objs{format} +c++ libhello-1.1.0+11/libhello/cxx{hello} -> libhello-1.1.0+11/libhello/objs{hello} +c++ hello-1.0.0+10/hello/cxx{hello} -> hello-1.0.0+10/hello/obje{hello} +ld libprint-1.0.0+11/libprint/libs{print} +ld libformat-1.0.0+11/libformat/libs{format} +ld libhello-1.1.0+11/libhello/libs{hello} +ld hello-1.0.0+10/hello/exe{hello} +updated hello/1.0.0+10 + bpkg install hello -pc libformat-1.0.0+10/libformat/pcs{format} -pc libprint-1.0.0+10/libprint/pcs{print} -pc libhello-1.1.0+10/libhello/pcs{hello} -ld libhello-1.1.0+10/libhello/libs{hello} -ld hello-1.0.0+9/hello/exe{hello} -install /opt/tools/ -install /opt/tools/include/ -install /opt/tools/include/libhello/ -install libhello-1.1.0+10/libhello/hxx{export} -install libhello-1.1.0+10/libhello/hxx{hello} -install /opt/tools/share/ -install /opt/tools/share/doc/ -install /opt/tools/share/doc/libhello/ -install libhello-1.1.0+10/manifest{manifest} -install libhello-1.1.0+10/libhello/hxx{version} -install /opt/tools/include/libprint/ -install libprint-1.0.0+10/libprint/hxx{print} -install libprint-1.0.0+10/libprint/hxx{export} -install /opt/tools/share/doc/libprint/ -install libprint-1.0.0+10/manifest{manifest} -install libprint-1.0.0+10/libprint/hxx{version} -install libprint-1.0.0+10/libprint/libs{print} -install /opt/tools/include/libformat/ -install libformat-1.0.0+10/libformat/hxx{export} -install libformat-1.0.0+10/libformat/hxx{format} -install /opt/tools/share/doc/libformat/ -install libformat-1.0.0+10/manifest{manifest} -install libformat-1.0.0+10/libformat/hxx{version} -install libformat-1.0.0+10/libformat/libs{format} -install libhello-1.1.0+10/libhello/libs{hello} -install /opt/tools/bin/ -install hello-1.0.0+9/hello/exe{hello} -install /opt/tools/share/doc/hello/ -install hello-1.0.0+9/doc{README.md} -install hello-1.0.0+9/manifest{manifest} -installed hello/1.0.0+9 +pc libformat-1.0.0+11/libformat/libs{format} -> libformat-1.0.0+11/libformat/pcs{format} +pc libprint-1.0.0+11/libprint/libs{print} -> libprint-1.0.0+11/libprint/pcs{print} +pc libhello-1.1.0+11/libhello/libs{hello} -> libhello-1.1.0+11/libhello/pcs{hello} +ld libhello-1.1.0+11/libhello/libs{hello} +ld hello-1.0.0+10/hello/exe{hello} +install -d /opt/tools/ +install -d /opt/tools/include/ +install -d /opt/tools/include/libhello/ +install libhello-1.1.0+11/libhello/hxx{export} -> /opt/tools/include/libhello/ +install libhello-1.1.0+11/libhello/hxx{hello} -> /opt/tools/include/libhello/ +install -d /opt/tools/share/ +install -d /opt/tools/share/doc/ +install -d /opt/tools/share/doc/libhello/ +install libhello-1.1.0+11/manifest{manifest} -> /opt/tools/share/doc/libhello/ +install libhello-1.1.0+11/libhello/hxx{version} -> /opt/tools/include/libhello/ +install -d /opt/tools/include/libprint/ +install libprint-1.0.0+11/libprint/hxx{export} -> /opt/tools/include/libprint/ +install libprint-1.0.0+11/libprint/hxx{print} -> /opt/tools/include/libprint/ +install -d /opt/tools/share/doc/libprint/ +install libprint-1.0.0+11/manifest{manifest} -> /opt/tools/share/doc/libprint/ +install libprint-1.0.0+11/libprint/hxx{version} -> /opt/tools/include/libprint/ +install libprint-1.0.0+11/libprint/libs{print} -> /opt/tools/lib/ +install -d /opt/tools/include/libformat/ +install libformat-1.0.0+11/libformat/hxx{export} -> /opt/tools/include/libformat/ +install libformat-1.0.0+11/libformat/hxx{format} -> /opt/tools/include/libformat/ +install -d /opt/tools/share/doc/libformat/ +install libformat-1.0.0+11/manifest{manifest} -> /opt/tools/share/doc/libformat/ +install libformat-1.0.0+11/libformat/hxx{version} -> /opt/tools/include/libformat/ +install libformat-1.0.0+11/libformat/libs{format} -> /opt/tools/lib/ +install libhello-1.1.0+11/libhello/libs{hello} -> /opt/tools/lib/ +install -d /opt/tools/bin/ +install hello-1.0.0+10/hello/exe{hello} -> /opt/tools/bin/ +install -d /opt/tools/share/doc/hello/ +install hello-1.0.0+10/doc{README.md} -> /opt/tools/share/doc/hello/ +install hello-1.0.0+10/manifest{manifest} -> /opt/tools/share/doc/hello/ +installed hello/1.0.0+10 + /opt/tools/bin/hello World Hello, World! @@ -973,40 +978,40 @@ Hello, World! └── libprint └── manifest -13 directories, 24 files +14 directories, 24 files + bpkg uninstall hello -uninstall hello-1.0.0+9/manifest{manifest} -uninstall hello-1.0.0+9/doc{README.md} -uninstall /opt/tools/share/doc/hello/ -uninstall hello-1.0.0+9/hello/exe{hello} -uninstall /opt/tools/bin/ -uninstall libhello-1.1.0+10/libhello/libs{hello} -uninstall libformat-1.0.0+10/libformat/libs{format} -uninstall libformat-1.0.0+10/libformat/hxx{version} -uninstall libformat-1.0.0+10/manifest{manifest} -uninstall /opt/tools/share/doc/libformat/ -uninstall libformat-1.0.0+10/libformat/hxx{format} -uninstall libformat-1.0.0+10/libformat/hxx{export} -uninstall /opt/tools/include/libformat/ -uninstall libprint-1.0.0+10/libprint/libs{print} -uninstall libprint-1.0.0+10/libprint/hxx{version} -uninstall libprint-1.0.0+10/manifest{manifest} -uninstall /opt/tools/share/doc/libprint/ -uninstall libprint-1.0.0+10/libprint/hxx{export} -uninstall libprint-1.0.0+10/libprint/hxx{print} -uninstall /opt/tools/include/libprint/ -uninstall libhello-1.1.0+10/libhello/hxx{version} -uninstall libhello-1.1.0+10/manifest{manifest} -uninstall /opt/tools/share/doc/libhello/ -uninstall /opt/tools/share/doc/ -uninstall /opt/tools/share/ -uninstall libhello-1.1.0+10/libhello/hxx{hello} -uninstall libhello-1.1.0+10/libhello/hxx{export} -uninstall /opt/tools/include/libhello/ -uninstall /opt/tools/include/ -uninstall /opt/tools/ -uninstalled hello/1.0.0+9 +uninstall hello-1.0.0+10/manifest{manifest} <- /opt/tools/share/doc/hello/ +uninstall hello-1.0.0+10/doc{README.md} <- /opt/tools/share/doc/hello/ +uninstall -d /opt/tools/share/doc/hello/ +uninstall hello-1.0.0+10/hello/exe{hello} <- /opt/tools/bin/ +uninstall -d /opt/tools/bin/ +uninstall libhello-1.1.0+11/libhello/libs{hello} <- /opt/tools/lib/ +uninstall libformat-1.0.0+11/libformat/libs{format} <- /opt/tools/lib/ +uninstall libformat-1.0.0+11/libformat/hxx{version} <- /opt/tools/include/libformat/ +uninstall libformat-1.0.0+11/manifest{manifest} <- /opt/tools/share/doc/libformat/ +uninstall -d /opt/tools/share/doc/libformat/ +uninstall libformat-1.0.0+11/libformat/hxx{format} <- /opt/tools/include/libformat/ +uninstall libformat-1.0.0+11/libformat/hxx{export} <- /opt/tools/include/libformat/ +uninstall -d /opt/tools/include/libformat/ +uninstall libprint-1.0.0+11/libprint/libs{print} <- /opt/tools/lib/ +uninstall libprint-1.0.0+11/libprint/hxx{version} <- /opt/tools/include/libprint/ +uninstall libprint-1.0.0+11/manifest{manifest} <- /opt/tools/share/doc/libprint/ +uninstall -d /opt/tools/share/doc/libprint/ +uninstall libprint-1.0.0+11/libprint/hxx{print} <- /opt/tools/include/libprint/ +uninstall libprint-1.0.0+11/libprint/hxx{export} <- /opt/tools/include/libprint/ +uninstall -d /opt/tools/include/libprint/ +uninstall libhello-1.1.0+11/libhello/hxx{version} <- /opt/tools/include/libhello/ +uninstall libhello-1.1.0+11/manifest{manifest} <- /opt/tools/share/doc/libhello/ +uninstall -d /opt/tools/share/doc/libhello/ +uninstall -d /opt/tools/share/doc/ +uninstall -d /opt/tools/share/ +uninstall libhello-1.1.0+11/libhello/hxx{hello} <- /opt/tools/include/libhello/ +uninstall libhello-1.1.0+11/libhello/hxx{export} <- /opt/tools/include/libhello/ +uninstall -d /opt/tools/include/libhello/ +uninstall -d /opt/tools/include/ +uninstall -d /opt/tools/ +uninstalled hello/1.0.0+10 + bpkg drop hello following dependencies were automatically built but will no longer be used: @@ -1027,3 +1032,5 @@ purged hello purged libhello purged libformat purged libprint + +Script done on 2023-06-28 12:03:39+02:00 [COMMAND_EXIT_CODE="0"] diff --git a/stage-queue b/stage-queue index e6787f1..a378dd7 100755 --- a/stage-queue +++ b/stage-queue @@ -74,9 +74,14 @@ etc/stage-pkg -Q alpha -c -d Qt5 packaging/qt5/Qt5/Qt5Moc \ etc/stage-pkg -Q alpha -c -d Qt6 packaging/qt6/Qt6/Qt6Moc \ packaging/qt6/Qt6/Qt6Rcc \ - packaging/qt6/Qt6/libQt6Core + packaging/qt6/Qt6/Qt6Uic \ + packaging/qt6/Qt6/libQt6Core \ + packaging/qt6/Qt6/libQt6Gui \ + packaging/qt6/Qt6/libQt6GuiTests \ + packaging/qt6/Qt6/libQt6Widgets \ + packaging/qt6/Qt6/libQt6WidgetsTests # Regenerate repository and publish. # -etc/stage-pkg -Q "" -g --min-bpkg-version 0.15.0 +etc/stage-pkg -Q "" -g --min-bpkg-version 0.16.0 etc/stage-pkg -Q "" -p @@ -12,15 +12,15 @@ usage="usage: etc/version" # NOTE: also update in libbuild2-<module>? # NOTE: if upgrade is supported, should be previous release version. # -build2_min=0.15.0- -bpkg_min=0.15.0- +build2_min=0.16.0- +bpkg_min=0.16.0- -ver=0.16.0-a.0.z -#ver=0.15.0 +#ver=0.17.0-a.0.z +ver=0.16.0 mods=(libbutl libbutl.bash libbpkg libbbot bpkg bpkg-util build2) -odb_ver=2.5.0-b.24.z -#odb_ver=2.5.0-b.25 +#odb_ver=2.5.0-b.26.z +odb_ver=2.5.0-b.25 odb_mods=(libodb libodb-sqlite libodb-pgsql) #xml_ver=1.1.0-b.10.z |