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

[scripts] Minor improvements to `macdeployqtplus` script. #10273

Merged
merged 2 commits into from Apr 26, 2017

Conversation

Projects
None yet
3 participants
@chrisgavin
Copy link
Contributor

chrisgavin commented Apr 25, 2017

No description provided.

@laanwj laanwj added the Build system label Apr 25, 2017

@@ -302,7 +302,6 @@ def copyFramework(framework, path, verbose):
if os.path.exists(fromContentsDir):
toContentsDir = os.path.join(path, framework.destinationVersionContentsDirectory)
shutil.copytree(fromContentsDir, toContentsDir, symlinks=True)
contentslinkfrom = os.path.join(path, framework.destinationContentsDirectory)

This comment has been minimized.

@jonasschnelli

jonasschnelli Apr 25, 2017

Member

What's the reason to remove this line? We don't use dynamic linked custom Frameworks in the Bitcoin-Qt.app bundle.

This comment has been minimized.

@chrisgavin

chrisgavin Apr 25, 2017

Author Contributor

In af0bd5e, the majority of this code was removed but I think this line was left in by mistake. As far as I can tell it doesn't do anything - it just defines a variable that is never used.

@jonasschnelli jonasschnelli added the macOS label Apr 25, 2017

@jonasschnelli

This comment has been minimized.

Copy link
Member

jonasschnelli commented Apr 26, 2017

Yes. Makes sense (though a very tiny optimisation/cleanup near PR "dust-limit").
utACK e8babc4

@jonasschnelli

This comment has been minimized.

Copy link
Member

jonasschnelli commented Apr 26, 2017

Builds the DMG correctly (https://bitcoin.jonasschnelli.ch/build/113).
Tested ACK e8babc4

@laanwj laanwj merged commit e8babc4 into bitcoin:master Apr 26, 2017

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

laanwj added a commit that referenced this pull request Apr 26, 2017

Merge #10273: [scripts] Minor improvements to `macdeployqtplus` script.
e8babc4 Use `with` in `macdeployqtplus` script. (Chris Gavin)
4f3ac7d Remove unused variable from `macdeployqtplus` script. (Chris Gavin)

Tree-SHA512: 0259506b36f3bfcc64ada951dcd4fdab1611ef76a39f92effd1163b6d8fab06bdbf50784b4b22f8b1483697c3029c12cfee5372b442ab445887ac4f928f6de80
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.