build: remove deprecated key from macOS Info.plist #17660

pull fanquake wants to merge 1 commits into bitcoin:master from fanquake:remove_deprecated_cfbundle_usage changing 1 files +1 −1

fanquake commented at 8:59 PM on December 3, 2019: member

Note that the current release binaries show correct version numbers everywhere in the GUI and macOS info dialogs (except for when you "space" click the app, shown in screenshots), and we haven't reintroduced the issue that #14701 fixed. This is just swapping a deprecated field for a newer one, as well as using the entire version string in two fields that we hadn't been previously.

Follows up discussion in #14701.

0.19.0.1

This PR.
fanquake added the label macOS on Dec 3, 2019
fanquake added the label Build system on Dec 3, 2019
promag commented at 2:19 AM on December 4, 2019: member

Concept ACK.
laanwj commented at 3:37 AM on December 4, 2019: member

Concept ACK.

I'm not entirely sure the fourth version number should be shown when it is 0. I don't think we historically do this in the application itself? Versions like A.B.C are enough in most cases and look less complex to users.
promag commented at 2:56 PM on December 5, 2019: member

@laanwj that would require a new var like @CLIENT_VERSION_STRING@.

PR title could be something like "build: Refresh macos Info.plist", I mean it's changing other keys.
laanwj commented at 7:58 AM on December 6, 2019: member

@laanwj that would require a new var like @CLIENT_VERSION_STRING@.

yes…
jonasschnelli commented at 6:12 AM on December 9, 2019: contributor

Concept ACK but agree with @laawnj about the forth version part (should only be shown if != 0).
RandyMcMillan commented at 8:16 AM on December 9, 2019: contributor

Technically "Developers" should be capitalized. "The Bitcoin Core Developers" is the entity that holds the copyright.
laanwj commented at 9:24 AM on December 9, 2019: member

there is no 'entity that holds the copyright', the project has no CLA
fanquake added the label Waiting for author on Dec 9, 2019
RandyMcMillan commented at 7:38 AM on December 12, 2019: contributor

Maybe something other than a copyright notice should be displayed then.

https://www.copyright.gov/comp3/chap2200/ch2200-notice.pdf

2204.1 Notice for Works Fixed in Copies 2207.9 Works Published in Machine-Readable Copies 2207.8 Multi-Part Works 2207.2 Contributions to Collective Works 2209.1 General and Specific Notice

Either way. This should be checked as well - it was mentioned on a previous PR. #17462 (review)
laanwj commented at 9:16 AM on December 12, 2019: member

You'd have to consider copyright internationally, not just for the US. In the context of FOSS. We're ok with mimicing other projects here, as this is very much out of scope of the project, there's not really anything to be gained by going down that rabbit hole.
RandyMcMillan commented at 12:14 AM on December 16, 2019: contributor

Thanks for the clarity.

build: remove deprecated key from macOS Info.plist

Note that the current release binaries don't show incorrect version
numbers anywhere in the GUI, and we haven't reintroduced the issue that
#14701 fixed. This is just swapping a deprecated field for a newer
one and removing the additional version number.

c0bc453135

fanquake force-pushed on Dec 31, 2019
fanquake commented at 6:40 PM on December 31, 2019: member

I've reduced this to a smaller change, which is just replacing the deprecated key for the newer one.
fanquake removed the label Waiting for author on Dec 31, 2019
MarcoFalke added the label Needs gitian build on Jan 2, 2020
MarcoFalke commented at 2:34 PM on January 2, 2020: member

Would be nice to get a travis build once #17848 is fixed

DrahtBot commented at 7:07 PM on January 3, 2020: member

Gitian builds

