From 88a50ab104d55f1b652cff93bc2de37b151aefb3 Mon Sep 17 00:00:00 2001 From: Dominik Riebeling Date: Sun, 26 Dec 2021 21:48:19 +0100 Subject: 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 --- utils/cmake/deploy.cmake | 2 +- 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") 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 ] -- cgit v1.2.3