macdeploy: minor fixups and simplifications #22199
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Unused since bitcoin#20422, see: bitcoin#20422 (comment)
|
Concept ACK. |
hebasto
approved these changes
Jul 19, 2021
There was a problem hiding this comment.
ACK 0a5723b, tested on macOS Big Sur 11.4 (20F71, x86_64) + Homebrew's Qt 5.15.2.
The diff between make deploy logs:
--- 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.dmg file.
|
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 |
sidhujag
pushed a commit
to syscoin/syscoin
that referenced
this pull request
Jul 23, 2021
0a5723b macdeploy: cleanup .temp.dmg if present (fanquake) ecffe86 macdeploy: remove qt4 related code (fanquake) 639f064 macdeploy: select the plugins we need, rather than excluding those we don't (fanquake) 3d26b6b macdeploy: fix framework printing when passing -verbose (fanquake) dca6c90 macdeploy: remove unused plistlib import (fanquake) Pull request description: This includes [one followup](bitcoin#20422 (comment)) and [one bug fix](bitcoin@3d26b6b) from bitcoin#20422, as well as some simplifications to the `macdeployqtplus` code. ACKs for top commit: hebasto: ACK 0a5723b, tested on macOS Big Sur 11.4 (20F71, x86_64) + Homebrew's Qt 5.15.2. Tree-SHA512: cfad9505eacd32fe3a9d06eb13b2de0b6d2cad7b17778e90b503501cbf922e53d4e7f7f74952d1aed58410bdae9b0bb3248098583ef5b85689cb27d4dc06c029
gwillen
pushed a commit
to ElementsProject/elements
that referenced
this pull request
Jun 1, 2022
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This includes one followup and one bug fix from #20422, as well as some simplifications to the
macdeployqtpluscode.