Skip to content

Commit d3d7a05

Browse files
kwvgkwvg
committed
merge bitcoin#24031: don't compress macOS DMG
1 parent 6a54603 commit d3d7a05

File tree

10 files changed

+7
-111
lines changed

10 files changed

+7
-111
lines changed

‎.gitignore‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@ libconftest.dylib*
7676
*.log
7777
*.trs
7878
*.dmg
79-
*.iso
8079

8180
*.json.h
8281
*.raw.h

‎Makefile.am‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ if ENABLE_MAN
1313
SUBDIRS += doc/man
1414
endif
1515
.PHONY: deploy FORCE
16-
.INTERMEDIATE: $(OSX_TEMP_ISO) $(COVERAGE_INFO)
16+
.INTERMEDIATE: $(COVERAGE_INFO)
1717

1818
export PYTHONPATH
1919

@@ -37,7 +37,6 @@ space := $(empty) $(empty)
3737
OSX_APP=Dash-Qt.app
3838
OSX_VOLNAME = $(subst $(space),-,$(PACKAGE_NAME))
3939
OSX_DMG = $(OSX_VOLNAME).dmg
40-
OSX_TEMP_ISO = $(OSX_DMG:.dmg=).temp.iso
4140
OSX_DEPLOY_SCRIPT=$(top_srcdir)/contrib/macdeploy/macdeployqtplus
4241
OSX_INSTALLER_ICONS=$(top_srcdir)/src/qt/res/icons/dash.icns
4342
OSX_PLIST=$(top_builddir)/share/qt/Info.plist #not installed
@@ -127,19 +126,15 @@ deploydir: $(OSX_DMG)
127126
else !BUILD_DARWIN
128127
APP_DIST_DIR=$(top_builddir)/dist
129128

