This includes one followup and one bug fix from #20422, as well as some simplifications to the macdeployqtplus code.
macdeploy: minor fixups and simplifications #22199
pull fanquake wants to merge 5 commits into bitcoin:master from fanquake:macdeploy_further_simplify changing 1 files +10 −111-
fanquake commented at 7:08 AM on June 9, 2021: member
-
dca6c90329
macdeploy: remove unused plistlib import
Unused since #20422, see: https://github.com/bitcoin/bitcoin/pull/20422#discussion_r534207899
-
macdeploy: fix framework printing when passing -verbose 3d26b6b9e9
-
macdeploy: select the plugins we need, rather than excluding those we don't 639f064253
-
macdeploy: remove qt4 related code ecffe8689d
-
macdeploy: cleanup .temp.dmg if present 0a5723beea
- fanquake added the label macOS on Jun 9, 2021
- fanquake added the label Build system on Jun 9, 2021
- fanquake added the label Needs Guix build on Jun 9, 2021
-
hebasto commented at 2:16 PM on June 9, 2021: member
Concept ACK.
-
DrahtBot commented at 10:34 AM on June 12, 2021: member
<!--9cd9c72976c961c55c7acef8f6ba82cd-->
Guix builds
- DrahtBot removed the label Needs Guix build on Jun 12, 2021
- hebasto approved
-
hebasto commented at 5:43 PM on July 19, 2021: member
ACK 0a5723beea9c909b437e8c3fa434506019c1198c, tested on macOS Big Sur 11.4 (20F71, x86_64) + Homebrew's Qt 5.15.2.
The diff between
make deploylogs:--- master-log +++ pr-log @@ -39,39 +39,11 @@ Processing QtCore.framework ... Processing QtGui.framework ... + Deploying plugins + -Processing plugin renderers/libopenglrenderer.dylib ... -Processing Qt3DRender.framework ... -Linked: dist/Bitcoin-Qt.app/Contents/Frameworks/Qt3DRender.framework/Versions/Current -> 5 -Processing Qt3DCore.framework ... -Linked: dist/Bitcoin-Qt.app/Contents/Frameworks/Qt3DCore.framework/Versions/Current -> 5 -Processing QtConcurrent.framework ... -Linked: dist/Bitcoin-Qt.app/Contents/Frameworks/QtConcurrent.framework/Versions/Current -> 5 -Processing plugin platforms/libqwebgl.dylib ... -Processing QtQuick.framework ... -Linked: dist/Bitcoin-Qt.app/Contents/Frameworks/QtQuick.framework/Versions/Current -> 5 -Processing QtQmlModels.framework ... -Linked: dist/Bitcoin-Qt.app/Contents/Frameworks/QtQmlModels.framework/Versions/Current -> 5 -Processing QtQml.framework ... -Linked: dist/Bitcoin-Qt.app/Contents/Frameworks/QtQml.framework/Versions/Current -> 5 -Processing QtWebSockets.framework ... -Linked: dist/Bitcoin-Qt.app/Contents/Frameworks/QtWebSockets.framework/Versions/Current -> 5 -Processing plugin platforms/libqoffscreen.dylib ... Processing plugin platforms/libqminimal.dylib ... Processing plugin platforms/libqcocoa.dylib ... Processing QtPrintSupport.framework ... Linked: dist/Bitcoin-Qt.app/Contents/Frameworks/QtPrintSupport.framework/Versions/Current -> 5 -Processing plugin platformthemes/libqxdgdesktopportal.dylib ... -Processing plugin assetimporters/libuip.dylib ... -Processing QtQuick3DAssetImport.framework ... -Linked: dist/Bitcoin-Qt.app/Contents/Frameworks/QtQuick3DAssetImport.framework/Versions/Current -> 5 -Processing QtQuick3DRender.framework ... -Linked: dist/Bitcoin-Qt.app/Contents/Frameworks/QtQuick3DRender.framework/Versions/Current -> 5 -Processing QtQuick3DUtils.framework ... -Linked: dist/Bitcoin-Qt.app/Contents/Frameworks/QtQuick3DUtils.framework/Versions/Current -> 5 -Processing plugin assetimporters/libassimp.dylib ... Processing plugin styles/libqmacstyle.dylib ... -Processing plugin bearer/libqgenericbearer.dylib ... -Processing plugin generic/libqtuiotouchplugin.dylib ... + Adding Qt translations + + Installing qt.conf + + Generating .DS_Store + @@ -83,31 +55,31 @@ "disk2" ejected. Preparing imaging engine… Reading Protective Master Boot Record (MBR : 0)… - (CRC32 $24F8F919: Protective Master Boot Record (MBR : 0)) + (CRC32 $174DFE17: Protective Master Boot Record (MBR : 0)) Reading GPT Header (Primary GPT Header : 1)… - (CRC32 $A05083DF: GPT Header (Primary GPT Header : 1)) + (CRC32 $92149F78: GPT Header (Primary GPT Header : 1)) Reading GPT Partition Data (Primary GPT Table : 2)… - (CRC32 $5B43EDCF: GPT Partition Data (Primary GPT Table : 2)) + (CRC32 $E9842FAF: GPT Partition Data (Primary GPT Table : 2)) Reading (Apple_Free : 3)… (CRC32 $00000000: (Apple_Free : 3)) Reading disk image (Apple_APFS : 4)… ............................................................................................................................................................................................................................................................................. - (CRC32 $43E35E8F: disk image (Apple_APFS : 4)) + (CRC32 $CCC1B6B8: disk image (Apple_APFS : 4)) Reading (Apple_Free : 5)… ............................................................................................................................................................................................................................................................................. - (CRC32 $00000000: (Apple_Free : 5)) + (CRC32 $00000000: (Apple_Free : 5)) Reading GPT Partition Data (Backup GPT Table : 6)… ............................................................................................................................................................................................................................................................................. - (CRC32 $5B43EDCF: GPT Partition Data (Backup GPT Table : 6)) + (CRC32 $E9842FAF: GPT Partition Data (Backup GPT Table : 6)) Reading GPT Header (Backup GPT Header : 7)… ............................................................................................................................................................................................................................................................................. - (CRC32 $8895B480: GPT Header (Backup GPT Header : 7)) + (CRC32 $B2B82186: GPT Header (Backup GPT Header : 7)) Adding resources… ............................................................................................................................................................................................................................................................................. -Elapsed Time: 4.535s -File size: 26312236 bytes, Checksum: CRC32 $903D921A -Sectors processed: 139064, 123411 compressed -Speed: 13.3Mbytes/sec -Savings: 63.0% +Elapsed Time: 4.536s +File size: 19252747 bytes, Checksum: CRC32 $DEB8E33D +Sectors processed: 95062, 84635 compressed +Speed: 9.1Mbytes/sec +Savings: 60.4% created: /Users/hebasto/bitcoin/Bitcoin-Core.dmg + Done +Also tested the resulted
Bitcoin-Core.dmgfile. -
fanquake commented at 3:39 AM on July 20, 2021: member
macOS Guix builds:
e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 guix-build-0a5723beea9c/output/dist-archive/SKIPATTEST.TAG c8ab07737ad98496906851a4ea683f813b20df66bf92dca6a41791d449da4d8e guix-build-0a5723beea9c/output/dist-archive/bitcoin-0a5723beea9c.tar.gz 9bf6a465d6c2295ce39f800ca5ccf301cf6f3260f5f88fbf92aa02c63f88193e guix-build-0a5723beea9c/output/x86_64-apple-darwin18/bitcoin-0a5723beea9c-osx-unsigned.dmg 122f81a2ba034c9a54076aa12a846d8df62ba4636156cceb215c2e039e36b291 guix-build-0a5723beea9c/output/x86_64-apple-darwin18/bitcoin-0a5723beea9c-osx-unsigned.tar.gz 51a814464f987ba89f621109928193bc3ec8b573d05803476fd4b97ff96ef55d guix-build-0a5723beea9c/output/x86_64-apple-darwin18/bitcoin-0a5723beea9c-osx64.tar.gz 791f26d87c0527899c7d6ddfd5feb5ceb67268b36e34efa4664df556c00fe306 guix-build-0a5723beea9c/output/x86_64-apple-darwin18/inputs.SHA256SUMS - fanquake merged this on Jul 20, 2021
- fanquake closed this on Jul 20, 2021
- fanquake deleted the branch on Jul 20, 2021
- sidhujag referenced this in commit 3dd6b1462e on Jul 23, 2021
- gwillen referenced this in commit f4218e33cb on Jun 1, 2022
- DrahtBot locked this on Aug 16, 2022
Labels