Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build: Add CLIENT_VERSION_BUILD to CFBundleGetInfoString #14701

Merged
merged 1 commit into from Dec 12, 2018

Conversation

@fanquake
Copy link
Member

@fanquake fanquake commented Nov 10, 2018

As mentioned in #14697, if you download the 0.17.0.1 dmg, and inspect the .app bundle, the version in the GetInfo string reads 0.17.0, which is confusing given you're expecting 0.17.0.1:
0 17 0 1

This PR adds CLIENT_VERSION_BUILD to the string, so that the full version number is displayed, i.e:
this pr

@laanwj
Copy link
Member

@laanwj laanwj commented Nov 14, 2018

Concept ACK.
Might want to wait until #14612 is merged so that RC level (of appropriate) can be included as well.

@laanwj
Copy link
Member

@laanwj laanwj commented Nov 23, 2018

Might want to wait until #14612 is merged so that RC level (of appropriate) can be included as well.

FYI #14612 was merged

@bitcoin bitcoin deleted a comment from DrahtBot Nov 23, 2018
@jonasschnelli
Copy link
Member

@jonasschnelli jonasschnelli commented Dec 9, 2018

utACK 8e20934

@jonasschnelli
Copy link
Member

@jonasschnelli jonasschnelli commented Dec 10, 2018

Tested via gitian build: https://bitcoin.jonasschnelli.ch/build/908

Result:
bildschirmfoto 2018-12-09 um 14 57 55

@laanwj laanwj merged commit 8e20934 into bitcoin:master Dec 12, 2018
2 checks passed
2 checks passed
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
laanwj added a commit that referenced this pull request Dec 12, 2018
8e20934 build: Add CLIENT_VERSION_BUILD to CFBundleGetInfoString (fanquake)

Pull request description:

  As mentioned in #14697, if you download the `0.17.0.1` dmg, and inspect the `.app` bundle, the version in the GetInfo string reads `0.17.0`, which is confusing given you're expecting `0.17.0.1`:
  <img width="391" alt="0 17 0 1" src="https://user-images.githubusercontent.com/863730/48300032-fbb54b00-e510-11e8-9bcd-77e1fffffc63.png">

  This PR adds `CLIENT_VERSION_BUILD` to the string, so that the full version number is displayed, i.e:
  <img width="327" alt="this pr" src="https://user-images.githubusercontent.com/863730/48300015-7893f500-e510-11e8-98b9-80424719a082.png">

Tree-SHA512: f553253d03283639cc4dda00c8004b5c63ae2b489762e5e8c666166e71b14e672792c1df678f87484d51d153b5781c5ec1b145774096600f504833024ae8baea
@fanquake fanquake deleted the fanquake:add-build-version-to-info-plist branch Dec 15, 2018
PastaPastaPasta added a commit to PastaPastaPasta/dash that referenced this pull request Feb 5, 2019
…foString

8e20934 build: Add CLIENT_VERSION_BUILD to CFBundleGetInfoString (fanquake)

Pull request description:

  As mentioned in bitcoin#14697, if you download the `0.17.0.1` dmg, and inspect the `.app` bundle, the version in the GetInfo string reads `0.17.0`, which is confusing given you're expecting `0.17.0.1`:
  <img width="391" alt="0 17 0 1" src="https://user-images.githubusercontent.com/863730/48300032-fbb54b00-e510-11e8-9bcd-77e1fffffc63.png">

  This PR adds `CLIENT_VERSION_BUILD` to the string, so that the full version number is displayed, i.e:
  <img width="327" alt="this pr" src="https://user-images.githubusercontent.com/863730/48300015-7893f500-e510-11e8-98b9-80424719a082.png">

