summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDominik Riebeling <Dominik.Riebeling@gmail.com>2021-12-26 21:48:19 +0100
committerDominik Riebeling <Dominik.Riebeling@gmail.com>2021-12-26 21:59:19 +0100
commit88a50ab104d55f1b652cff93bc2de37b151aefb3 (patch)
tree7c130b0129a4e1bcb5119353a6e8b18d17cb29a9
parent5999b4f791c547343c6884fb2f1d5d1ca7276032 (diff)
downloadrockbox-88a50ab104.tar.gz
rockbox-88a50ab104.zip
rbutil: Change MacOS dmgbuild to use plistlib.
We're not dealing with binary plist files, to biplist is not the one we want. Also, plistlib is part of Python. Change-Id: I529516da0d6b04809a7c0d38b20c6f40900560f8
-rw-r--r--utils/cmake/deploy.cmake2
-rw-r--r--utils/rbutilqt/dmgbuild.cfg8
2 files changed, 6 insertions, 4 deletions
diff --git a/utils/cmake/deploy.cmake b/utils/cmake/deploy.cmake
index 8ef82e71ca..20c601b1ad 100644
--- a/utils/cmake/deploy.cmake
+++ b/utils/cmake/deploy.cmake
@@ -78,7 +78,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
COMMENT "Setting up dmgbuild virtualenv"
OUTPUT ${DMGBUILD}
COMMAND python3 -m venv ${CMAKE_BINARY_DIR}/venv
- COMMAND ${CMAKE_BINARY_DIR}/venv/bin/python -m pip install -q dmgbuild biplist
+ COMMAND ${CMAKE_BINARY_DIR}/venv/bin/python -m pip install -q dmgbuild
)
add_custom_command(
diff --git a/utils/rbutilqt/dmgbuild.cfg b/utils/rbutilqt/dmgbuild.cfg
index 8f7a933237..70d086c098 100644
--- a/utils/rbutilqt/dmgbuild.cfg
+++ b/utils/rbutilqt/dmgbuild.cfg
@@ -1,12 +1,14 @@
# Configuration for creating a dmg with dmgbuild
# (https://github.com/al45tair/dmgbuild)
-# Needs biplist as additional package.
+# Requires at least Python 3.4
import os
-import biplist
+import plistlib
_appbundle = defines['appbundle']
-_plist = biplist.readPlist(os.path.join(_appbundle, 'Contents/Info.plist'))
+_plfile = open(os.path.join(_appbundle, 'Contents/Info.plist'))
+_pldata = _plfile.read().encode()
+_plist = plistlib.loads(_pldata)
_iconfile = os.path.join(_appbundle, 'Contents/Resources', _plist['CFBundleIconFile'])
files = [ _appbundle ]