diff options
author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2021-12-26 21:48:19 +0100 |
---|---|---|
committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2021-12-26 21:59:19 +0100 |
commit | 88a50ab104d55f1b652cff93bc2de37b151aefb3 (patch) | |
tree | 7c130b0129a4e1bcb5119353a6e8b18d17cb29a9 | |
parent | 5999b4f791c547343c6884fb2f1d5d1ca7276032 (diff) | |
download | rockbox-88a50ab104d55f1b652cff93bc2de37b151aefb3.tar.gz rockbox-88a50ab104d55f1b652cff93bc2de37b151aefb3.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.cmake | 2 | ||||
-rw-r--r-- | utils/rbutilqt/dmgbuild.cfg | 8 |
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") | |||
78 | COMMENT "Setting up dmgbuild virtualenv" | 78 | COMMENT "Setting up dmgbuild virtualenv" |
79 | OUTPUT ${DMGBUILD} | 79 | OUTPUT ${DMGBUILD} |
80 | COMMAND python3 -m venv ${CMAKE_BINARY_DIR}/venv | 80 | COMMAND python3 -m venv ${CMAKE_BINARY_DIR}/venv |
81 | COMMAND ${CMAKE_BINARY_DIR}/venv/bin/python -m pip install -q dmgbuild biplist | 81 | COMMAND ${CMAKE_BINARY_DIR}/venv/bin/python -m pip install -q dmgbuild |
82 | ) | 82 | ) |
83 | 83 | ||
84 | add_custom_command( | 84 | 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 @@ | |||
1 | # Configuration for creating a dmg with dmgbuild | 1 | # Configuration for creating a dmg with dmgbuild |
2 | # (https://github.com/al45tair/dmgbuild) | 2 | # (https://github.com/al45tair/dmgbuild) |
3 | # Needs biplist as additional package. | 3 | # Requires at least Python 3.4 |
4 | 4 | ||
5 | import os | 5 | import os |
6 | import biplist | 6 | import plistlib |
7 | 7 | ||
8 | _appbundle = defines['appbundle'] | 8 | _appbundle = defines['appbundle'] |
9 | _plist = biplist.readPlist(os.path.join(_appbundle, 'Contents/Info.plist')) | 9 | _plfile = open(os.path.join(_appbundle, 'Contents/Info.plist')) |
10 | _pldata = _plfile.read().encode() | ||
11 | _plist = plistlib.loads(_pldata) | ||
10 | _iconfile = os.path.join(_appbundle, 'Contents/Resources', _plist['CFBundleIconFile']) | 12 | _iconfile = os.path.join(_appbundle, 'Contents/Resources', _plist['CFBundleIconFile']) |
11 | 13 | ||
12 | files = [ _appbundle ] | 14 | files = [ _appbundle ] |