Skip to content

Commit 47b6ad8

Browse files
committed
Merge bitcoin#20333: build: remove native_biplist dependency
7087440 depends: native_ds_store 1.3.0 (fanquake) Pull request description: `ds_store` [now takes advantage](dmgbuild/ds_store@36fb607) of Pythons ability to decode binary [plists](https://docs.python.org/3/library/plistlib.html) (since 3.4), so we can drop its biplist dependency. The call to `biplist.Data()` in `custom_dsstore.py` doesn't seem to do anything, and from what I can tell can just be removed. i.e: ```diff diff --git a/contrib/macdeploy/custom_dsstore.py b/contrib/macdeploy/custom_dsstore.py index dc1c188..e475bc6c3 100755 --- a/contrib/macdeploy/custom_dsstore.py +++ b/contrib/macdeploy/custom_dsstore.py @@ -47,6 +47,7 @@ alias.volume.disk_image_alias.target.filename = package_name_ns + '.temp.dmg' alias.volume.disk_image_alias.target.carbon_path = 'Macintosh HD:Users:\x00bitcoinuser:\x00Documents:\x00bitcoin:\x00bitcoin:\x00' + package_name_ns + '.temp.dmg' alias.volume.disk_image_alias.target.posix_path = 'Users/bitcoinuser/Documents/bitcoin/bitcoin/' + package_name_ns + '.temp.dmg' alias.target.carbon_path = package_name_ns + ':.background:\x00background.tiff' +assert(biplist.Data(alias.to_bytes()) == alias.to_bytes()) icvp['backgroundImageAlias'] = biplist.Data(alias.to_bytes()) ds['.']['icvp'] = icvp ``` ACKs for top commit: laanwj: ACK 7087440 Tree-SHA512: 8ba3cf561937efe4a3daae8b0cb4de3bf9e425b3a9244161b09d94ee2b1bd4c3e21315fa70e495b19a052aabdc1731b3b6f346b63272d72d2762ced83237d02f
2 parents 888c22e + 7087440 commit 47b6ad8

File tree

4 files changed

+4
-21
lines changed

4 files changed

+4
-21
lines changed

contrib/macdeploy/custom_dsstore.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
# Copyright (c) 2013-2018 The Bitcoin Core developers
33
# Distributed under the MIT software license, see the accompanying
44
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
5-
import biplist
65
from ds_store import DSStore
76
from mac_alias import Alias
87
import sys
@@ -47,7 +46,7 @@
4746
alias.volume.disk_image_alias.target.carbon_path = 'Macintosh HD:Users:\x00bitcoinuser:\x00Documents:\x00bitcoin:\x00bitcoin:\x00' + package_name_ns + '.temp.dmg'
4847
alias.volume.disk_image_alias.target.posix_path = 'Users/bitcoinuser/Documents/bitcoin/bitcoin/' + package_name_ns + '.temp.dmg'
4948
alias.target.carbon_path = package_name_ns + ':.background:\x00background.tiff'
50-
icvp['backgroundImageAlias'] = biplist.Data(alias.to_bytes())
49+
icvp['backgroundImageAlias'] = alias.to_bytes()
5150
ds['.']['icvp'] = icvp
5251

5352
ds['.']['vSrn'] = ('long', 1)

depends/packages/native_biplist.mk

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

depends/packages/native_ds_store.mk

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
package=native_ds_store
2-
$(package)_version=1.1.2
2+
$(package)_version=1.3.0
33
$(package)_download_path=https://github.com/al45tair/ds_store/archive/
44
$(package)_file_name=v$($(package)_version).tar.gz
5-
$(package)_sha256_hash=3b3ecb7bf0a5157f5b6010bc3af7c141fb0ad3527084e63336220d22744bc20c
5+
$(package)_sha256_hash=76b3280cd4e19e5179defa23fb594a9dd32643b0c80d774bd3108361d94fb46d
66
$(package)_install_libdir=$(build_prefix)/lib/python3/dist-packages
7-
$(package)_dependencies=native_biplist
87

98
define $(package)_build_cmds
109
python3 setup.py build

depends/packages/packages.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ upnp_packages=miniupnpc
2020
multiprocess_packages = libmultiprocess capnp
2121
multiprocess_native_packages = native_libmultiprocess native_capnp
2222

23-
darwin_native_packages = native_biplist native_ds_store native_mac_alias
23+
darwin_native_packages = native_ds_store native_mac_alias
2424

2525
ifneq ($(build_os),darwin)
2626
darwin_native_packages += native_cctools native_cdrkit native_libdmg-hfsplus

0 commit comments

Comments
 (0)