diff options
| -rw-r--r-- | doc/release.cli | 80 | ||||
| -rw-r--r-- | intro2-tldr.orig | 30 | ||||
| -rw-r--r-- | intro2-tour.orig | 381 | ||||
| -rwxr-xr-x | review | 4 | ||||
| -rwxr-xr-x | stage | 11 | ||||
| -rwxr-xr-x | stage-queue | 10 | ||||
| -rwxr-xr-x | version | 44 |
7 files changed, 289 insertions, 271 deletions
diff --git a/doc/release.cli b/doc/release.cli index 17bc043..830dbab 100644 --- a/doc/release.cli +++ b/doc/release.cli @@ -65,7 +65,7 @@ distribution from \c{etc/stage} and add the pre-distributed packages \h#review|Review \c{@@}| - Review \c{@@} notes: + Review \c{etc/review} for new modules. Then review \c{@@} notes: \ etc/review | less -R @@ -175,7 +175,7 @@ distribution from \c{etc/stage} and add the pre-distributed packages \ul| - \li|Install guide: 1 & 2 (also review build2-toolchain commit log).| + \li|Install guide: 1 & 2 (also review \c{build2-toolchain} commit log).| \li|Toolchain introduction: 1, 2 & 3 (use \c{intro} script output for 2).| @@ -339,7 +339,7 @@ distribution from \c{etc/stage} and add the pre-distributed packages \ git pull bdep release --no-open --show-push [--alpha|--beta] - # review commit + # review commit, run update (in case anything comitted is pre-generated) git push ... \ @@ -363,36 +363,52 @@ distribution from \c{etc/stage} and add the pre-distributed packages done if created projects use new features.} \N|Why shouldn't we always do this for simplicity? Maybe because then - we cannot run tests using \c{public} services? Also the below upgrade - steps will break since there is no continuity.|| + we cannot run tests using \c{public} services? - \li|Change version by updating (including with new modules and/or new - dependencies) and then executing: + Also if we change this in toolchain packages, the below upgrade steps + will break since there is no continuity. Perhaps do it in two stages: + first change version to final, upgrade, then change toolchain + dependencies to final, upgrade again? But then nobody involed in + development will be able to pull and upgrade. Maybe KISS and keep + it pre-release.|| - \ - etc/version - ./commit.sh - git -C build2-toolchain commit --amend # \"Change version to X.Y.Z\" - \ + \li|Change version by updating \c{etc/version} (including with new modules + and/or new dependencies, but keep pre-release in minimum toolchain + version requirements) and then executing: - Note that \c{libbuild2-*} modules (e.g., \c{libbuild2-hello}) are - independently versioned but may still need to update minimum \c{build2} - version requirements (see below). + \ + etc/version + ./commit.sh + git -C build2-toolchain commit --amend # \"Change version to X.Y.Z\" + \ - | + Note that \c{libbuild2-*} modules (e.g., \c{libbuild2-hello}) are + independently versioned but may still need to update minimum toolchain + version requirements (see below).| \li|Tag by executing \c{tag.sh\ <version>}.| - \li|Regenerate documentation in each package.| + + \li|Release all standard pre-installed build system modules. Update + minimum toolchain version requirements. + + \ + bdep release --no-open --show-push + \ + + | + + \li|Regenerate documentation in each package (including standard + pre-installed build system modules, use \c{BDEP_SYNC=0}).| \li|Upgrade all dependencies in configure-only mode by executing \c{etc/upgrade\ -c}. - If the \c{build2}/\c{bpkg} requirements in the manifests have been - bumped to the version being released, then first bootstrap the build - system and update \c{bpkg}/\c{bdep} (might have to hack their - generated \c{version.hxx} to disable constraint checking; also if you - forget \c{BDEP_SYNC=0} it will most likely hose the build + Avoid this (see above): If the \c{build2}/\c{bpkg} requirements in the + manifests have been bumped to the version being released, then first + bootstrap the build system and update \c{bpkg}/\c{bdep} (might have to + hack their generated \c{version.hxx} to disable constraint checking; + also if you forget \c{BDEP_SYNC=0} it will most likely hose the build configuration). \ @@ -432,12 +448,16 @@ distribution from \c{etc/stage} and add the pre-distributed packages \ BDEP_SYNC=0 b ~/work/build2/builds/gcc7-asan/ + + b build2/ bpkg/ bdep/ + + # Update standard pre-installed build system modules. \ | - \li|Update \c{libbuild2-*} modules if required.|| + \li|Update other \c{libbuild2-*} modules if required.|| Verify key tests pass (in particular, the \c{bdep} tests will now be running against \c{public} services): @@ -446,6 +466,8 @@ distribution from \c{etc/stage} and add the pre-distributed packages b test: build2/ bpkg/ bdep/ b test: bpkg/ config.bpkg.test.remote=true b test: libbuild2-hello/libbuild2-hello-tests/ + + # Test standard pre-installed build system modules. \ \N|We could have queued after this step before preparing @@ -460,6 +482,8 @@ distribution from \c{etc/stage} and add the pre-distributed packages \ ./push.sh + # Push (with tags) standard pre-installed build system modules. + cd build2-toolchain git submodule update --remote --checkout @@ -479,7 +503,7 @@ distribution from \c{etc/stage} and add the pre-distributed packages \li|Update ODB by copying relevant files from the previous step (trust me, this is the easy way for now). Make sure all \c{*-odb.*} are copied!| - \li|Change \c{BUILD2_REPO} in \c{build2-toolchain} build scripts to + \li|Change \c{build2_repo} in \c{build2-toolchain} \c{buildfile} to \c{queue}.|| Finally, push the changes: @@ -514,10 +538,10 @@ distribution from \c{etc/stage} and add the pre-distributed packages git push \ - If queued package manifests contain new values, then the bpkg-rep-publish - script will fail to create repository due to unknown manifest values. To - resolve this we temporarily add (to \c{crontab}) \c{--ignore-unknown} and - make a note to restore. + If queued package manifests contain new values, then the + \c{bpkg-rep-publish} script will fail to create repository due to unknown + manifest values. To resolve this we temporarily add (to \c{crontab}) + \c{--ignore-unknown} and make a note to restore. \h#build-public|Verify queued packages build with \c{public}| diff --git a/intro2-tldr.orig b/intro2-tldr.orig index f96c55a..769f179 100644 --- a/intro2-tldr.orig +++ b/intro2-tldr.orig @@ -1,6 +1,6 @@ created new executable project hello in /tmp/hello.git/ -[master (root-commit) 3eadc4d] first commit - 13 files changed, 127 insertions(+) +[master (root-commit) 838e609] first commit + 13 files changed, 141 insertions(+) create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 README.md @@ -38,7 +38,7 @@ hello + bdep init --config-create ../hello-gcc cc config.cxx=g++ initializing in project /tmp/hello/ -created configuration /tmp/hello-gcc/ 1 default,forwarded,auto-synchronized +created configuration /tmp/hello-gcc/ 1 target default,forwarded,auto-synchronized synchronizing: new hello/0.1.0 @@ -59,9 +59,9 @@ synchronizing /tmp/hello-gcc/: new libhello/1.0.0+4 (required by hello) upgrade hello/0.1.0#1 distributing libhello/1.0.0+4 -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.in ../hello-gcc/libhello-1.0.0+4/libhello/version.hxx.in 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/ @@ -79,22 +79,22 @@ fetching from https://git.build2.org/hello/libprint.git + bdep status -i hello configured 0.1.0#1 - libhello ^1.0.0 configured 1.0.0+4 available [1.1.0+6] [1.0.0+6] + libhello ^1.0.0 configured 1.0.0+4 available [1.1.0+8] [1.0.0+8] + bdep sync libhello synchronizing: - new libformat/1.0.0+6 (required by libhello) - new libprint/1.0.0+6 (required by libhello) - upgrade libhello/1.1.0+6 + new libformat/1.0.0+8 (required by libhello) + new libprint/1.0.0+8 (required by libhello) + upgrade libhello/1.1.0+8 reconfigure hello/0.1.0#1 -distributing libformat/1.0.0+6 -distributing libprint/1.0.0+6 -distributing libhello/1.1.0+6 +distributing libformat/1.0.0+8 +distributing libprint/1.0.0+8 +distributing libhello/1.1.0+8 + bdep sync libhello/1.0.0 synchronizing: - drop libprint/1.0.0+6 (unused) - drop libformat/1.0.0+6 (unused) - downgrade libhello/1.0.0+6 + drop libprint/1.0.0+8 (unused) + drop libformat/1.0.0+8 (unused) + downgrade libhello/1.0.0+8 reconfigure hello/0.1.0#1 -distributing libhello/1.0.0+6 +distributing libhello/1.0.0+8 diff --git a/intro2-tour.orig b/intro2-tour.orig index fafd36b..02f006e 100644 --- a/intro2-tour.orig +++ b/intro2-tour.orig @@ -64,38 +64,37 @@ license: other: proprietary ; Not free/open source. description-file: README.md url: https://example.org/hello email: boris@codesynthesis.com -depends: * build2 >= 0.13.0- -depends: * bpkg >= 0.13.0- +#build-error-email: boris@codesynthesis.com +depends: * build2 >= 0.14.0- +depends: * bpkg >= 0.14.0- #depends: libhello ^1.0.0 + bdep init -C ../hello-gcc @gcc cc config.cxx=g++ initializing in project /tmp/hello/ -created configuration @gcc /tmp/hello-gcc/ 1 default,forwarded,auto-synchronized +created configuration @gcc /tmp/hello-gcc/ 1 target default,forwarded,auto-synchronized synchronizing: new hello/0.1.0-a.0.19700101000000 + bdep init -C ../hello-clang @clang cc config.cxx=clang++-5.0 initializing in project /tmp/hello/ -created configuration @clang /tmp/hello-clang/ 2 auto-synchronized +created configuration @clang /tmp/hello-clang/ 2 target auto-synchronized synchronizing: new hello/0.1.0-a.0.19700101000000 -+ ls -d -1 ../hello ../hello-clang ../hello-gcc ../hello-gcc-1 ../hello.git ++ ls -d -1 ../hello ../hello-clang ../hello-gcc ../hello ../hello-clang ../hello-gcc -../hello-gcc-1 -../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/ -created configuration @debug /tmp/hello-vc-debug/ 3 auto-synchronized +created configuration @debug /tmp/hello-vc-debug/ 3 target auto-synchronized synchronizing: new hello/0.1.0-a.0.19700101000000 + bdep init -C ../hello-vc-release @release cc config.cxx=cl-15 config.cc.coptions=/O2 initializing in project /tmp/hello/ -created configuration @release /tmp/hello-vc-release/ 4 auto-synchronized +created configuration @release /tmp/hello-vc-release/ 4 target auto-synchronized synchronizing: new hello/0.1.0-a.0.19700101000000 @@ -168,7 +167,7 @@ test hello/testscript{testscript}@../hello-clang/hello/hello/ ../hello-clang/hel + bdep init -C ../hello-mingw @mingw cc config.cxx=x86_64-w64-mingw32-g++ initializing in project /tmp/hello/ -created configuration @mingw /tmp/hello-mingw/ 5 auto-synchronized +created configuration @mingw /tmp/hello-mingw/ 5 target auto-synchronized synchronizing: new hello/0.1.0-a.0.19700101000000 @@ -181,13 +180,13 @@ ld ../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! +Hello, Windows!
+ git add . + git commit -m Initial implementation -[master (root-commit) 4d5dc0f] Initial implementation - 13 files changed, 127 insertions(+) +[master (root-commit) d998af5] Initial implementation + 13 files changed, 141 insertions(+) create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 README.md @@ -206,20 +205,20 @@ Hello, Windows! + git push origin master -u --force To github.com:boris-kolpackov/hello.git - + 04c937e...4d5dc0f master -> master (forced update) + + 5557360...d998af5 master -> master (forced update) Branch 'master' set up to track remote branch 'master' from 'origin'. + bdep ci --simulate success submitting: to: https://ci.stage.build2.org - in: https://github.com/boris-kolpackov/hello.git#master@4d5dc0f450c972b4f4eadaf59db44d40c244a50e + in: https://github.com/boris-kolpackov/hello.git#master@d998af5d8a31b2dc6e2c28e4fd1f242935b89b7e package: hello - version: 0.1.0-a.0.20200717153215.4d5dc0f450c9 + version: 0.1.0-a.0.20211016074742.d998af5d8a31 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
79 812 0 0 100 649 0 434 0:00:01 0:00:01 --:--:-- 434
100 812 100 163 100 649 109 434 0:00:01 0:00:01 --:--:-- 434 -CI request is queued: https://ci.stage.build2.org/@c59c5306-ac49-465f-a817-3a6972271ed4 -reference: c59c5306-ac49-465f-a817-3a6972271ed4 +
0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0
0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0
79 812 0 0 100 649 0 468 0:00:01 0:00:01 --:--:-- 468
100 812 100 163 100 649 117 468 0:00:01 0:00:01 --:--:-- 468 +CI request is queued: https://ci.stage.build2.org/@1773db76-9c9a-456c-a0ca-864c22b05ded +reference: 1773db76-9c9a-456c-a0ca-864c22b05ded + bdep deinit @gcc @clang deinitializing in project /tmp/hello/ @@ -233,13 +232,13 @@ synchronizing: + bdep new -C hello-gcc @gcc -t exe -l c++ hello cc config.cxx=g++ created new executable project hello in /tmp/hello/ -created configuration @gcc /tmp/hello-gcc/ 1 default,forwarded,auto-synchronized +created configuration @gcc /tmp/hello-gcc/ 1 target default,forwarded,auto-synchronized synchronizing: new hello/0.1.0-a.0.19700101000000 + bdep init -C ../hello-clang @clang cc config.cxx=clang++-5.0 initializing in project /tmp/hello/ -created configuration @clang /tmp/hello-clang/ 2 auto-synchronized +created configuration @clang /tmp/hello-clang/ 2 target auto-synchronized synchronizing: new hello/0.1.0-a.0.19700101000000 @@ -250,8 +249,8 @@ 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.1.0+6 -libhello/1.0.0+6 +libhello/1.0.0+8 +libhello/1.1.0+8 + bpkg rep-info https://git.build2.org/hello/libhello.git#HEAD querying https://git.build2.org/hello/libhello.git @@ -260,37 +259,37 @@ git:build2.org/hello/libhello#HEAD https://git.build2.org/hello/libhello.git#HEA 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+6 +libhello/1.1.0+8 + bdep status fetching pkg:stage.build2.org (prerequisite of dir:/tmp/hello) warning: authenticity of the certificate for repository pkg:stage.build2.org cannot be established -certificate is for **stage.build2.org, "Code Synthesis" <stage-admin@build2.org> +certificate is for **build2.org, "Code Synthesis" <admin@build2.org> certificate SHA256 fingerprint: 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 trust this certificate? [y/n] hello configured 0.1.0-a.0.19700101000000 available 0.1.0-a.0.19700101000000#1 + bdep sync synchronizing: - new libhello/1.0.0+5 (required by hello) + new libhello/1.0.0+7 (required by hello) upgrade hello/0.1.0-a.0.19700101000000#1 - 0K ... 100% 120M=0s + 0K ... 100% 77.1M=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+5/libhello/version.hxx.in -c++ ../hello-gcc/libhello-1.0.0+5/libhello/cxx{hello} +version.in ../hello-gcc/libhello-1.0.0+7/libhello/version.hxx.in +c++ ../hello-gcc/libhello-1.0.0+7/libhello/cxx{hello} c++ hello/cxx{hello}@../hello-gcc/hello/hello/ -ld ../hello-gcc/libhello-1.0.0+5/libhello/libs{hello} +ld ../hello-gcc/libhello-1.0.0+7/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+5 + libhello ^1.0.0 configured 1.0.0+7 in configuration @clang: fetching pkg:stage.build2.org (prerequisite of dir:/tmp/hello) @@ -301,41 +300,41 @@ in configuration @gcc: in configuration @clang: synchronizing: - new libhello/1.0.0+5 (required by hello) + new libhello/1.0.0+7 (required by hello) upgrade hello/0.1.0-a.0.19700101000000#1 - 0K ... 100% 75.8M=0s + 0K ... 100% 62.8M=0s + bdep test -ai in configuration @gcc: -c++ ../hello-gcc/libhello-1.0.0+5/tests/basics/cxx{driver} -ld ../hello-gcc/libhello-1.0.0+5/tests/basics/exe{driver} +c++ ../hello-gcc/libhello-1.0.0+7/tests/basics/cxx{driver} +ld ../hello-gcc/libhello-1.0.0+7/tests/basics/exe{driver} +test ../hello-gcc/libhello-1.0.0+7/tests/basics/exe{driver} test hello/testscript{testscript}@../hello-gcc/hello/hello/ ../hello-gcc/hello/hello/exe{hello} -test ../hello-gcc/libhello-1.0.0+5/tests/basics/exe{driver} in configuration @clang: mkdir ../hello-clang/hello/fsdir{hello/} -version.in ../hello-clang/libhello-1.0.0+5/libhello/version.hxx.in -c++ ../hello-clang/libhello-1.0.0+5/libhello/cxx{hello} +version.in ../hello-clang/libhello-1.0.0+7/libhello/version.hxx.in c++ hello/cxx{hello}@../hello-clang/hello/hello/ -c++ ../hello-clang/libhello-1.0.0+5/tests/basics/cxx{driver} -ld ../hello-clang/libhello-1.0.0+5/libhello/libs{hello} +c++ ../hello-clang/libhello-1.0.0+7/libhello/cxx{hello} +c++ ../hello-clang/libhello-1.0.0+7/tests/basics/cxx{driver} +ld ../hello-clang/libhello-1.0.0+7/libhello/libs{hello} +ld ../hello-clang/libhello-1.0.0+7/tests/basics/exe{driver} ld ../hello-clang/hello/hello/exe{hello} -ld ../hello-clang/libhello-1.0.0+5/tests/basics/exe{driver} +test ../hello-clang/libhello-1.0.0+7/tests/basics/exe{driver} test hello/testscript{testscript}@../hello-clang/hello/hello/ ../hello-clang/hello/hello/exe{hello} -test ../hello-clang/libhello-1.0.0+5/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+5 (unused) + drop libhello/1.0.0+7 (unused) upgrade hello/0.1.0-a.0.19700101000000#3 synchronizing: - new libhello/1.0.0+5 (required by hello) + new libhello/1.0.0+7 (required by hello) upgrade hello/0.1.0-a.0.19700101000000#4 - 0K ... 100% 71.2M=0s + 0K ... 100% 11.2M=0s + bdep fetch fetching git:build2.org/hello/libhello (prerequisite of dir:/tmp/hello) querying https://git.build2.org/hello/libhello.git @@ -349,38 +348,38 @@ fetching from https://git.build2.org/hello/libprint.git fetching pkg:stage.build2.org (prerequisite of dir:/tmp/hello) + bdep status libhello -libhello configured 1.0.0+5 available [1.1.0+6] [1.0.0+6] +libhello configured 1.0.0+7 available [1.1.0+8] [1.0.0+8] + bdep sync libhello synchronizing: - new libformat/1.0.0+6 (required by libhello) - new libprint/1.0.0+6 (required by libhello) - upgrade libhello/1.1.0+6 + new libformat/1.0.0+8 (required by libhello) + new libprint/1.0.0+8 (required by libhello) + upgrade libhello/1.1.0+8 reconfigure hello/0.1.0-a.0.19700101000000#4 -distributing libformat/1.0.0+6 -distributing libprint/1.0.0+6 -distributing libhello/1.1.0+6 +distributing libformat/1.0.0+8 +distributing libprint/1.0.0+8 +distributing libhello/1.1.0+8 + bdep status -r hello configured 0.1.0-a.0.19700101000000#4 - libhello ^1.0.0 configured 1.1.0+6 - libformat ^1.0.0 configured 1.0.0+6 - libprint ^1.0.0 configured 1.0.0+6 + libhello ^1.0.0 configured 1.1.0+8 + libformat ^1.0.0 configured 1.0.0+8 + libprint ^1.0.0 configured 1.0.0+8 + bdep status -o libhello -libhello configured 1.1.0+6 available (1.1.0+6) [1.0.0+6] [1.0.0+5] +libhello configured 1.1.0+8 available (1.1.0+8) [1.0.0+8] [1.0.0+7] + bdep sync libhello/1.0.0 synchronizing: - drop libprint/1.0.0+6 (unused) - drop libformat/1.0.0+6 (unused) - downgrade libhello/1.0.0+6 + drop libprint/1.0.0+8 (unused) + drop libformat/1.0.0+8 (unused) + downgrade libhello/1.0.0+8 reconfigure hello/0.1.0-a.0.19700101000000#4 -distributing libhello/1.0.0+6 +distributing libhello/1.0.0+8 + bdep new -C libextra-gcc -t lib -l c++ libextra cc config.cxx=g++ created new library project libextra in /tmp/libextra/ -created configuration /tmp/libextra-gcc/ 1 default,forwarded,auto-synchronized +created configuration /tmp/libextra-gcc/ 1 target default,forwarded,auto-synchronized synchronizing: new libextra/0.1.0-a.0.19700101000000 @@ -389,8 +388,11 @@ 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/ -ar libextra-gcc/libextra/libextra/liba{extra} +pc libextra-gcc/libextra/libextra/pca{extra} +pc libextra-gcc/libextra/libextra/pcs{extra} +pc libextra-gcc/libextra/libextra/pc{extra} 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/ @@ -430,7 +432,7 @@ unpkg-gcc + 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/ -created configuration @gcc1 /tmp/hello-gcc-1/ 3 auto-synchronized +created configuration @gcc1 /tmp/hello-gcc-1/ 3 target auto-synchronized fetching git:build2.org/hello/libhello (prerequisite of dir:/tmp/hello) querying https://git.build2.org/hello/libhello.git fetching from https://git.build2.org/hello/libhello.git @@ -442,48 +444,49 @@ querying https://git.build2.org/hello/libprint.git fetching from https://git.build2.org/hello/libprint.git fetching pkg:stage.build2.org (prerequisite of dir:/tmp/hello) synchronizing: - new libformat/1.0.0+6 (required by libhello) - new libprint/1.0.0+6 (required by libhello) - new libhello/1.1.0+6 (required by hello) + new libformat/1.0.0+8 (required by libhello) + new libprint/1.0.0+8 (required by libhello) + new libhello/1.1.0+8 (required by hello) new hello/0.1.0-a.0.19700101000000 -distributing libformat/1.0.0+6 -distributing libprint/1.0.0+6 -distributing libhello/1.1.0+6 +distributing libformat/1.0.0+8 +distributing libprint/1.0.0+8 +distributing libhello/1.1.0+8 + b test: ../hello-gcc-1/ mkdir ../hello-gcc-1/hello/fsdir{hello/} -version.in ../hello-gcc-1/libprint-1.0.0+6/libprint/version.hxx.in -version.in ../hello-gcc-1/libformat-1.0.0+6/libformat/version.hxx.in -version.in ../hello-gcc-1/libhello-1.1.0+6/libhello/version.hxx.in -c++ ../hello-gcc-1/libhello-1.1.0+6/libhello/cxx{hello} -c++ ../hello-gcc-1/libformat-1.0.0+6/tests/basics/cxx{driver} -c++ ../hello-gcc-1/libprint-1.0.0+6/libprint/cxx{print} -c++ ../hello-gcc-1/libprint-1.0.0+6/tests/basics/cxx{driver} +version.in ../hello-gcc-1/libhello-1.1.0+8/libhello/version.hxx.in +version.in ../hello-gcc-1/libformat-1.0.0+8/libformat/version.hxx.in +version.in ../hello-gcc-1/libprint-1.0.0+8/libprint/version.hxx.in +c++ ../hello-gcc-1/libprint-1.0.0+8/libprint/cxx{print} +c++ ../hello-gcc-1/libprint-1.0.0+8/tests/basics/cxx{driver} +c++ ../hello-gcc-1/libformat-1.0.0+8/libformat/cxx{format} +c++ ../hello-gcc-1/libformat-1.0.0+8/tests/basics/cxx{driver} +c++ ../hello-gcc-1/libhello-1.1.0+8/libhello/cxx{hello} +c++ ../hello-gcc-1/libhello-1.1.0+8/tests/basics/cxx{driver} c++ hello/cxx{hello}@../hello-gcc-1/hello/hello/ -c++ ../hello-gcc-1/libhello-1.1.0+6/tests/basics/cxx{driver} -c++ ../hello-gcc-1/libformat-1.0.0+6/libformat/cxx{format} -ld ../hello-gcc-1/libprint-1.0.0+6/libprint/libs{print} -ld ../hello-gcc-1/libprint-1.0.0+6/tests/basics/exe{driver} -ld ../hello-gcc-1/libformat-1.0.0+6/libformat/libs{format} -ld ../hello-gcc-1/libformat-1.0.0+6/tests/basics/exe{driver} -ld ../hello-gcc-1/libhello-1.1.0+6/libhello/libs{hello} -ld ../hello-gcc-1/libhello-1.1.0+6/tests/basics/exe{driver} +ld ../hello-gcc-1/libprint-1.0.0+8/libprint/libs{print} +ld ../hello-gcc-1/libprint-1.0.0+8/tests/basics/exe{driver} +ld ../hello-gcc-1/libformat-1.0.0+8/libformat/libs{format} +ld ../hello-gcc-1/libformat-1.0.0+8/tests/basics/exe{driver} +ld ../hello-gcc-1/libhello-1.1.0+8/libhello/libs{hello} ld ../hello-gcc-1/hello/hello/exe{hello} +ld ../hello-gcc-1/libhello-1.1.0+8/tests/basics/exe{driver} +test ../hello-gcc-1/libprint-1.0.0+8/tests/basics/exe{driver} +test ../hello-gcc-1/libformat-1.0.0+8/tests/basics/exe{driver} +test ../hello-gcc-1/libhello-1.1.0+8/tests/basics/exe{driver} test hello/testscript{testscript}@../hello-gcc-1/hello/hello/ ../hello-gcc-1/hello/hello/exe{hello} -test ../hello-gcc-1/libhello-1.1.0+6/tests/basics/exe{driver} -test ../hello-gcc-1/libprint-1.0.0+6/tests/basics/exe{driver} -test ../hello-gcc-1/libformat-1.0.0+6/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+6/build/config.build -save ../hello-gcc/libhello-1.0.0+6/tests/build/config.build +save ../hello-gcc/libhello-1.0.0+8/build/config.build +save ../hello-gcc/libhello-1.0.0+8/tests/build/config.build + b test -c++ ../hello-gcc/libhello-1.0.0+6/libhello/cxx{hello} +version.in ../hello-gcc/libhello-1.0.0+8/libhello/version.hxx.in +c++ ../hello-gcc/libhello-1.0.0+8/libhello/cxx{hello} c++ hello/cxx{hello}@../hello-gcc/hello/hello/ -ld ../hello-gcc/libhello-1.0.0+6/libhello/libs{hello} +ld ../hello-gcc/libhello-1.0.0+8/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} @@ -495,7 +498,7 @@ synchronizing: + bdep new -C hello-gcc @gcc -t exe -l c++ hello cc config.cxx=g++ created new executable project hello in /tmp/hello/ -created configuration @gcc /tmp/hello-gcc/ 1 default,forwarded,auto-synchronized +created configuration @gcc /tmp/hello-gcc/ 1 target default,forwarded,auto-synchronized synchronizing: new hello/0.1.0-a.0.19700101000000 To github.com:boris-kolpackov/hello.git @@ -504,8 +507,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) e49d672] Initial implementation - 13 files changed, 127 insertions(+) +[master (root-commit) af66fb2] Initial implementation + 13 files changed, 141 insertions(+) create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 README.md @@ -520,15 +523,15 @@ To github.com:boris-kolpackov/hello.git create mode 100644 manifest create mode 100644 repositories.manifest To github.com:boris-kolpackov/hello.git - + 4d5dc0f...e49d672 master -> master (forced update) + + d998af5...af66fb2 master -> master (forced update) Branch 'master' set up to track remote branch 'master' from 'origin'. + bdep status -hello configured 0.1.0-a.0.19700101000000 available 0.1.0-a.0.20200717153600.e49d672fb0c8 +hello configured 0.1.0-a.0.19700101000000 available 0.1.0-a.0.20211016074922.af66fb280c29 + b info project: hello -version: 0.1.0-a.0.20200717153600.e49d672fb0c8 +version: 0.1.0-a.0.20211016074922.af66fb280c29 summary: hello C++ executable url: https://example.org/hello src_root: /tmp/hello/ @@ -537,18 +540,19 @@ amalgamation: ../ subprojects: operations: update clean test update-for-test install uninstall update-for-install meta-operations: perform configure disfigure dist info +modules: version config test install dist + bdep sync synchronizing: - upgrade hello/0.1.0-a.0.20200717153600.e49d672fb0c8 + upgrade hello/0.1.0-a.0.20211016074922.af66fb280c29 + bdep status -hello configured 0.1.0-a.0.20200717153600.e49d672fb0c8 -[master 5f5f95b] Another commit +hello configured 0.1.0-a.0.20211016074922.af66fb280c29 +[master f055ca5] Another commit 1 file changed, 1 insertion(+) + bdep status -hello configured 0.1.0-a.0.20200717153600.e49d672fb0c8 available 0.1.0-a.0.20200717153604.5f5f95b67e7b +hello configured 0.1.0-a.0.20211016074922.af66fb280c29 available 0.1.0-a.0.20211016074925.f055ca500a96 + bdep release --alpha --push releasing: @@ -559,9 +563,9 @@ releasing: commit: yes tag: v0.1.0-a.1 push: origin/master -continue? [y/n] [master 4be6af2] Release version 0.1.0-a.1 +continue? [y/n] [master e99c5ac] Release version 0.1.0-a.1 1 file changed, 1 insertion(+), 1 deletion(-) -[master a5ac778] Change version to 0.1.0-a.1.z +[master 29af065] Change version to 0.1.0-a.1.z 1 file changed, 1 insertion(+), 1 deletion(-) pushing branch master, tag v0.1.0-a.1 @@ -573,7 +577,7 @@ releasing: commit: yes tag: v0.1.0 push: origin/master -continue? [y/n] [master 6180433] Release version 0.1.0 +continue? [y/n] [master ced585b] Release version 0.1.0 1 file changed, 1 insertion(+), 1 deletion(-) pushing branch master, tag v0.1.0 @@ -590,17 +594,17 @@ publishing: control: https://github.com/boris-kolpackov/hello.git warning: publishing using staged build2 toolchain continue? [y/n] pushing branch build2-control -remote: -remote: Create a pull request for 'build2-control' on GitHub by visiting: -remote: https://github.com/boris-kolpackov/hello/pull/new/build2-control -remote: +remote: +remote: Create a pull request for 'build2-control' on GitHub by visiting: +remote: https://github.com/boris-kolpackov/hello/pull/new/build2-control +remote: 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
100 1970 0 0 100 1970 0 888 0:00:02 0:00:02 --:--:-- 888
100 2086 100 116 100 1970 50 864 0:00:02 0:00:02 --:--:-- 864 +
0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0
0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0
94 2203 0 0 100 2087 0 1315 0:00:01 0:00:01 --:--:-- 1315
100 2203 100 116 100 2087 73 1315 0:00:01 0:00:01 --:--:-- 1315 package submission is queued: https://queue.cppget.org/hello/0.1.0 -reference: a5825131bec6 +reference: 44aaead7a984 + bdep release --open --push opening: @@ -609,19 +613,19 @@ opening: open: 0.2.0-a.0.z commit: yes push: origin/master -continue? [y/n] [master 59b015a] Change version to 0.2.0-a.0.z +continue? [y/n] [master 78814f9] Change version to 0.2.0-a.0.z 1 file changed, 1 insertion(+), 1 deletion(-) pushing branch master + bdep new -C hello-gcc @gcc -t exe -l c++ hello cc config.cxx=g++ created new executable project hello in /tmp/hello/ -created configuration @gcc /tmp/hello-gcc/ 1 default,forwarded,auto-synchronized +created configuration @gcc /tmp/hello-gcc/ 1 target default,forwarded,auto-synchronized synchronizing: new hello/0.1.0-a.0.19700101000000 + bdep init -C ../hello-clang @clang cc config.cxx=clang++-5.0 initializing in project /tmp/hello/ -created configuration @clang /tmp/hello-clang/ 2 auto-synchronized +created configuration @clang /tmp/hello-clang/ 2 target auto-synchronized synchronizing: new hello/0.1.0-a.0.19700101000000 @@ -659,13 +663,13 @@ libhello + bdep init -A ../hello-gcc @gcc initializing in project /tmp/libhello/ -added configuration @gcc /tmp/hello-gcc/ 1 default,forwarded,auto-synchronized +added configuration @gcc /tmp/hello-gcc/ 1 target default,forwarded,auto-synchronized synchronizing: new libhello/0.1.0-a.0.19700101000000 + bdep init -A ../hello-clang @clang initializing in project /tmp/libhello/ -added configuration @clang /tmp/hello-clang/ 2 auto-synchronized +added configuration @clang /tmp/hello-clang/ 2 target auto-synchronized synchronizing: new libhello/0.1.0-a.0.19700101000000 @@ -678,18 +682,18 @@ mkdir ../hello-gcc/libhello/fsdir{libhello/} 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++ 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} -test hello/testscript{testscript}@../hello-gcc/hello/hello/ ../hello-gcc/hello/hello/exe{hello} test ../hello-gcc/libhello/tests/basics/exe{driver} +test hello/testscript{testscript}@../hello-gcc/hello/hello/ ../hello-gcc/hello/hello/exe{hello} + bdep new -C hello-gcc @gcc -t exe -l c++ hello cc config.cxx=g++ created new executable project hello in /tmp/hello/ -created configuration @gcc /tmp/hello-gcc/ 1 default,forwarded,auto-synchronized +created configuration @gcc /tmp/hello-gcc/ 1 target default,forwarded,auto-synchronized synchronizing: new hello/0.1.0-a.0.19700101000000 @@ -697,7 +701,7 @@ synchronizing: + bdep init -C ../hello-clang @clang cc config.cxx=clang++-5.0 initializing in project /tmp/hello/ -created configuration @clang /tmp/hello-clang/ 2 auto-synchronized +created configuration @clang /tmp/hello-clang/ 2 target auto-synchronized synchronizing: new hello/0.1.0-a.0.19700101000000 @@ -737,11 +741,13 @@ 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/hello/testscript{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/tools/ + uuid: 481e4c3d-c27d-49bc-80b3-842eef804942 + type: target + cd tools @@ -759,68 +765,71 @@ fetching from https://git.build2.org/hello/libformat.git fetching git:build2.org/hello/libprint##HEAD (prerequisite of git:build2.org/hello/libhello) querying https://git.build2.org/hello/libprint.git fetching from https://git.build2.org/hello/libprint.git - new libformat/1.0.0+6 (required by libhello) - new libprint/1.0.0+6 (required by libhello) - new libhello/1.1.0+6 (required by hello) - new hello/1.0.0+5 -continue? [Y/n] distributing libformat/1.0.0+6 -checked out libformat/1.0.0+6 -configured libformat/1.0.0+6 -distributing libprint/1.0.0+6 -checked out libprint/1.0.0+6 -configured libprint/1.0.0+6 -distributing libhello/1.1.0+6 -checked out libhello/1.1.0+6 -configured libhello/1.1.0+6 -distributing hello/1.0.0+5 -checked out hello/1.0.0+5 -configured hello/1.0.0+5 -version.in libhello-1.1.0+6/libhello/version.hxx.in -version.in libformat-1.0.0+6/libformat/version.hxx.in -version.in libprint-1.0.0+6/libprint/version.hxx.in -c++ libprint-1.0.0+6/libprint/cxx{print} -c++ libhello-1.1.0+6/libhello/cxx{hello} -c++ libformat-1.0.0+6/libformat/cxx{format} -c++ hello-1.0.0+5/hello/cxx{hello} -ld libprint-1.0.0+6/libprint/libs{print} -ld libformat-1.0.0+6/libformat/libs{format} -ld libhello-1.1.0+6/libhello/libs{hello} -ld hello-1.0.0+5/hello/exe{hello} -updated hello/1.0.0+5 + new libformat/1.0.0+8 (required by libhello) + new libprint/1.0.0+8 (required by libhello) + new libhello/1.1.0+8 (required by hello) + new hello/1.0.0+7 +continue? [Y/n] distributing libformat/1.0.0+8 +checked out libformat/1.0.0+8 +distributing libprint/1.0.0+8 +checked out libprint/1.0.0+8 +distributing libhello/1.1.0+8 +checked out libhello/1.1.0+8 +distributing hello/1.0.0+7 +checked out hello/1.0.0+7 +configured libformat/1.0.0+8 +configured libprint/1.0.0+8 +configured libhello/1.1.0+8 +configured hello/1.0.0+7 +version.in libhello-1.1.0+8/libhello/version.hxx.in +version.in libprint-1.0.0+8/libprint/version.hxx.in +version.in libformat-1.0.0+8/libformat/version.hxx.in +c++ libprint-1.0.0+8/libprint/cxx{print} +c++ hello-1.0.0+7/hello/cxx{hello} +c++ libhello-1.1.0+8/libhello/cxx{hello} +c++ libformat-1.0.0+8/libformat/cxx{format} +ld libprint-1.0.0+8/libprint/libs{print} +ld libformat-1.0.0+8/libformat/libs{format} +ld libhello-1.1.0+8/libhello/libs{hello} +ld hello-1.0.0+7/hello/exe{hello} +updated hello/1.0.0+7 + bpkg install hello -ld libhello-1.1.0+6/libhello/libs{hello} -ld hello-1.0.0+5/hello/exe{hello} +pc libformat-1.0.0+8/libformat/pcs{format} +pc libprint-1.0.0+8/libprint/pcs{print} +pc libhello-1.1.0+8/libhello/pcs{hello} +ld libhello-1.1.0+8/libhello/libs{hello} +ld hello-1.0.0+7/hello/exe{hello} install /opt/tools/ install /opt/tools/include/ install /opt/tools/include/libhello/ -install libhello-1.1.0+6/libhello/hxx{export} -install libhello-1.1.0+6/libhello/hxx{hello} +install libhello-1.1.0+8/libhello/hxx{export} +install libhello-1.1.0+8/libhello/hxx{hello} install /opt/tools/share/ install /opt/tools/share/doc/ install /opt/tools/share/doc/libhello/ -install libhello-1.1.0+6/manifest{manifest} -install libhello-1.1.0+6/libhello/hxx{version} +install libhello-1.1.0+8/manifest{manifest} +install libhello-1.1.0+8/libhello/hxx{version} install /opt/tools/include/libprint/ -install libprint-1.0.0+6/libprint/hxx{print} -install libprint-1.0.0+6/libprint/hxx{export} +install libprint-1.0.0+8/libprint/hxx{print} +install libprint-1.0.0+8/libprint/hxx{export} install /opt/tools/share/doc/libprint/ -install libprint-1.0.0+6/manifest{manifest} -install libprint-1.0.0+6/libprint/hxx{version} -install libprint-1.0.0+6/libprint/libs{print} +install libprint-1.0.0+8/manifest{manifest} +install libprint-1.0.0+8/libprint/hxx{version} +install libprint-1.0.0+8/libprint/libs{print} install /opt/tools/include/libformat/ -install libformat-1.0.0+6/libformat/hxx{export} -install libformat-1.0.0+6/libformat/hxx{format} +install libformat-1.0.0+8/libformat/hxx{export} +install libformat-1.0.0+8/libformat/hxx{format} install /opt/tools/share/doc/libformat/ -install libformat-1.0.0+6/manifest{manifest} -install libformat-1.0.0+6/libformat/hxx{version} -install libformat-1.0.0+6/libformat/libs{format} -install libhello-1.1.0+6/libhello/libs{hello} +install libformat-1.0.0+8/manifest{manifest} +install libformat-1.0.0+8/libformat/hxx{version} +install libformat-1.0.0+8/libformat/libs{format} +install libhello-1.1.0+8/libhello/libs{hello} install /opt/tools/bin/ -install hello-1.0.0+5/hello/exe{hello} +install hello-1.0.0+7/hello/exe{hello} install /opt/tools/share/doc/hello/ -install hello-1.0.0+5/manifest{manifest} -installed hello/1.0.0+5 +install hello-1.0.0+7/manifest{manifest} +installed hello/1.0.0+7 + /opt/tools/bin/hello World Hello, World! @@ -867,36 +876,36 @@ Hello, World! 13 directories, 23 files + bpkg uninstall hello -uninstall hello-1.0.0+5/manifest{manifest} +uninstall hello-1.0.0+7/manifest{manifest} uninstall /opt/tools/share/doc/hello/ -uninstall hello-1.0.0+5/hello/exe{hello} +uninstall hello-1.0.0+7/hello/exe{hello} uninstall /opt/tools/bin/ -uninstall libhello-1.1.0+6/libhello/libs{hello} -uninstall libformat-1.0.0+6/libformat/libs{format} -uninstall libformat-1.0.0+6/libformat/hxx{version} -uninstall libformat-1.0.0+6/manifest{manifest} +uninstall libhello-1.1.0+8/libhello/libs{hello} +uninstall libformat-1.0.0+8/libformat/libs{format} +uninstall libformat-1.0.0+8/libformat/hxx{version} +uninstall libformat-1.0.0+8/manifest{manifest} uninstall /opt/tools/share/doc/libformat/ -uninstall libformat-1.0.0+6/libformat/hxx{format} -uninstall libformat-1.0.0+6/libformat/hxx{export} +uninstall libformat-1.0.0+8/libformat/hxx{format} +uninstall libformat-1.0.0+8/libformat/hxx{export} uninstall /opt/tools/include/libformat/ -uninstall libprint-1.0.0+6/libprint/libs{print} -uninstall libprint-1.0.0+6/libprint/hxx{version} -uninstall libprint-1.0.0+6/manifest{manifest} +uninstall libprint-1.0.0+8/libprint/libs{print} +uninstall libprint-1.0.0+8/libprint/hxx{version} +uninstall libprint-1.0.0+8/manifest{manifest} uninstall /opt/tools/share/doc/libprint/ -uninstall libprint-1.0.0+6/libprint/hxx{export} -uninstall libprint-1.0.0+6/libprint/hxx{print} +uninstall libprint-1.0.0+8/libprint/hxx{export} +uninstall libprint-1.0.0+8/libprint/hxx{print} uninstall /opt/tools/include/libprint/ -uninstall libhello-1.1.0+6/libhello/hxx{version} -uninstall libhello-1.1.0+6/manifest{manifest} +uninstall libhello-1.1.0+8/libhello/hxx{version} +uninstall libhello-1.1.0+8/manifest{manifest} uninstall /opt/tools/share/doc/libhello/ uninstall /opt/tools/share/doc/ uninstall /opt/tools/share/ -uninstall libhello-1.1.0+6/libhello/hxx{hello} -uninstall libhello-1.1.0+6/libhello/hxx{export} +uninstall libhello-1.1.0+8/libhello/hxx{hello} +uninstall libhello-1.1.0+8/libhello/hxx{export} uninstall /opt/tools/include/libhello/ uninstall /opt/tools/include/ uninstall /opt/tools/ -uninstalled hello/1.0.0+5 +uninstalled hello/1.0.0+7 + bpkg drop hello following dependencies were automatically built but will no longer be used: @@ -6,7 +6,7 @@ # usage="usage: $0" -modules="libbutl libbutl.bash build2 libbpkg bpkg bpkg-util bdep bdep-util brep libbbot bbot libstd-modules build2-toolchain" +modules="libbutl libbutl.bash build2 libbpkg bpkg bpkg-util bdep bdep-util brep libbbot bbot libstd-modules build2-toolchain libbuild2-kconfig" owd=`pwd` trap "{ cd $owd; exit 1; }" ERR @@ -23,7 +23,7 @@ for m in $modules; do # Exclude submodules in build2-toolchain. # if [ $m = "build2-toolchain" ]; then - exclude="$exclude bdep bpkg build2 libbutl libbpkg libodb libodb-sqlite libsqlite3 libpkgconf" + exclude="$exclude submodules bdep bpkg build2 libbutl libbpkg libodb libodb-sqlite libsqlite3 libpkgconf libbuild2-kconfig" fi fo= @@ -252,7 +252,18 @@ fi # Distribute packages, regenerate and sync the repository. # # Note: $mode is either empty or -q (which implies -d). + +# Extra packages for testing. # +if false; then +etc/stage-pkg -c $mode -d curl packaging/curl/curl/libcurl +etc/stage-pkg -c $mode -d curl packaging/curl/curl/curl +etc/stage-pkg -c $mode -d curl packaging/curl/ca-certificates-curl/libca-certificates-curl + +etc/stage-pkg -c $mode -d icu packaging/icu/icu/libicuuc +etc/stage-pkg -c $mode -d icu packaging/icu/icu/libicui18n +etc/stage-pkg -c $mode -d icu packaging/icu/icu/libicuio +fi etc/stage-pkg -c $mode -d zlib packaging/zlib/zlib/libz diff --git a/stage-queue b/stage-queue index 5f2e907..178a387 100755 --- a/stage-queue +++ b/stage-queue @@ -35,7 +35,7 @@ done etc/stage-pkg -Q -c -d tinycbor packaging/tinycbor/tinycbor/libtinycbor -etc/stage-pkg -Q -c -d xxd packaging/xxd/xxd/xxd +#etc/stage-pkg -Q -c -d xxd packaging/xxd/xxd/xxd etc/stage-pkg -Q -c -d byacc packaging/byacc/byacc/byacc etc/stage-pkg -Q -c -d reflex packaging/reflex/reflex/reflex etc/stage-pkg -Q -c -d openbsd-m4 packaging/openbsd-m4/openbsd-m4/openbsd-m4 @@ -46,11 +46,11 @@ etc/stage-pkg -Q -c -d kconfig packaging/kconfig/kconfig/liblkc \ etc/stage-pkg -Q -c -d xerces-c packaging/xerces-c/xerces-c/libxerces-c -etc/stage-pkg -Q -c -d libcutl ../cutl/libcutl +#etc/stage-pkg -Q -c -d libcutl ../cutl/libcutl -etc/stage-pkg -Q -c -d cli ../cli/cli/cli -etc/stage-pkg -Q -c -d cli ../cli/cli/cli-tests -etc/stage-pkg -Q -c -d cli ../cli/cli/cli-examples +#etc/stage-pkg -Q -c -d cli ../cli/cli/cli +#etc/stage-pkg -Q -c -d cli ../cli/cli/cli-tests +#etc/stage-pkg -Q -c -d cli ../cli/cli/cli-examples etc/stage-pkg -Q -c -d libxsd-frontend ../xsd/libxsd-frontend/ @@ -11,23 +11,24 @@ usage="usage: etc/version" # NOTE: also update in 'bdep new'? # NOTE: also update in libbuild2-<module>? # -build2_min=0.13.0 -bpkg_min=0.13.0 +build2_min=0.14.0- +bpkg_min=0.14.0- -ver=0.14.0-a.0.z -#ver=0.13.0 +#ver=0.15.0-a.0.z +ver=0.14.0 mods=(libstd-modules libbutl libbutl.bash libbpkg libbbot bpkg bpkg-util) -odb_ver=2.5.0-b.20.z -#odb_ver=2.5.0-b.21 +#odb_ver=2.5.0-b.22.z +odb_ver=2.5.0-b.21 odb_mods=(libodb libodb-sqlite libodb-pgsql) -xml_ver=1.1.0-b.9.z -#xml_ver=1.1.0-b.10 +#xml_ver=1.1.0-b.10.z +xml_ver=1.1.0-b.10 xml_mods=(libstudxml) # !!! NOTE: libpkgconf version constraint in build2 is updated manually. # !!! NOTE: libcmark version constraint in brep is updated manually. +# !!! NOTE: libsqlite3 version in bpkg. all=(libstd-modules libbutl libbutl.bash build2 libbpkg bpkg bpkg-util bdep bdep-util libbbot bbot brep build2-toolchain msvc-linux openssl-agent buildos) @@ -95,30 +96,3 @@ for m in "${all[@]}"; do process cd .. done - -# Configuration version. -# -# Note: also in the install/prepare script. -# -mj="$(echo "$ver" | sed -re 's/([^.]+)\..*/\1/')" -mn="$(echo "$ver" | sed -re 's/[^.]+\.([^.]+)\..*/\1/')" -ab="$(echo "$ver" | sed -n -re 's/[^.]+\.[^.]+\.[^.-]+-([ab]).*/\1/p')" -pr="$(echo "$ver" | sed -n -re 's/[^.]+\.[^.]+\.[^.-]+-[ab]\.([^.+]+).*/\1/p')" - -cver="$mj.$mn" - -if [ -n "$ab" ]; then - cver="$cver-$ab.$pr" -fi - -cd build2-toolchain - -for m in build*.sh; do - sed -i -re "s/cver=\".+\"/cver=\"$cver\"/" $m -done - -for m in build*.bat; do - sed -i -re "s/\"cver=.+\"/\"cver=$cver\"/" $m -done - -cd .. |