Tree-SHA512: f553253d03283639cc4dda00c8004b5c63ae2b489762e5e8c666166e71b14e672792c1df678f87484d51d153b5781c5ec1b145774096600f504833024ae8baea
UdjinM6 added a commit to dashpay/dash that referenced this pull request Feb 12, 2019
…tInfoString (#2687)

8e20934 build: Add CLIENT_VERSION_BUILD to CFBundleGetInfoString (fanquake)

Pull request description:

  As mentioned in bitcoin#14697, if you download the `0.17.0.1` dmg, and inspect the `.app` bundle, the version in the GetInfo string reads `0.17.0`, which is confusing given you're expecting `0.17.0.1`:
  <img width="391" alt="0 17 0 1" src="https://user-images.githubusercontent.com/863730/48300032-fbb54b00-e510-11e8-9bcd-77e1fffffc63.png">

  This PR adds `CLIENT_VERSION_BUILD` to the string, so that the full version number is displayed, i.e:
  <img width="327" alt="this pr" src="https://user-images.githubusercontent.com/863730/48300015-7893f500-e510-11e8-98b9-80424719a082.png">

Tree-SHA512: f553253d03283639cc4dda00c8004b5c63ae2b489762e5e8c666166e71b14e672792c1df678f87484d51d153b5781c5ec1b145774096600f504833024ae8baea
codablock added a commit to codablock/dash that referenced this pull request Mar 7, 2019
…tInfoString (dashpay#2687)

8e20934 build: Add CLIENT_VERSION_BUILD to CFBundleGetInfoString (fanquake)

Pull request description:

  As mentioned in bitcoin#14697, if you download the `0.17.0.1` dmg, and inspect the `.app` bundle, the version in the GetInfo string reads `0.17.0`, which is confusing given you're expecting `0.17.0.1`:
  <img width="391" alt="0 17 0 1" src="https://user-images.githubusercontent.com/863730/48300032-fbb54b00-e510-11e8-9bcd-77e1fffffc63.png">

  This PR adds `CLIENT_VERSION_BUILD` to the string, so that the full version number is displayed, i.e:
  <img width="327" alt="this pr" src="https://user-images.githubusercontent.com/863730/48300015-7893f500-e510-11e8-98b9-80424719a082.png">

Tree-SHA512: f553253d03283639cc4dda00c8004b5c63ae2b489762e5e8c666166e71b14e672792c1df678f87484d51d153b5781c5ec1b145774096600f504833024ae8baea
codablock added a commit to codablock/dash that referenced this pull request Mar 7, 2019
…tInfoString (dashpay#2687)

8e20934 build: Add CLIENT_VERSION_BUILD to CFBundleGetInfoString (fanquake)

Pull request description:

  As mentioned in bitcoin#14697, if you download the `0.17.0.1` dmg, and inspect the `.app` bundle, the version in the GetInfo string reads `0.17.0`, which is confusing given you're expecting `0.17.0.1`:
  <img width="391" alt="0 17 0 1" src="https://user-images.githubusercontent.com/863730/48300032-fbb54b00-e510-11e8-9bcd-77e1fffffc63.png">

  This PR adds `CLIENT_VERSION_BUILD` to the string, so that the full version number is displayed, i.e:
  <img width="327" alt="this pr" src="https://user-images.githubusercontent.com/863730/48300015-7893f500-e510-11e8-98b9-80424719a082.png">

Tree-SHA512: f553253d03283639cc4dda00c8004b5c63ae2b489762e5e8c666166e71b14e672792c1df678f87484d51d153b5781c5ec1b145774096600f504833024ae8baea
MIPPL pushed a commit to biblepay/biblepay that referenced this pull request May 26, 2019
* commit '4570079e53ad859c571aeac3f132cf2969888e14':
  Add missing entry to changelog (dashpay#2769)
  Move IS block filtering into ConnectBlock (dashpay#2766)
  [0.13.x] Bump version to 0.13.2 and add release notes (dashpay#2749)
  Bump minChainWork and AssumeValid to block #1033120 (dashpay#2750)
  Fix error message for invalid voting addresses (dashpay#2747)
  Make -masternodeblsprivkey mandatory when -masternode is given (dashpay#2745)
  Implement 2-stage commit for CEvoDB to avoid inconsistencies after crashes (dashpay#2744)
  Add collateraladdress into masternode/protx list rpc output (dashpay#2740)
  Only include selected TX types into CMerkleBlock (dashpay#2737)
  Stop g_connman first before deleting it (dashpay#2734)
  Fix incorrect usage of begin() when genesis block is requested in "protx diff" (dashpay#2699)
  Do not process blocks in CDeterministicMNManager before dip3 activation (dashpay#2698)
  Backport bitcoin#14701: build: Add CLIENT_VERSION_BUILD to CFBundleGetInfoString (dashpay#2687)
  Fix some typos in doc/guide-startmany.md (dashpay#2711)
  Minimal fix for litemode vs bad-protx-key-not-same issue (dashpay#2694)
  Release notes v0.13.1.0 (dashpay#2689)

# Conflicts:
#	configure.ac
#	doc/guide-startmany.md
#	doc/release-notes.md
#	src/chainparams.cpp
#	src/clientversion.h
#	src/validation.cpp
TriKriSta referenced this pull request in ivansib/sibcoin Jul 4, 2019
…ring (#2687)

8e209340c85fc2493d7d1d7affe7e316bb613cbd build: Add CLIENT_VERSION_BUILD to CFBundleGetInfoString (fanquake)

Pull request description:

  As mentioned in #14697, if you download the `0.17.0.1` dmg, and inspect the `.app` bundle, the version in the GetInfo string reads `0.17.0`, which is confusing given you're expecting `0.17.0.1`:
  <img width="391" alt="0 17 0 1" src="https://user-images.githubusercontent.com/863730/48300032-fbb54b00-e510-11e8-9bcd-77e1fffffc63.png">

  This PR adds `CLIENT_VERSION_BUILD` to the string, so that the full version number is displayed, i.e:
  <img width="327" alt="this pr" src="https://user-images.githubusercontent.com/863730/48300015-7893f500-e510-11e8-98b9-80424719a082.png">

Tree-SHA512: f553253d03283639cc4dda00c8004b5c63ae2b489762e5e8c666166e71b14e672792c1df678f87484d51d153b5781c5ec1b145774096600f504833024ae8baea
TriKriSta referenced this pull request in ivansib/sibcoin Jul 4, 2019
…ring (#2687)

8e209340c85fc2493d7d1d7affe7e316bb613cbd build: Add CLIENT_VERSION_BUILD to CFBundleGetInfoString (fanquake)

Pull request description:

  As mentioned in #14697, if you download the `0.17.0.1` dmg, and inspect the `.app` bundle, the version in the GetInfo string reads `0.17.0`, which is confusing given you're expecting `0.17.0.1`:
  <img width="391" alt="0 17 0 1" src="https://user-images.githubusercontent.com/863730/48300032-fbb54b00-e510-11e8-9bcd-77e1fffffc63.png">

  This PR adds `CLIENT_VERSION_BUILD` to the string, so that the full version number is displayed, i.e:
  <img width="327" alt="this pr" src="https://user-images.githubusercontent.com/863730/48300015-7893f500-e510-11e8-98b9-80424719a082.png">

Tree-SHA512: f553253d03283639cc4dda00c8004b5c63ae2b489762e5e8c666166e71b14e672792c1df678f87484d51d153b5781c5ec1b145774096600f504833024ae8baea
@core-code
Copy link

@core-code core-code commented Nov 25, 2019

this has been going completely into the wrong direction. the 'CFBundleGetInfoString' has been deprecated for more than 10 years (!) and needs to be removed completely and not updated.

(if you need some copyright information it should be added to the 'NSHumanReadableCopyright' field)

meanwhile the 'real' version numbers embedded into the app are still broken. if you download version '0.19.0.1' the version strings are still cropped:

CFBundleShortVersionString:
0.19.0
CFBundleVersion:
0.19.0

both are wrong.

random-zebra added a commit to PIVX-Project/PIVX that referenced this pull request Nov 25, 2019
298528c build: Add CLIENT_VERSION_BUILD to CFBundleGetInfoString (fanquake)
04f5d5b build: use full version string in setup.exe (MarcoFalke)
c787618 Update release-process.md to include RC version bumping (Andrew Chow)
32a69da build: include rc number in version number (Andrew Chow)
8c2b28b build: if VERSION_BUILD is non-zero, include it in the package version (Andrew Chow)

Pull request description:

  This is a backport of the following 3 upstream PRs that result in more precise file names in gitian outputs and in macOS app version info; namely that they are no longer limited to only 3 levels deep (`3.4.0` for example) and will now include the 4th level and/or the RC version if needed (`4.0.0rc1` or `4.0.0.1` for example).

  bitcoin#14612
  bitcoin#14701
  bitcoin#15548

Top commit has no ACKs.

Tree-SHA512: 1195e9c0af92f4d6c2f7546530d1d5c1046f9139c8f9a03d2d8e092bbbcf5e5c5d046523e8a3712bde3d84bf81252dcc8dbb1ac3f1cdaaa863b1d14c3251fe95
@laanwj
Copy link
Member

@laanwj laanwj commented Nov 29, 2019

So looks like the versions are still cropped. Can anyone verify?

@Sjors
Copy link
Member

@Sjors Sjors commented Nov 29, 2019

Not sure where to look, these all look fine on Catalina:

Schermafbeelding 2019-11-29 om 09 49 22

Schermafbeelding 2019-11-29 om 09 49 39

Schermafbeelding 2019-11-29 om 09 49 56

@core-code
Copy link

@core-code core-code commented Nov 29, 2019

the screenshots from inside the app aren't useful. they can show anything they want and do not necessarily have a connection to the real version numbers of the app, i.e. the one the operating system knows about and e.g. uses to determine which is the newest version if multiple versions are installed.

the real version numbers are the CFBundleShortVersionString and especially the CFBundleVersion entries in the Info.plist file.

the screenshot from the Finder proves what i've been saying above. you are including the 'CFBundleGetInfoString' in your plist. this has been deprecated for more than 10 years. so, in the Finder you are just seeing this deprecated string instead of the real version numbers. those are still cropped:
Screenshot 2019-11-29 at 12 06 55

@core-code
Copy link

@core-code core-code commented Nov 29, 2019

so, if you change
CFBundleShortVersionString and CFBundleVersion to
<string>@CLIENT_VERSION_MAJOR@.@CLIENT_VERSION_MINOR@.@CLIENT_VERSION_REVISION@.@CLIENT_VERSION_BUILD@</string>
and remove CFBundleGetInfoString and add NSHumanReadableCopyright then things should be good ;)

@MarcoFalke
Copy link
Member

@MarcoFalke MarcoFalke commented Dec 3, 2019

@core-code Please open a new issue or pull request for this

fanquake added a commit to fanquake/bitcoin that referenced this pull request Dec 3, 2019
Note that the current release binaries don't show incorrect version
numbers anywhere in the GUI, and we haven't reintroduced the issue that
bitcoin#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.
fanquake added a commit to fanquake/bitcoin that referenced this pull request Dec 31, 2019
Note that the current release binaries don't show incorrect version
numbers anywhere in the GUI, and we haven't reintroduced the issue that
bitcoin#14701 fixed. This is just swapping a deprecated field for a newer
one and removing the additional version number.
laanwj added a commit that referenced this pull request Feb 5, 2020
c0bc453 build: remove deprecated key from macOS Info.plist (fanquake)

Pull request description:

  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
  ![0 19 0 1](https://user-images.githubusercontent.com/863730/70089170-a0576e80-15e5-11ea-975c-a6902a1ed95a.png)

  This PR.
  ![master](https://user-images.githubusercontent.com/863730/70089178-a3525f00-15e5-11ea-9d63-7db67de014a5.png)

ACKs for top commit:
  laanwj:
    ACK c0bc453

Tree-SHA512: 6191056d0cb6072b8a2170c8441ebfe500cf00cd41014bf5ee68fbf60b5bb5642e2fad9541f1c5abfaafdae6db3102c3add6169cefce3fc4a63d8b913ea35865
sidhujag added a commit to syscoin/syscoin that referenced this pull request Feb 9, 2020
c0bc453 build: remove deprecated key from macOS Info.plist (fanquake)

Pull request description:

  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 bitcoin#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 bitcoin#14701.

  0.19.0.1
  ![0 19 0 1](https://user-images.githubusercontent.com/863730/70089170-a0576e80-15e5-11ea-975c-a6902a1ed95a.png)

  This PR.
  ![master](https://user-images.githubusercontent.com/863730/70089178-a3525f00-15e5-11ea-9d63-7db67de014a5.png)

ACKs for top commit:
  laanwj:
    ACK c0bc453

Tree-SHA512: 6191056d0cb6072b8a2170c8441ebfe500cf00cd41014bf5ee68fbf60b5bb5642e2fad9541f1c5abfaafdae6db3102c3add6169cefce3fc4a63d8b913ea35865
HashUnlimited pushed a commit to HashUnlimited/chaincoin that referenced this pull request Apr 17, 2020
Note that the current release binaries don't show incorrect version
numbers anywhere in the GUI, and we haven't reintroduced the issue that
bitcoin#14701 fixed. This is just swapping a deprecated field for a newer
one and removing the additional version number.
sidhujag added a commit to syscoin-core/syscoin that referenced this pull request Nov 10, 2020
c0bc453 build: remove deprecated key from macOS Info.plist (fanquake)

Pull request description:

  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 bitcoin#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 bitcoin#14701.

  0.19.0.1
  ![0 19 0 1](https://user-images.githubusercontent.com/863730/70089170-a0576e80-15e5-11ea-975c-a6902a1ed95a.png)

  This PR.
  ![master](https://user-images.githubusercontent.com/863730/70089178-a3525f00-15e5-11ea-9d63-7db67de014a5.png)

ACKs for top commit:
  laanwj:
    ACK c0bc453

Tree-SHA512: 6191056d0cb6072b8a2170c8441ebfe500cf00cd41014bf5ee68fbf60b5bb5642e2fad9541f1c5abfaafdae6db3102c3add6169cefce3fc4a63d8b913ea35865
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

7 participants