130-
$(OSX_TEMP_ISO): $(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/Dash-Qt
129+
$(OSX_DMG): deploydir
131130
$(XORRISOFS) -D -l -V "$(OSX_VOLNAME)" -no-pad -r -dir-mode 0755 -o $@ $(APP_DIST_DIR) -- $(if $(SOURCE_DATE_EPOCH),-volume_date all_file_dates =$(SOURCE_DATE_EPOCH))
132131

133-
$(OSX_DMG): $(OSX_TEMP_ISO)
134-
$(DMG) dmg "$<" "$@"
135-
136132
$(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/Dash-Qt: $(OSX_APP_BUILT) $(OSX_PACKAGING)
137133
INSTALLNAMETOOL=$(INSTALLNAMETOOL) OTOOL=$(OTOOL) STRIP=$(STRIP) $(PYTHON) $(OSX_DEPLOY_SCRIPT) $(OSX_APP) $(OSX_VOLNAME) -translations-dir=$(QT_TRANSLATION_DIR)
138134

139135
deploydir: $(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/Dash-Qt
140136
endif !BUILD_DARWIN
141137

142-
appbundle: $(OSX_APP_BUILT)
143138
deploy: $(OSX_DMG)
144139
endif
145140

‎configure.ac‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -846,7 +846,6 @@ case $host in
846846
AC_PATH_TOOL([INSTALLNAMETOOL], [install_name_tool], install_name_tool)
847847
AC_PATH_TOOL([OTOOL], [otool], otool)
848848
AC_PATH_PROGS([XORRISOFS], [xorrisofs], xorrisofs)
849-
AC_PATH_PROGS([DMG], [dmg], dmg)
850849

851850
dnl libtool will try to strip the static lib, which is a problem for
852851
dnl cross-builds because strip attempts to call a hard-coded ld,

‎contrib/guix/libexec/build.sh‎

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -81,19 +81,6 @@ prepend_to_search_env_var() {
8181
export "${1}=${2}${!1:+:}${!1}"
8282
}
8383

84-
case "$HOST" in
85-
*darwin*)
86-
# When targeting darwin, zlib is required by native_libdmg-hfsplus.
87-
zlib_store_path=$(store_path "zlib")
88-
zlib_static_store_path=$(store_path "zlib" static)
89-
90-
prepend_to_search_env_var LIBRARY_PATH "${zlib_static_store_path}/lib:${zlib_store_path}/lib"
91-
prepend_to_search_env_var C_INCLUDE_PATH "${zlib_store_path}/include"
92-
prepend_to_search_env_var CPLUS_INCLUDE_PATH "${zlib_store_path}/include"
93-
prepend_to_search_env_var OBJC_INCLUDE_PATH "${zlib_store_path}/include"
94-
prepend_to_search_env_var OBJCPLUS_INCLUDE_PATH "${zlib_store_path}/include"
95-
esac
96-
9784
# Set environment variables to point the CROSS toolchain to the right
9885
# includes/libs for $HOST
9986
case "$HOST" in
@@ -326,8 +313,7 @@ mkdir -p "$DISTSRC"
326313
make deploydir ${V:+V=1}
327314
mkdir -p "unsigned-app-${HOST}"
328315
cp --target-directory="unsigned-app-${HOST}" \
329-
contrib/macdeploy/detached-sig-create.sh \
330-
"${BASEPREFIX}/${HOST}"/native/bin/dmg
316+
contrib/macdeploy/detached-sig-create.sh
331317
mv --target-directory="unsigned-app-${HOST}" dist
332318
(
333319
cd "unsigned-app-${HOST}"

‎contrib/guix/libexec/codesign.sh‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -77,14 +77,11 @@ mkdir -p "$DISTSRC"
7777
# Apply detached codesignatures to dist/ (in-place)
7878
signapple apply dist/Dash-Qt.app codesignatures/osx/dist
7979

80-
# Make an uncompressed DMG from dist/
80+
# Make a DMG from dist/
8181
xorrisofs -D -l -V "$(< osx_volname)" -no-pad -r -dir-mode 0755 \
82-
-o uncompressed.dmg \
82+
-o "${OUTDIR}/${DISTNAME}-${HOST}.dmg" \
8383
dist \
8484
-- -volume_date all_file_dates ="$SOURCE_DATE_EPOCH"
85-
86-
# Compress uncompressed.dmg and output to OUTDIR
87-
./dmg dmg uncompressed.dmg "${OUTDIR}/${DISTNAME}-${HOST}.dmg"
8885
;;
8986
*)
9087
exit 1

‎contrib/guix/manifest.scm‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -585,8 +585,6 @@ parse, modify and abstract ELF, PE and MachO formats.")
585585
bzip2
586586
gzip
587587
xz
588-
zlib
589-
(list zlib "static")
590588
;; Build tools
591589
cmake-minimal
592590
gnu-make

‎contrib/macdeploy/README.md‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -97,16 +97,7 @@ redistributed.
9797

9898
[`xorrisofs`](https://www.gnu.org/software/xorriso/) is used to create the DMG.
9999

100-
`xorrisofs` cannot compress DMGs, so afterwards, the DMG tool from the
101-
`libdmg-hfsplus` project is used to compress it. There are several bugs in this
102-
tool and its maintainer has seemingly abandoned the project.
103-
104-
The DMG tool has the ability to create DMGs from scratch as well, but this functionality is
105-
broken. Only the compression feature is currently used. Ideally, the creation could be fixed
106-
and `xorrisofs` would no longer be necessary.
107-
108-
Background images and other features can be added to DMG files by inserting a
109-
`.DS_Store` during creation.
100+
A background image is added to DMG files by inserting a `.DS_Store` during creation.
110101

111102
As of OS X 10.9 Mavericks, using an Apple-blessed key to sign binaries is a requirement in
112103
order to satisfy the new Gatekeeper requirements. Because this private key cannot be

‎depends/packages/native_libdmg-hfsplus.mk‎

Lines changed: 0 additions & 24 deletions
This file was deleted.

‎depends/packages/packages.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ usdt_linux_packages=systemtap
2727
darwin_native_packages = native_ds_store native_mac_alias
2828

2929
ifneq ($(build_os),darwin)
30-
darwin_native_packages += native_cctools native_libtapi native_libdmg-hfsplus
30+
darwin_native_packages += native_cctools native_libtapi
3131

3232
ifeq ($(strip $(FORCE_USE_SYSTEM_CLANG)),)
3333
darwin_native_packages+= native_clang

‎depends/patches/native_libdmg-hfsplus/remove-libcrypto-dependency.patch‎

Lines changed: 0 additions & 45 deletions
This file was deleted.

0 commit comments

Comments
 (0)