OpenLP

Merge lp:~raoul-snyman/openlp/fix-macos-builder into lp:openlp/packaging

  1. fix-macos-builder
  2. Merge into packaging
Proposed by Raoul Snyman
Status: Merged
Merged at revision: 43
Proposed branch: lp:~raoul-snyman/openlp/fix-macos-builder
Merge into: lp:openlp/packaging
Diff against target: 16 lines (+1/-2)
1 file modified
builders/macosx-builder.py (+1/-2)
To merge this branch: bzr merge lp:~raoul-snyman/openlp/fix-macos-builder
Reviewer Review Type Date Requested Status
Tomas Groth Approve
Review via email: mp+364215@code.launchpad.net

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. Used the `setup_extra()` hook so that it runs after all the other setup.

To post a comment you must log in.
Revision history for this message
Tomas Groth (tomasgroth) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'builders/macosx-builder.py'
2--- builders/macosx-builder.py 2018-10-27 17:35:03 +0000
3+++ builders/macosx-builder.py 2019-03-10 16:41:21 +0000
4@@ -359,11 +359,10 @@
5 qt_library_path = QCoreApplication.libraryPaths()[0]
6 return os.path.join(os.path.dirname(qt_library_path), 'translations')
7
8- def setup_paths(self):
9+ def setup_extra(self):
10 """
11 Extra setup to run
12 """
13- super().setup_paths()
14 if hasattr(self, 'mutool_exe'):
15 self.mutool_lib = os.path.abspath(
16 os.path.join(os.path.dirname(self.mutool_exe), '..', 'lib', 'libjbig2dec.0.dylib'))

Subscribers

People subscribed via source and target branches