File	commit 35fff5be60e853455abc24713481544e91adfedb<br>(master)	commit eb197d40733c5f0e28784f7415d170a2af688ae0<br>(master and this pull)
bitcoin-0.19.99-aarch64-linux-gnu-debug.tar.gz	`1a1b79c30ee23b1e...`	`e80eced58dc6a335...`
bitcoin-0.19.99-aarch64-linux-gnu.tar.gz	`4f5477e988e15339...`	`c5c0723fd8d16c35...`
bitcoin-0.19.99-arm-linux-gnueabihf-debug.tar.gz	`907d28fc95980468...`	`7020cac36f99d99e...`
bitcoin-0.19.99-arm-linux-gnueabihf.tar.gz	`e55899ead1a7ff56...`	`627fcfbb4bed6913...`
bitcoin-0.19.99-i686-pc-linux-gnu-debug.tar.gz	`95fa4bccc8b22ac0...`	`539fc73aa031f9ce...`
bitcoin-0.19.99-i686-pc-linux-gnu.tar.gz	`340c796226da90c7...`	`b144a3653102f638...`
bitcoin-0.19.99-osx-unsigned.dmg	`1c5ab941efd90df4...`	`7ccfb8c941d2f59f...`
bitcoin-0.19.99-osx64.tar.gz	`e0d2d4ef7befbf1f...`	`4675bf5615cddd79...`
bitcoin-0.19.99-riscv64-linux-gnu-debug.tar.gz	`7fb3888850d15c57...`	`71a1bceb0aaed21f...`
bitcoin-0.19.99-riscv64-linux-gnu.tar.gz	`c6bd3037c22bbde5...`	`4f379efc1381bd1f...`
bitcoin-0.19.99-win64-debug.zip	`a2369f394ffcb551...`	`f88dea4eb4548c53...`
bitcoin-0.19.99-win64-setup-unsigned.exe	`ffc23fa5abc3ca5f...`	`ef9c44b823d73077...`
bitcoin-0.19.99-win64.zip	`2d13e80f0011ce7d...`	`cd3bd41aa0457f93...`
bitcoin-0.19.99-x86_64-linux-gnu-debug.tar.gz	`2a4aa0a81c4d2591...`	`e81c65ca2a90e5bf...`
bitcoin-0.19.99-x86_64-linux-gnu.tar.gz	`8940a74e71b82107...`	`1e2f4f07e186687a...`
bitcoin-0.19.99.tar.gz	`7703c9c861b5b755...`	`f921da30d556259b...`
bitcoin-core-linux-0.20-res.yml	`5db46f5eca4bb180...`	`20d3b5a4de0ac424...`
bitcoin-core-osx-0.20-res.yml	`9db10d1794650fb3...`	`3be040b3d57c1814...`
bitcoin-core-win-0.20-res.yml	`89078fed82c8928e...`	`4924fab2a26795e0...`
linux-build.log	`a3067a2425690fd1...`	`a234deca9f94d150...`
osx-build.log	`a15a76ffd1535083...`	`f280f5e45f9555b0...`
win-build.log	`615dbd3684fcd0b0...`	`703a554824055faf...`
bitcoin-core-linux-0.20-res.yml.diff		`93c495f6f25d2693...`
bitcoin-core-osx-0.20-res.yml.diff		`b5c0558997c626f0...`
bitcoin-core-win-0.20-res.yml.diff		`a20bc0dd9fb919ab...`
linux-build.log.diff		`d535c6070f6a94d8...`
osx-build.log.diff		`506bad20fcd7677c...`
win-build.log.diff		`b2c5da4e96fe2770...`

DrahtBot removed the label Needs gitian build on Jan 3, 2020
laanwj commented at 1:25 PM on February 5, 2020: member

ACK c0bc453135b3f549f800545075cb7bdb310c3ad4
laanwj referenced this in commit 01668839de on Feb 5, 2020
laanwj merged this on Feb 5, 2020
laanwj closed this on Feb 5, 2020
fanquake deleted the branch on Feb 6, 2020
sidhujag referenced this in commit 3a0e772abd on Feb 9, 2020
MarkLTZ referenced this in commit 5aec3f1eef on Apr 19, 2020
sidhujag referenced this in commit d2465f2ffd on Nov 10, 2020
DrahtBot locked this on Feb 15, 2022

Contributors

Labels

Linked (view graph)

#14701 build: Add CLIENT_VERSION_BUILD to CFBundleGetInfoString