openlp
/
packaging
mirror of https://gitlab.com/openlp/packaging.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'update-to-pyro5' into 'master' 

Update the builder to bundle Pyro5

See merge request openlp/packaging!21
This commit is contained in:
Tomas Groth 2023-08-26 06:54:55 +00:00
parent 140d073f64 6789a46057
commit d32a48727b
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
builders/macosx-builder.py
View File

@ -261,14 +261,14 @@ class MacOSXBuilder(Builder):
except Exception: except Exception:
pass pass
def _install_pyro4(self): def _install_pyro5(self):
""" """
Install Pyro4 into the vendor directory Install Pyro5 into the vendor directory
""" """
self._print('Installing Pyro4 for LibreOffice') self._print('Installing Pyro5 for LibreOffice')
target = os.path.join(self.dist_path, 'plugins', 'presentations', 'lib', 'vendor') target = os.path.join(self.dist_path, 'plugins', 'presentations', 'lib', 'vendor')
argv = ['pip', 'install', 'Pyro4', '-t', target, '--disable-pip-version-check', '--no-compile'] argv = ['pip', 'install', 'Pyro5', '-t', target, '--disable-pip-version-check', '--no-compile']
self._run_module('pip', argv, 'Error installing pyro4 with pip', run_name='__main__') self._run_module('pip', argv, 'Error installing Pyro5 with pip', run_name='__main__')
egg_info_glob = glob.glob(os.path.join(target, '*.egg-info')) egg_info_glob = glob.glob(os.path.join(target, '*.egg-info'))
egg_info_glob.extend(glob.glob(os.path.join(target, '*.dist-info'))) egg_info_glob.extend(glob.glob(os.path.join(target, '*.dist-info')))
self._print_verbose('... glob: {}'.format(egg_info_glob)) self._print_verbose('... glob: {}'.format(egg_info_glob))
@ -279,6 +279,7 @@ class MacOSXBuilder(Builder):
""" """
Copy the VLC files into the app bundle Copy the VLC files into the app bundle
""" """
self._print('Copying VLC files')
vlc_path = '/Applications/VLC.app/Contents/MacOS/' vlc_path = '/Applications/VLC.app/Contents/MacOS/'
vlc_dest = os.path.join(self.dist_path, 'vlc') vlc_dest = os.path.join(self.dist_path, 'vlc')
if not os.path.exists(vlc_dest): if not os.path.exists(vlc_dest):
@ -394,7 +395,7 @@ class MacOSXBuilder(Builder):
self._copy_vlc_files() self._copy_vlc_files()
self._copy_bundle_files() self._copy_bundle_files()
self._copy_macosx_files() self._copy_macosx_files()
self._install_pyro4() self._install_pyro5()
def after_run_sphinx(self): def after_run_sphinx(self):
""" """