[OSX] rename Bitcoin-Qt.app to Bitcoin-Core.app #6116

jonasschnelli commented at 8:19 AM on May 7, 2015: contributor

Bitcoin-Qt is a strange name for a GUI application. IMO we could try to slowly remove the "-Qt" part and try to be consistent with "Bitcoin-Core". The main windows title is already saying that we are running "Bitcoin Core".

jonasschnelli force-pushed on May 7, 2015

laanwj commented at 11:30 AM on May 7, 2015: member

This obviously needs to be done at some point. However there are some ancillary issues, such as auto-start-on-startup, that need to be considered. As well as the installer (making sure the old executable, as well as links to it, are deleted on upgrade), as well as making sure QSettings still end up in the same place or are migrated. These may not be an issue on mac though.

BTW: The eventual DMG in releases is already called bitcoin-0.10.1-osx.dmg. No qt in there?

jonasschnelli commented at 11:39 AM on May 7, 2015: contributor

The .dmg name is correct. But when you open the disk image you will find an application called "Bitcoin-Qt".

I'll wait now for other opinions and if there are no reasons to stay with Bitcoin-Qt, i think it then makes sense to continue and complete this PR.

jonasschnelli force-pushed on May 7, 2015

fanquake commented at 1:21 PM on May 7, 2015: member

Concept ACK

jonasschnelli renamed this:
~~[Mac only] rename Bitcoin-Qt.app to Bitcoin-Core.app~~
rename Bitcoin-Qt.app to Bitcoin-Core.app
on May 7, 2015

jonasschnelli force-pushed on May 7, 2015

jonasschnelli commented at 1:48 PM on May 7, 2015: contributor

~~Tested on windows regarding persisted settings (QSettings) and autostart. Also tested nsi installer.~~

If we continue with this, somebody with binary signing capabilities (win/mac) should check how a name change would affect signing. Process of updating Bitcoin-Qt is also something which should be tested.

jonasschnelli commented at 1:56 PM on May 7, 2015: contributor

A gitian build (with logs to check) can be downloaded here: https://builds.jonasschnelli.ch/pulls/6116/

jonasschnelli force-pushed on May 7, 2015

jonasschnelli commented at 2:15 PM on May 7, 2015: contributor

After discussion this on IRC we came to the point to not changing the actual executable names. Rolled this back so this PR will only change the OSX Bundle Name (executable and signing entities stays the same).

jonasschnelli renamed this:
~~rename Bitcoin-Qt.app to Bitcoin-Core.app~~
[OSX] rename Bitcoin-Qt.app to Bitcoin-Core.app
on May 7, 2015

Michagogo commented at 6:24 PM on May 7, 2015: contributor

Why Bitcoin-Core.app and not Bitcoin\ Core.app? I'm fairly certain .app names can have spaces, and I feel like this is similar to the start menu entry/shortcut change, which does include a space.

Michagogo commented at 6:27 PM on May 7, 2015: contributor

And re: the installer, I don't know that that can really be done, considering the installation process for OS X is "drag the .app folder into /Applications". (I'm assuming we don't want to use a .[m]pkg)

jonasschnelli commented at 7:36 PM on May 7, 2015: contributor

"Bitcoin\ Core.app" sounds good to me. I'll change it that way. The installation process will be manually (user need to delete Bitcoin-Qt.app before or after he installed/copied the new Bitcoin-Core.app. I think we don't want to go for a .pkg (uncommon on OSX).

jonasschnelli force-pushed on May 7, 2015

jonasschnelli force-pushed on May 8, 2015

jonasschnelli force-pushed on May 11, 2015

jonasschnelli commented at 1:22 PM on May 11, 2015: contributor

Changing it to "Bitcoin\ Core.app" seems not to be possible. Somehow Automake and co. are not ready to build binaries with names containing whitespaces. I think we should keep it Bitcoin-Core.app (as this PR like to change it to) to avoid heavy-maintainable hacks.

jonasschnelli force-pushed on May 11, 2015

Michagogo commented at 3:04 PM on May 11, 2015: contributor

If it can't be done without a hack, then it's not such a huge deal... It's just that from the limited experience I have with Macs, having multiple words separated by something other than spaces is non-standard and I figured it would look weird, kinda like how the standard installer is a .dmg with an .app and a shortcut to /Applications. (Also, nit: "Bitcoin
Core.app" is redundant, since you don't need \ in quotes. (And if I made that mistake... oops.))

