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

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

Merged
merged 2 commits into from May 20, 2015

Conversation

@jonasschnelli
Copy link
Member

jonasschnelli commented May 7, 2015

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 jonasschnelli force-pushed the jonasschnelli:2015/05/rename_bitcoin_qt branch from f52e4dd to 0448fc8 May 7, 2015
@laanwj
Copy link
Member

laanwj commented May 7, 2015

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
Copy link
Member Author

jonasschnelli commented May 7, 2015

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 jonasschnelli force-pushed the jonasschnelli:2015/05/rename_bitcoin_qt branch 2 times, most recently from cef217d to e1f2956 May 7, 2015
@fanquake
Copy link
Member

fanquake commented May 7, 2015

Concept ACK

@jonasschnelli jonasschnelli changed the title [Mac only] rename Bitcoin-Qt.app to Bitcoin-Core.app rename Bitcoin-Qt.app to Bitcoin-Core.app May 7, 2015
@jonasschnelli jonasschnelli force-pushed the jonasschnelli:2015/05/rename_bitcoin_qt branch from e1f2956 to a049d10 May 7, 2015
@jonasschnelli
Copy link
Member Author

jonasschnelli commented May 7, 2015

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
Copy link
Member Author

jonasschnelli commented May 7, 2015

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

@jonasschnelli jonasschnelli force-pushed the jonasschnelli:2015/05/rename_bitcoin_qt branch from 879ba60 to cabc8de May 7, 2015
@jonasschnelli
Copy link
Member Author

jonasschnelli commented May 7, 2015

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 jonasschnelli changed the title rename Bitcoin-Qt.app to Bitcoin-Core.app [OSX] rename Bitcoin-Qt.app to Bitcoin-Core.app May 7, 2015
@Michagogo
Copy link
Contributor

Michagogo commented May 7, 2015

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
Copy link
Contributor

Michagogo commented May 7, 2015

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
Copy link
Member Author

jonasschnelli commented May 7, 2015

"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 jonasschnelli force-pushed the jonasschnelli:2015/05/rename_bitcoin_qt branch 4 times, most recently from b9fb4fd to 9606cbf May 7, 2015
@jonasschnelli
Copy link
Member Author

jonasschnelli commented May 11, 2015

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 jonasschnelli force-pushed the jonasschnelli:2015/05/rename_bitcoin_qt branch from 9606cbf to 65bf715 May 11, 2015
@Michagogo
Copy link
Contributor

Michagogo commented May 11, 2015

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 laanwj added the macOS label May 12, 2015
@laanwj
Copy link
Member

laanwj commented May 12, 2015

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
Copy link
Member Author

jonasschnelli commented May 12, 2015

@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
Copy link
Member Author

jonasschnelli commented May 12, 2015

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
Copy link
Member Author

jonasschnelli commented May 12, 2015

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 jonasschnelli force-pushed the jonasschnelli:2015/05/rename_bitcoin_qt branch 2 times, most recently from c521489 to 05c597f May 12, 2015
@jonasschnelli
Copy link
Member Author

jonasschnelli commented May 13, 2015

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
Copy link

ghost commented May 13, 2015

thanks for noticing that @jonasschnelli , i'm looking into the jar issues today and yea, its buggy all-around (#6119)

@jonasschnelli
Copy link
Member Author

jonasschnelli commented May 14, 2015

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

@laanwj
Copy link
Member

laanwj commented May 15, 2015

@theuni Can you take a look here?

@theuni
Copy link
Member

theuni commented May 15, 2015

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
Copy link
Member

theuni commented May 15, 2015

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.

@@ -106,7 +106,7 @@ $(APP_DIST_DIR)/Applications:
$(APP_DIST_EXTRAS): $(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/Bitcoin-Qt

$(OSX_DMG): $(APP_DIST_EXTRAS)
$(GENISOIMAGE) -no-cache-inodes -D -l -probe -V "Bitcoin-Qt" -no-pad -r -apple -o $@ dist
$(GENISOIMAGE) -no-cache-inodes -D -l -probe -V "Bitcoin-Core" -no-pad -r -apple -o $@ dist

This comment has been minimized.

Copy link
@theuni

theuni May 15, 2015

Member

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

This comment has been minimized.

Copy link
@laanwj

laanwj May 19, 2015

Member

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

This comment has been minimized.

Copy link
@jonasschnelli

jonasschnelli May 19, 2015

Author Member

Agreed. Fixed.

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

This comment has been minimized.

Copy link
@theuni

theuni May 15, 2015

Member

Same here.

@theuni
Copy link
Member

theuni commented May 15, 2015

@jonasschnelli I needed theuni@c2117a6 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
Copy link
Member Author

jonasschnelli commented May 17, 2015

@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 laanwj added this to the 0.11.0 milestone May 18, 2015
@jonasschnelli jonasschnelli force-pushed the jonasschnelli:2015/05/rename_bitcoin_qt branch from aa58d2f to 41df0f8 May 18, 2015
@jonasschnelli
Copy link
Member Author

jonasschnelli commented May 18, 2015

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

@jonasschnelli jonasschnelli force-pushed the jonasschnelli:2015/05/rename_bitcoin_qt branch from 41df0f8 to d1a3866 May 19, 2015
@laanwj
Copy link
Member

laanwj commented May 19, 2015

utACK

@jonasschnelli
Copy link
Member Author

jonasschnelli commented May 19, 2015

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 jonasschnelli force-pushed the jonasschnelli:2015/05/rename_bitcoin_qt branch 4 times, most recently from 3a6e3bf to d1a3866 May 19, 2015
@jonasschnelli
Copy link
Member Author

jonasschnelli commented May 19, 2015

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 laanwj merged commit d1a3866 into bitcoin:master May 20, 2015
1 check passed
1 check passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
laanwj added a commit that referenced this pull request May 20, 2015
d1a3866 build: Cope with spaces in filenames when creating/applying OSX sigs (Cory Fields)
7cef321 [Mac only] rename Bitcoin-Qt.app to "Bitcoin Core.app" (Jonas Schnelli)
@laanwj
Copy link
Member

laanwj commented May 20, 2015

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

@jonasschnelli
Copy link
Member Author

jonasschnelli commented May 20, 2015

@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
Copy link
Member

fanquake commented May 20, 2015

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 pull request in Homebrew/homebrew-cask Sep 25, 2015
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

5 participants
You can’t perform that action at this time.