Skip to content

Conversation

ryanofsky
Copy link
Contributor

Goal along with namespacing PR #23497 is to make code organization more obvious and have src/node/ code in node:: namespace in libbitcoin_node.a library

Goal along with namespacing PR bitcoin#23497 is to have src/node/ code in
node:: namespace in libbitcoin_node.a library

-BEGIN VERIFY SCRIPT-
bash -c ' # Bash shell needed for brace expansion {a,b}
git mv build_msvc/libbitcoin_{server,node}
git mv build_msvc/libbitcoin_node/libbitcoin_{server,node}.vcxproj.in
ren() { git grep -l "$1" src build_msvc | xargs sed -i "s/$1/$2/g"; }
ren LIBBITCOIN_{SERVER,NODE}
ren libbitcoin_{server,node}
'
-END VERIFY SCRIPT-
@hebasto
Copy link
Member

hebasto commented Dec 20, 2021

Concept ACK.

@DrahtBot
Copy link
Contributor

DrahtBot commented Dec 21, 2021

The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.

Conflicts

Reviewers, this pull request conflicts with the following ones:

  • #10102 (Multiprocess bitcoin by ryanofsky)

If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first.

@maflcko
Copy link
Member

maflcko commented Dec 21, 2021

I cancelled this because the script failed. Maybe the bash doesn't resolve the {} in sed?

@ryanofsky
Copy link
Contributor Author

I cancelled this because the script failed. Maybe the bash doesn't resolve the {} in sed?

Yes it looks like there is a problem with {server,node} expansion throughout the script. I think problem might be that /bin/sh doesn't support brace expansion so I pushed a version that calls bash. Lint looks like it's passing now. Will see if the actual build change is good and all the builds are working. I requested a GUIX build for this too, but feel free to cancel if this is overkill.

Updated 8ef044b -> 172096e (pr/libnode.1 -> pr/libnode.2, compare)

@DrahtBot DrahtBot mentioned this pull request Dec 21, 2021
@DrahtBot
Copy link
Contributor

Guix builds

File commit 887796a
(master)
commit f849297
(master and this pull)
SHA256SUMS.part 416a7ad0f3ac9c48... 8e88e66a2a888cd4...
*-aarch64-linux-gnu-debug.tar.gz b8f6b4065a589591... 5f561c3a7bf1f939...
*-aarch64-linux-gnu.tar.gz d27d9a821f9eb20a... d880ce9b9bab5b99...
*-arm-linux-gnueabihf-debug.tar.gz dd99878d8abaf13a... 043d2a67b29840b0...
*-arm-linux-gnueabihf.tar.gz 88b6fd812c6ed3a2... 7c2b34784e1b7f24...
*-osx-unsigned.dmg fbeb457fac3c27a4... 2af31d3023552a6f...
*-osx-unsigned.tar.gz 28c24b6e8300e152... d46bf1a5bd2e1ade...
*-osx64.tar.gz 2139e3ed20f21793... 2cad37b2697c674c...
*-powerpc64-linux-gnu-debug.tar.gz c7f33a5f57b52d04... 1de1a31e6dd4f809...
*-powerpc64-linux-gnu.tar.gz 6ee7deb6c108ddcd... 4c62e29f4f796ce1...
*-powerpc64le-linux-gnu-debug.tar.gz 1f976feee7f4fabb... 28dfdeb5b4dc8ab1...
*-powerpc64le-linux-gnu.tar.gz c9db6cb82aae47e7... c4f8b2a6048cf6d5...
*-riscv64-linux-gnu-debug.tar.gz fa2bd0cac18f73d8... 7aeb6a7deae90931...
*-riscv64-linux-gnu.tar.gz 3a56842d489636ce... 7ec546502fb48947...
*-win-unsigned.tar.gz 26475551ae200531... f8f12bb685d64760...
*-win64-debug.zip 3a0077c3146a8d68... 3b8f7d3960cac975...
*-win64-setup-unsigned.exe da45147c27bbcde1... 4c7f11402e89f7bf...
*-win64.zip 249dcb772071f7cb... 0d40885e1606b37b...
*-x86_64-linux-gnu-debug.tar.gz aecad0ac138ae612... 75c123997c3643ac...
*-x86_64-linux-gnu.tar.gz 5cdfbbad6e19f54b... 04f36d6a60d0e1cc...
*.tar.gz e69e11abea67fdd4... 82dddb51ccf6d138...
guix_build.log 25306cadf18c1e5a... bb8da1d8f0eddb0e...
guix_build.log.diff acbba96e99ac8f19...

@maflcko
Copy link
Member

maflcko commented Jan 6, 2022

cr ACK 172096e

@maflcko maflcko merged commit ddcc518 into bitcoin:master Jan 6, 2022
sidhujag pushed a commit to syscoin/syscoin that referenced this pull request Jan 6, 2022
sidhujag pushed a commit to syscoin/syscoin that referenced this pull request Jan 6, 2022
@bitcoin bitcoin locked and limited conversation to collaborators Jan 6, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants