Skip to content

Commit

Permalink
[OSX] macdeployqtplus bug fixes [OSX] (#514)
Browse files Browse the repository at this point in the history
* [OSX] macdeployqtplus bug fixes [OSX]

Background image of the OSX install window is mis-sized #379

* Update background.svg

Dynamic Labling

* Revert "Update background.svg"

This reverts commit ffa9d4d.

* Update background.svg

* Dynamic labeling

* {OSX} Gitian Building Fixes

Gitian build fails Fix.

* [OSX] Python Usage Fix

Python usage Fix

* [OSX] GItian Build Fixes #2

Gitian Build Fixes #2

* [OSX] DMG Mounting Crash Fix

DMG Mounting Crash Fix.
  • Loading branch information
sherlockcoin authored and alex v committed Jun 11, 2019
1 parent 4fb8043 commit e393fe4
Show file tree
Hide file tree
Showing 8 changed files with 110 additions and 96 deletions.
11 changes: 9 additions & 2 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ $(OSX_APP)/Contents/PkgInfo:

$(OSX_APP)/Contents/Resources/empty.lproj:
$(MKDIR_P) $(@D)
@touch $@
@touch $@

$(OSX_APP)/Contents/Info.plist: $(OSX_PLIST)
$(MKDIR_P) $(@D)
Expand All @@ -99,9 +99,16 @@ osx_volname:
echo $(OSX_VOLNAME) >$@

if BUILD_DARWIN
$(OSX_DMG): $(OSX_APP_BUILT) $(OSX_PACKAGING)
$(OSX_DMG): $(OSX_APP_BUILT) $(OSX_PACKAGING) $(OSX_BACKGROUND_IMAGE)
$(PYTHON) $(OSX_DEPLOY_SCRIPT) $(OSX_APP) -add-qt-tr $(OSX_QT_TRANSLATIONS) -translations-dir=$(QT_TRANSLATION_DIR) -dmg -fancy $(OSX_FANCY_PLIST) -verbose 2 -volname $(OSX_VOLNAME) -add-resources contrib/Frameworks/libboost_filesystem-mt.dylib contrib/Frameworks/libboost_system-mt.dylib

$(OSX_BACKGROUND_IMAGE).png: contrib/macdeploy/$(OSX_BACKGROUND_SVG)
sed 's/PACKAGE_NAME/$(PACKAGE_NAME)/' < "$<" | $(RSVG_CONVERT) -f png -d 36 -p 36 -o $@
$(OSX_BACKGROUND_IMAGE)@2x.png: contrib/macdeploy/$(OSX_BACKGROUND_SVG)
sed 's/PACKAGE_NAME/$(PACKAGE_NAME)/' < "$<" | $(RSVG_CONVERT) -f png -d 72 -p 72 -o $@
$(OSX_BACKGROUND_IMAGE): $(OSX_BACKGROUND_IMAGE).png $(OSX_BACKGROUND_IMAGE)@2x.png
tiffutil -cathidpicheck $^ -out $@

deploydir: $(OSX_DMG)
else
APP_DIST_DIR=$(top_builddir)/dist
Expand Down
1 change: 1 addition & 0 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -346,6 +346,7 @@ case $host in
fi
fi

AC_PATH_PROGS([RSVG_CONVERT], [rsvg-convert rsvg],rsvg-convert)
AC_CHECK_PROG([BREW],brew, brew)
if test x$BREW = xbrew; then
dnl These Homebrew packages may be keg-only, meaning that they won't be found
Expand Down
62 changes: 34 additions & 28 deletions contrib/macdeploy/background.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified contrib/macdeploy/background.tiff
Binary file not shown.
Binary file added contrib/macdeploy/background.tiff.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added contrib/macdeploy/background.tiff@2x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion contrib/macdeploy/custom_dsstore.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
ds = DSStore.open(output_file, 'w+')
ds['.']['bwsp'] = {
'ShowStatusBar': False,
'WindowBounds': b'{{300, 280}, {500, 343}}',
'WindowBounds': '{{300, 280}, {500, 343}}',
'ContainerShowSidebar': False,
'SidebarWidth': 0,
'ShowTabView': False,
Expand Down
Loading

0 comments on commit e393fe4

Please sign in to comment.