-
Notifications
You must be signed in to change notification settings - Fork 38.7k
Contrib: Mac: Fix mac deploy so that the dmg background works #9405
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
Conversation
|
I ran into the |
|
Indeed, I wondered if this was going to sort out the background image issues. Lets try and fix those up here as well. |
|
What is the background image issue? I can probably fix that |
$ make deploy
/Library/Developer/CommandLineTools/usr/bin/make -C src qt/bitcoin-qt
make[2]: `libsecp256k1.la' is up to date.
build-aux/install-sh -c -d Bitcoin-Qt.app/Contents/MacOS
STRIPPROG="/usr/bin/strip" /bin/sh /Users/me/workspace/bitcoin-kw/build-aux/install-sh -c -s src/qt/bitcoin-qt Bitcoin-Qt.app/Contents/MacOS/Bitcoin-Qt
/usr/local/bin/python3.5 ./contrib/macdeploy/macdeployqtplus Bitcoin-Qt.app -add-qt-tr da,de,es,hu,ru,uk,zh_CN,zh_TW -translations-dir= -dmg -fancy ./contrib/macdeploy/fancy.plist -verbose 2 -volname Bitcoin-Core
Error: Could not find background picture at "background.tiff" or "./contrib/macdeploy/background.tiff"
make: *** [Bitcoin-Core.dmg] Error 1 |
|
"If at least one of encoding or errors is given, object should be a bytes-like object (e.g. bytes or bytearray). In this case, if object is a bytes (or bytearray) object, then str(bytes, encoding, errors) is equivalent to bytes.decode(encoding, errors). Otherwise, the bytes object underlying the buffer object is obtained before calling bytes.decode(). See Binary Sequence Types — bytes, bytearray, memoryview and Buffer Protocol for information on buffer objects." cite: https://docs.python.org/3/library/stdtypes.html |
|
Okay, I'll take a look at background.tiff issue in the morning. |
|
AFAIK, I think most devs compile releases over Gitian, so its not among the top priorities to fix. But we should. |
…mmodate new image background
…ther than the svg build process
|
Ok. I changed the dmg build process to just use a static jpg image as the background. I don't know why a dynamic background image was being built from an svg. That seems kind of crazy. In the process I found a bug in the macqtdeployplus script which I also fixed. |
|
Checking on why it didn't pass tests |
|
Okay, so if someone else can check this out on their machine. There are some fixes to the python in the build process and I fixed the dmg background image. It works fine on my machine and in the automated builds. |
|
I think this solution is a step backward. In #7192 we got rid of the static image and introduced a SVG with a flexible product name. |
Please don't use jpg for compression of such data. I think #9412 is the solution to go. |
|
Agree with @jonasschnelli's comments. Thanks for the initial bugfix and further contributions @djp3, however I'm going to close this in favour of #9412. It'd be great if you could test that PR and check it fixes your original issue. |
| } | ||
| if "window_bounds" in fancy: | ||
| params["window.bounds"] = ",".join([str(p) for p in fancy["window_bounds"]]) | ||
| params["window_bounds"] = ",".join([str(p) for p in fancy["window_bounds"]]) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
|
@fanquake Ok thanks! |
I couldn't get the mac .dmg build to work unless I made the two changes to python in this patch.
Update: I subsequently added a fix to the dmg build to make the background image work