openlp/packaging
1
0
Fork 0
mirror of https://gitlab.com/openlp/packaging.git synced 2024-12-22 13:02:50 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'update-macos-build' into 'master'

Browse Source 
Some updates to the macOS builder

See merge request openlp/packaging!14
This commit is contained in:
Tomas Groth 2021-09-03 09:09:40 +00:00
commit f08beb7001
2 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
builders/macosx-builder.py
View File

@ -92,7 +92,6 @@ like this:
import glob import glob
import os import os
import distutils
from pathlib import Path from pathlib import Path
from shutil import copy, copytree, move, rmtree from shutil import copy, copytree, move, rmtree
@ -349,12 +348,10 @@ class MacOSXBuilder(Builder):
size += 10 size += 10
os.chdir(os.path.dirname(self.dmg_settings_path)) os.chdir(os.path.dirname(self.dmg_settings_path))
dmgbuild_exe = os.path.join(distutils.sys.exec_prefix, 'bin', 'dmgbuild') argv = ['-s', self.dmg_settings_path, '-D', 'size={size}M'.format(size=size),
argv = [dmgbuild_exe, '-s', self.dmg_settings_path, '-D', 'size={size}M'.format(size=size),
'-D', 'icon={icon_path}'.format(icon_path=self.icon_path), '-D', 'icon={icon_path}'.format(icon_path=self.icon_path),
'-D', 'app={dist_app_path}'.format(dist_app_path=self.dist_app_path), dmg_title, self.dmg_file] '-D', 'app={dist_app_path}'.format(dist_app_path=self.dist_app_path), dmg_title, self.dmg_file]
self._run_path(dmgbuild_exe, argv, 'Error running dmgbuild') self._run_module('dmgbuild', argv, 'Error running dmgbuild')
# Dmg done.
self._print('Finished creating dmg file, resulting file: %s' % self.dmg_file) self._print('Finished creating dmg file, resulting file: %s' % self.dmg_file)
def get_platform(self): def get_platform(self):
@ -416,7 +413,7 @@ class MacOSXBuilder(Builder):
Build the actual DMG Build the actual DMG
""" """
self._fix_qt_paths() self._fix_qt_paths()
self._code_sign() # self._code_sign()
self._create_dmg() self._create_dmg()

26
pyinstaller-hooks/hook-websockets.legacy.py Normal file
View File

@ -0,0 +1,26 @@
# -*- coding: utf-8 -*-
# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4
##########################################################################
# OpenLP - Open Source Lyrics Projection #
# ---------------------------------------------------------------------- #
# Copyright (c) 2008-2019 OpenLP Developers #
# ---------------------------------------------------------------------- #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
# the Free Software Foundation, either version 3 of the License, or #
# (at your option) any later version. #
# #
# This program is distributed in the hope that it will be useful, #
# but WITHOUT ANY WARRANTY; without even the implied warranty of #
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
# GNU General Public License for more details. #
# #
# You should have received a copy of the GNU General Public License #
# along with this program. If not, see <https://www.gnu.org/licenses/>. #
##########################################################################
import websockets.legacy.client
import websockets.legacy.server
hiddenimports = ['websockets.legacy.server', 'websockets.legacy.client']