macdeployqtplus after switching to Qt 6
84de8c93e7ci: Add `deploy` target for native macOS CI job (Hennadii Stepanov)fad57e9e0fbuild: Fix `macdeployqtplus` after switching to Qt 6 (Hennadii Stepanov)938208d91abuild: Resolve `@rpath` in `macdeployqtplus` (Hennadii Stepanov) Pull request description: Homebrew's Qt 6 package — namely `qt` or `qt@6` — introduces a few differences that must be properly handled by the `macdeployqtplus` script: 1. Use of `@rpath` references: ``` % objdump --macho --dylibs-used $(brew --prefix qt@5)/Frameworks/QtGui.framework/QtGui /usr/local/opt/qt@5/Frameworks/QtGui.framework/QtGui: /usr/local/opt/qt@5/lib/QtGui.framework/Versions/5/QtGui (compatibility version 5.15.0, current version 5.15.16) /System/Library/Frameworks/AppKit.framework/Versions/C/AppKit (compatibility version 45.0.0, current version 2575.30.19) /System/Library/Frameworks/Metal.framework/Versions/A/Metal (compatibility version 1.0.0, current version 367.6.0) /usr/local/Cellar/qt@5/5.15.16_1/lib/QtCore.framework/Versions/5/QtCore (compatibility version 5.15.0, current version 5.15.16) /System/Library/Frameworks/DiskArbitration.framework/Versions/A/DiskArbitration (compatibility version 1.0.0, current version 1.0.0) /System/Library/Frameworks/IOKit.framework/Versions/A/IOKit (compatibility version 1.0.0, current version 275.0.0) /System/Library/Frameworks/CoreGraphics.framework/Versions/A/CoreGraphics (compatibility version 64.0.0, current version 1889.2.7) /System/Library/Frameworks/Foundation.framework/Versions/C/Foundation (compatibility version 300.0.0, current version 3208.0.0) /System/Library/Frameworks/OpenGL.framework/Versions/A/OpenGL (compatibility version 1.0.0, current version 1.0.0) /System/Library/Frameworks/AGL.framework/Versions/A/AGL (compatibility version 1.0.0, current version 1.0.0) /usr/local/opt/libpng/lib/libpng16.16.dylib (compatibility version 64.0.0, current version 64.0.0) /usr/lib/libz.1.dylib (compatibility version 1.0.0, current version 1.2.12) /System/Library/Frameworks/ApplicationServices.framework/Versions/A/ApplicationServices (compatibility version 1.0.0, current version 65.0.0) /usr/local/opt/md4c/lib/libmd4c.0.dylib (compatibility version 0.0.0, current version 0.5.2) /usr/lib/libc++.1.dylib (compatibility version 1.0.0, current version 1800.105.0) /usr/lib/libSystem.B.dylib (compatibility version 1.0.0, current version 1351.0.0) /System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation (compatibility version 150.0.0, current version 3208.0.0) /System/Library/Frameworks/CoreText.framework/Versions/A/CoreText (compatibility version 1.0.0, current version 844.2.0) /usr/lib/libobjc.A.dylib (compatibility version 1.0.0, current version 228.0.0) % objdump --macho --dylibs-used $(brew --prefix qt@6)/Frameworks/QtGui.framework/QtGui /usr/local/opt/qt/Frameworks/QtGui.framework/QtGui: /usr/local/opt/qt/lib/QtGui.framework/Versions/A/QtGui (compatibility version 6.0.0, current version 6.9.0) /System/Library/Frameworks/AppKit.framework/Versions/C/AppKit (compatibility version 45.0.0, current version 2575.30.19) /System/Library/Frameworks/Carbon.framework/Versions/A/Carbon (compatibility version 2.0.0, current version 170.0.0) /System/Library/Frameworks/OpenGL.framework/Versions/A/OpenGL (compatibility version 1.0.0, current version 1.0.0) /System/Library/Frameworks/ImageIO.framework/Versions/A/ImageIO (compatibility version 1.0.0, current version 1.0.0) /System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation (compatibility version 150.0.0, current version 3208.0.0) /System/Library/Frameworks/CoreGraphics.framework/Versions/A/CoreGraphics (compatibility version 64.0.0, current version 1889.2.7) /System/Library/Frameworks/CoreText.framework/Versions/A/CoreText (compatibility version 1.0.0, current version 844.2.0) /System/Library/Frameworks/Foundation.framework/Versions/C/Foundation (compatibility version 300.0.0, current version 3208.0.0) /System/Library/Frameworks/QuartzCore.framework/Versions/A/QuartzCore (compatibility version 1.2.0, current version 1.11.0) /System/Library/Frameworks/Metal.framework/Versions/A/Metal (compatibility version 1.0.0, current version 367.6.0) /usr/local/opt/glib/lib/libglib-2.0.0.dylib (compatibility version 8401.0.0, current version 8401.0.0) @rpath/QtDBus.framework/Versions/A/QtDBus (compatibility version 6.0.0, current version 6.9.0) /System/Library/Frameworks/AGL.framework/Versions/A/AGL (compatibility version 1.0.0, current version 1.0.0) /usr/local/opt/libpng/lib/libpng16.16.dylib (compatibility version 64.0.0, current version 64.0.0) /usr/lib/libz.1.dylib (compatibility version 1.0.0, current version 1.2.12) /usr/local/opt/harfbuzz/lib/libharfbuzz.0.dylib (compatibility version 61100.0.0, current version 61100.0.0) /usr/local/opt/md4c/lib/libmd4c.0.dylib (compatibility version 0.0.0, current version 0.5.2) /usr/local/opt/freetype/lib/libfreetype.6.dylib (compatibility version 27.0.0, current version 27.2.0) /usr/local/opt/glib/lib/libgthread-2.0.0.dylib (compatibility version 8401.0.0, current version 8401.0.0) @rpath/QtCore.framework/Versions/A/QtCore (compatibility version 6.0.0, current version 6.9.0) /System/Library/Frameworks/IOKit.framework/Versions/A/IOKit (compatibility version 1.0.0, current version 275.0.0) /System/Library/Frameworks/DiskArbitration.framework/Versions/A/DiskArbitration (compatibility version 1.0.0, current version 1.0.0) /System/Library/Frameworks/UniformTypeIdentifiers.framework/Versions/A/UniformTypeIdentifiers (compatibility version 1.0.0, current version 709.0.0) /usr/lib/libc++.1.dylib (compatibility version 1.0.0, current version 1800.105.0) /usr/lib/libSystem.B.dylib (compatibility version 1.0.0, current version 1351.0.0) /System/Library/Frameworks/CoreServices.framework/Versions/A/CoreServices (compatibility version 1.0.0, current version 1226.0.0) /usr/lib/libobjc.A.dylib (compatibility version 1.0.0, current version 228.0.0) ``` 2. Different directory layout: ``` % ls -l $(brew --prefix qt@5)/ total 544 drwxr-xr-x 79 hebasto admin 2528 13 Nov 06:22 Frameworks -rw-r--r-- 1 hebasto admin 7533 16 Apr 09:09 INSTALL_RECEIPT.json -rw-r--r-- 1 hebasto admin 22961 13 Nov 06:22 LICENSE.FDL -rw-r--r-- 1 hebasto admin 36363 13 Nov 06:22 LICENSE.GPL3-EXCEPT -rw-r--r-- 1 hebasto admin 15351 13 Nov 06:22 LICENSE.GPLv2 -rw-r--r-- 1 hebasto admin 35641 13 Nov 06:22 LICENSE.GPLv3 -rw-r--r-- 1 hebasto admin 26828 13 Nov 06:22 LICENSE.LGPLv21 -rw-r--r-- 1 hebasto admin 8174 13 Nov 06:22 LICENSE.LGPLv3 -rw-r--r-- 1 hebasto admin 106262 13 Nov 06:22 LICENSE.QT-LICENSE-AGREEMENT -rw-r--r-- 1 hebasto admin 3842 13 Nov 06:22 README drwxr-xr-x 57 hebasto admin 1824 16 Apr 09:09 bin drwxr-xr-x 4 hebasto admin 128 13 Nov 06:22 doc drwxr-xr-x 95 hebasto admin 3040 13 Nov 06:22 include drwxr-xr-x 119 hebasto admin 3808 16 Apr 09:09 lib drwxr-xr-x 8 hebasto admin 256 13 Nov 06:22 libexec drwxr-xr-x 79 hebasto admin 2528 16 Apr 09:09 mkspecs drwxr-xr-x 15 hebasto admin 480 13 Nov 06:22 phrasebooks drwxr-xr-x 31 hebasto admin 992 13 Nov 06:22 plugins drwxr-xr-x 28 hebasto admin 896 13 Nov 06:22 qml -rw-r--r-- 1 hebasto admin 6952 16 Apr 09:09 sbom.spdx.json drwxr-xr-x 3 hebasto admin 96 13 Nov 06:22 share drwxr-xr-x 347 hebasto admin 11104 13 Nov 06:22 translations % ls -l $(brew --prefix qt@6)/share/qt/ total 0 drwxr-xr-x 4 hebasto admin 128 30 Mar 09:49 doc drwxr-xr-x 35 hebasto admin 1120 16 Apr 09:16 libexec drwxr-xr-x 167 hebasto admin 5344 30 Mar 09:49 metatypes drwxr-xr-x 70 hebasto admin 2240 16 Apr 09:16 mkspecs drwxr-xr-x 178 hebasto admin 5696 30 Mar 09:49 modules drwxr-xr-x 15 hebasto admin 480 30 Mar 09:49 phrasebooks drwxr-xr-x 31 hebasto admin 992 30 Mar 09:49 plugins drwxr-xr-x 34 hebasto admin 1088 30 Mar 09:49 qml drwxr-xr-x 45 hebasto admin 1440 30 Mar 09:49 sbom drwxr-xr-x 285 hebasto admin 9120 30 Mar 09:49 translations ``` This PR addresses both issues and additionally adds a `deploy` target to the native macOS CI job to prevent any similar recessions in the future. Fixes https://github.com/bitcoin/bitcoin/issues/32267. ACKs for top commit: fanquake: ACK84de8c93e7Tree-SHA512: 27a0eff3cd9317647529ff4571bd79c5dd8f007775b19415c8c27ca4912a60d85074c840cf0443be314d9a404f78bb015029d46dab18e292462249a5d90c6c47
Bitcoin Core integration/staging tree
For an immediately usable, binary version of the Bitcoin Core software, see https://bitcoincore.org/en/download/.
What is Bitcoin Core?
Bitcoin Core connects to the Bitcoin peer-to-peer network to download and fully validate blocks and transactions. It also includes a wallet and graphical user interface, which can be optionally built.
Further information about Bitcoin Core is available in the doc folder.
License
Bitcoin Core is released under the terms of the MIT license. See COPYING for more information or see https://opensource.org/licenses/MIT.
Development Process
The master branch is regularly built (see doc/build-*.md for instructions) and tested, but it is not guaranteed to be
completely stable. Tags are created
regularly from release branches to indicate new official, stable release versions of Bitcoin Core.
The https://github.com/bitcoin-core/gui repository is used exclusively for the development of the GUI. Its master branch is identical in all monotree repositories. Release branches and tags do not exist, so please do not fork that repository unless it is for development reasons.
The contribution workflow is described in CONTRIBUTING.md and useful hints for developers can be found in doc/developer-notes.md.
Testing
Testing and code review is the bottleneck for development; we get more pull requests than we can review and test on short notice. Please be patient and help out by testing other people's pull requests, and remember this is a security-critical project where any mistake might cost people lots of money.
Automated Testing
Developers are strongly encouraged to write unit tests for new code, and to
submit new unit tests for old code. Unit tests can be compiled and run
(assuming they weren't disabled during the generation of the build system) with: ctest. Further details on running
and extending unit tests can be found in /src/test/README.md.
There are also regression and integration tests, written
in Python.
These tests can be run (if the test dependencies are installed) with: build/test/functional/test_runner.py
(assuming build is your build directory).
The CI (Continuous Integration) systems make sure that every pull request is built for Windows, Linux, and macOS, and that unit/sanity tests are run automatically.
Manual Quality Assurance (QA) Testing
Changes should be tested by somebody other than the developer who wrote the code. This is especially important for large or high-risk changes. It is useful to add a test plan to the pull request description if testing the changes is not straightforward.
Translations
Changes to translations as well as new translations can be submitted to Bitcoin Core's Transifex page.
Translations are periodically pulled from Transifex and merged into the git repository. See the translation process for details on how this works.
Important: We do not accept translation changes as GitHub pull requests because the next pull from Transifex would automatically overwrite them again.