openlp-core team mailing list archive

[Raoul Snyman <raoul@xxxxxxxxxxx>]

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

Commit message:
Fix up a problem where the macOS builder expected a variable to be set, but it was being skipped due to a dependent variable not being available yet.

Requested reviews:
  OpenLP Core (openlp-core)

For more details, see:
https://code.launchpad.net/~raoul-snyman/openlp/fix-macos-builder/+merge/364215
-- 
Your team OpenLP Core is requested to review the proposed merge of lp:~raoul-snyman/openlp/fix-macos-builder into lp:openlp/packaging.

=== modified file 'builders/macosx-builder.py'
--- builders/macosx-builder.py	2018-10-27 17:35:03 +0000
+++ builders/macosx-builder.py	2019-03-10 16:41:21 +0000
@@ -359,11 +359,10 @@
         qt_library_path = QCoreApplication.libraryPaths()[0]
         return os.path.join(os.path.dirname(qt_library_path), 'translations')
 
-    def setup_paths(self):
+    def setup_extra(self):
         """
         Extra setup to run
         """
-        super().setup_paths()
         if hasattr(self, 'mutool_exe'):
             self.mutool_lib = os.path.abspath(
                 os.path.join(os.path.dirname(self.mutool_exe), '..', 'lib', 'libjbig2dec.0.dylib'))