On Monday, May 11, 2015, Jonas Schnelli notifications@github.com wrote:

Changing it to "Bitcoin\ Core.app" seems not to be possible. Somehow Automake and co. are not ready to build binaries with names containing whitespaces. I think we should keep it Bitcoin-Core.app (as this PR like to change it to) to avoid heavy-maintainable hacks.

— Reply to this email directly or view it on GitHub #6116 (comment).

laanwj added the label Mac on May 12, 2015

laanwj commented at 12:17 PM on May 12, 2015: member

Changing it to "Bitcoin\ Core.app" seems not to be possible. Somehow Automake and co. are not ready to build binaries with names containing whitespaces.

That's really sad, if true. It's not just a matter of escaping in the right way?

Error: Invalid or corrupt jarfile /home/travis/build/bitcoin/bitcoin/depends/x86_64-unknown-linux-gnu/native/share/BitcoindComparisonTool_jar/BitcoindComparisonTool.jar

Strange error, doesn't seem to be caused by any change here. WIll retrigger Travis.

jonasschnelli commented at 12:38 PM on May 12, 2015: contributor

@laanwj: After trying to use whitespace with escape sequences like '\ ' or taking the whole app name into string quotes and also did a google research on how autotools and whitespace can live together i found out that this is not just a trivial escaping thing. I try now rename the .app file during the make process before adding it to the disk image. This could be a quick and stable workaround.

And yes. The travis issue is strange and i can't cure it from my side. Other PRs work fine. I force pushed / rebased this PR some times but the .jar issue is still there.I don't get this.

jonasschnelli commented at 12:56 PM on May 12, 2015: contributor

Added another commit: now Bitcoin-Core.app (folder) gets renamed to Bitcoin Core.app during the disk image process. Just started another PR gitian build to test this more authentic: https://builds.jonasschnelli.ch/pulls/6116/

jonasschnelli commented at 1:23 PM on May 12, 2015: contributor

This is not ready yet. Gitian build process bypassed macdeployqtplus. It first need a fix for the DMG name as well as for the missing background picture.

jonasschnelli force-pushed on May 12, 2015

jonasschnelli commented at 6:49 PM on May 12, 2015: contributor

Solved. The window title of the disk image is now "Bitcoin-Core" (instead of Bitcoin-Qt). The app name inside the disk image is now "Bitcoin Core" (with whitespace between "Bitcoin" and "Core"). Tested over gitian.

Ready to ACK and Merge. :)

jonasschnelli commented at 12:58 PM on May 13, 2015: contributor

The travis issues seems to be connected to the JAR comparison tool. I can't see any connection to this PR.

jonasschnelli force-pushed on May 13, 2015

jonasschnelli commented at 1:43 PM on May 13, 2015: contributor

Here is the line where travis fails. Looks like the nativ comparison tool can not be unpacked: https://travis-ci.org/bitcoin/bitcoin/jobs/62393150#L272

ghost commented at 4:53 PM on May 13, 2015: none

thanks for noticing that @jonasschnelli , i'm looking into the jar issues today and yea, its buggy all-around (https://github.com/bitcoin/bitcoin/issues/6119)

jonasschnelli commented at 12:27 PM on May 14, 2015: contributor

Travis is now happy with this. Would be nice if we can include this in 0.11.

laanwj commented at 4:55 PM on May 15, 2015: member

@theuni Can you take a look here?

theuni commented at 5:03 PM on May 15, 2015: member

Sure. I'd like to go through the entire release process with this change on top, just to make sure there's nothing missing. Will do that today.

theuni commented at 9:06 PM on May 15, 2015: member

The detached sig create/apply scripts needed a good bit of quoting love to deal with the spaces. My fault there.

I'm fixing those up now.

