openlp-core team mailing list archive

[Raoul Snyman <raoul@xxxxxxxxxxx>]

Raoul Snyman has proposed merging lp:~raoul-snyman/openlp/packaging-macos-pyro into lp:openlp/packaging.

Commit message:
Add Pyro4 into the Mac build.

Requested reviews:
  Tomas Groth (tomasgroth)

For more details, see:
https://code.launchpad.net/~raoul-snyman/openlp/packaging-macos-pyro/+merge/367927
-- 
Your team OpenLP Core is subscribed to branch lp:openlp/packaging.

=== modified file 'builders/builder.py'
--- builders/builder.py	2019-04-09 04:18:23 +0000
+++ builders/builder.py	2019-05-25 07:27:43 +0000
@@ -251,6 +251,9 @@
         """
         self._print('Reverting any changes to the code...')
         self._bzr('revert', self.branch_path, err_msg='Error reverting the code')
+        self._print('Cleaning any extra files...')
+        self._bzr('clean-tree', self.branch_path, ['--quiet', '--force', '--ignored', '--unknown'],
+                  err_msg='Error cleaning up extra files')
         self._print('Updating the code...')
         self._bzr('update', self.branch_path, err_msg='Error updating the code')
 

=== modified file 'builders/macosx-builder.py'
--- builders/macosx-builder.py	2019-03-10 16:33:37 +0000
+++ builders/macosx-builder.py	2019-05-25 07:27:43 +0000
@@ -93,6 +93,7 @@
 
 """
 
+import glob
 import os
 from pathlib import Path
 from shutil import copy, copytree, move, rmtree
@@ -270,6 +271,20 @@
         """
         self._relink_mupdf('mutool')
 
+    def _install_pyro4(self):
+        """
+        Install Pyro4 into the vendor directory
+        """
+        self._print('Installing Pyro4 for LibreOffice')
+        target = os.path.join(self.dist_path, 'plugins', 'presentations', 'lib', 'vendor')
+        self._run_command([self.python, '-m', 'pip', 'install', 'Pyro4', '-t', target, '--disable-pip-version-check',
+                           '--no-compile'], err_msg='Error installing Pyro4')
+        egg_info_glob = glob(os.path.join(target, '*.egg-info'))
+        egg_info_glob.extend(glob(os.path.join(target, '*.dist-info')))
+        self._print_verbose('... glob: {}'.format(egg_info_glob))
+        for path in egg_info_glob:
+            rmtree(path, True)
+
     def _copy_bundle_files(self):
         """
         Copy Info.plist and OpenLP.icns to app bundle.

=== added file 'pyinstaller-hooks/hook-openlp.plugins.presentations.lib.maclocontroller.py'
--- pyinstaller-hooks/hook-openlp.plugins.presentations.lib.maclocontroller.py	1970-01-01 00:00:00 +0000
+++ pyinstaller-hooks/hook-openlp.plugins.presentations.lib.maclocontroller.py	2019-05-25 07:27:43 +0000
@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+# vim: autoindent shiftwidth=4 expandtab textwidth=80 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; version 2 of the License.                              #
+#                                                                             #
+# 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, write to the Free Software Foundation, Inc., 59  #
+# Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
+###############################################################################
+
+hiddenimports = ['Pyro4']

=== modified file 'pyinstaller-hooks/hook-openlp.plugins.presentations.presentationplugin.py'
--- pyinstaller-hooks/hook-openlp.plugins.presentations.presentationplugin.py	2015-06-16 20:07:34 +0000
+++ pyinstaller-hooks/hook-openlp.plugins.presentations.presentationplugin.py	2019-05-25 07:27:43 +0000
@@ -21,6 +21,7 @@
 ###############################################################################
 
 hiddenimports = ['openlp.plugins.presentations.lib.impresscontroller',
+                 'openlp.plugins.presentations.lib.maclocontroller',
                  'openlp.plugins.presentations.lib.pdfcontroller',
                  'openlp.plugins.presentations.lib.powerpointcontroller',
                  'openlp.plugins.presentations.lib.pptviewcontroller']

=== modified file 'pyinstaller-hooks/hook-openlp.py'
--- pyinstaller-hooks/hook-openlp.py	2015-06-16 20:07:34 +0000
+++ pyinstaller-hooks/hook-openlp.py	2019-05-25 07:27:43 +0000
@@ -20,12 +20,14 @@
 # Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
 ###############################################################################
 
-hiddenimports = ['openlp.plugins.songs.songsplugin',
-                 'openlp.plugins.bibles.bibleplugin',
-                 'openlp.plugins.presentations.presentationplugin',
-                 'openlp.plugins.media.mediaplugin',
-                 'openlp.plugins.images.imageplugin',
-                 'openlp.plugins.custom.customplugin',
-                 'openlp.plugins.songusage.songusageplugin',
-                 'openlp.plugins.remotes.remoteplugin',
-                 'openlp.plugins.alerts.alertsplugin']
+hiddenimports = [
+    'openlp.plugins.songs.songsplugin',
+    'openlp.plugins.bibles.bibleplugin',
+    'openlp.plugins.presentations.presentationplugin',
+    'openlp.plugins.media.mediaplugin',
+    'openlp.plugins.images.imageplugin',
+    'openlp.plugins.custom.customplugin',
+    'openlp.plugins.songusage.songusageplugin',
+    'openlp.plugins.remotes.remoteplugin',
+    'openlp.plugins.alerts.alertsplugin'
+]