in Makefile.am:None in 908cc76de1 outdated

 105 | @@ -106,7 +106,7 @@ $(APP_DIST_DIR)/Applications:
 106 |  $(APP_DIST_EXTRAS): $(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/Bitcoin-Qt
 107 |  
 108 |  $(OSX_DMG): $(APP_DIST_EXTRAS)
 109 | -	$(GENISOIMAGE) -no-cache-inodes -D -l -probe -V "Bitcoin-Qt" -no-pad -r -apple -o $@ dist
 110 | +	$(GENISOIMAGE) -no-cache-inodes -D -l -probe -V "Bitcoin-Core" -no-pad -r -apple -o $@ dist

theuni commented at 10:18 PM on May 15, 2015:

Any reason for not using "Bitcoin Core" here? These set the volume descriptor that OSX ends up using for mounting.

laanwj commented at 9:38 AM on May 19, 2015:

Agreed @theuni. Let's avoid '-' where possible.

jonasschnelli commented at 11:06 AM on May 19, 2015:

Agreed. Fixed.

in contrib/gitian-descriptors/gitian-osx-signer.yml:None in 908cc76de1 outdated

  32 | @@ -33,5 +33,5 @@ script: |
  33 |  
  34 |    tar -xf ${UNSIGNED}
  35 |    ./detached-sig-apply.sh ${UNSIGNED} signature.tar.gz
  36 | -  ${WRAP_DIR}/genisoimage -no-cache-inodes -D -l -probe -V "Bitcoin-Qt" -no-pad -r -apple -o uncompressed.dmg signed-app
  37 | +  ${WRAP_DIR}/genisoimage -no-cache-inodes -D -l -probe -V "Bitcoin-Core" -no-pad -r -apple -o uncompressed.dmg signed-app

theuni commented at 10:19 PM on May 15, 2015:

Same here.

theuni commented at 10:24 PM on May 15, 2015: member

@jonasschnelli I needed https://github.com/theuni/bitcoin/commit/c2117a6b981bc20048acdff949bef98fd579b45b in order to get signing working. Seems to be working fine. It even hides the old Bitcoin-Qt in Launchpad. Neat.

I'm not 100% sure that this won't cause any issues for upgraders, but I guess we'll find out when we do a real signing for rc1.

jonasschnelli commented at 6:56 AM on May 17, 2015: contributor

@theuni: will pull in you commit as soon as I'm back at the keys.

Upgraders should delete the old version in the /Application folder. Launchpad uses the bundle identifier - which i kept the same in this PR - to identify the uniqueness.

laanwj added this to the milestone 0.11.0 on May 18, 2015

jonasschnelli force-pushed on May 18, 2015

jonasschnelli commented at 1:15 PM on May 18, 2015: contributor

Pulled in @theuni's change and built again over gitian: https://builds.jonasschnelli.ch/pulls/6116/

This is how it looks after and before this PR: bildschirmfoto-2015-05-18-um-15 11 52

[Mac only] rename Bitcoin-Qt.app to "Bitcoin Core.app" 7cef321e65

build: Cope with spaces in filenames when creating/applying OSX sigs d1a3866e0b

jonasschnelli force-pushed on May 19, 2015

laanwj commented at 11:18 AM on May 19, 2015: member

utACK

jonasschnelli commented at 11:22 AM on May 19, 2015: contributor

It's currently not working:

/home/ubuntu/build/bitcoin/depends/x86_64-apple-darwin11/native/bin/genisoimage: No such file or directory. Invalid node - 'Core'.

Now i know why i left the dash there. :)

Will try to find a fix (maybe over renaming) for this.

jonasschnelli force-pushed on May 19, 2015

jonasschnelli commented at 2:34 PM on May 19, 2015: contributor

It looks like genisoimage's -V (volid) parameter is not whitespace compatible (even with quotes). Therefore i suggest using "Bitcoin-Core" as disk image title.

laanwj merged this on May 20, 2015

laanwj closed this on May 20, 2015

laanwj referenced this in commit 30dc3c1b38 on May 20, 2015

laanwj commented at 11:09 AM on May 20, 2015: member

I suppose the volume name isn't user-visible normally? In any case, not important.

jonasschnelli commented at 11:17 AM on May 20, 2015: contributor

@laanwj: it is visible but not that important. See #6116 (comment). It's visible in the left part of a Finder window as well as in the window title of the opened disk-image in Finder.

fanquake commented at 11:22 AM on May 20, 2015: member

Post merge ACK, glad this is now done.

On Wednesday, May 20, 2015, Jonas Schnelli notifications@github.com wrote:

@laanwj https://github.com/laanwj: it is visible but not that important. See #6116 (comment) #6116 (comment). It's visible in the left part of a Finder window as well as in the window title of the opened disk-image in Finder.

Reply to this email directly or view it on GitHub #6116 (comment).

jonasschnelli referenced this in commit 5a28a87b2c on Sep 25, 2015

MarcoFalke locked this on Sep 8, 2021