OpenLP

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

  1. packaging-macos-pyro
  2. Merge into packaging
Proposed by Raoul Snyman
Status: Merged
Approved by: Raoul Snyman
Approved revision: 35
Merged at revision: 46
Proposed branch: lp:~raoul-snyman/openlp/packaging-macos-pyro
Merge into: lp:openlp/packaging
Diff against target: 828 lines (+377/-254)
17 files modified
builders/builder.py (+21/-18)
builders/macosx-builder.py (+33/-18)
builders/windows-builder.py (+18/-18)
osx/settings.py (+26/-3)
pyinstaller-hooks/hook-mysql.connector.py (+19/-19)
pyinstaller-hooks/hook-openlp.core.ui.media.py (+19/-19)
pyinstaller-hooks/hook-openlp.plugins.presentations.lib.maclocontroller.py (+23/-0)
pyinstaller-hooks/hook-openlp.plugins.presentations.presentationplugin.py (+20/-19)
pyinstaller-hooks/hook-openlp.py (+32/-30)
pyinstaller-hooks/hook-sqlalchemy.py (+19/-19)
pyinstaller-hooks/hook-ssl.py (+21/-0)
pyinstaller-hooks/rthook_ssl.py (+21/-0)
scripts/deb_version.py (+20/-18)
scripts/fix_bzr.py (+21/-18)
scripts/openlp_tweeter.py (+21/-18)
scripts/openlp_version.py (+23/-19)
scripts/openlptweet.py (+20/-18)
To merge this branch: bzr merge lp:~raoul-snyman/openlp/packaging-macos-pyro
Reviewer Review Type Date Requested Status
Tomas Groth Approve
Phill Approve
Review via email: mp+368364@code.launchpad.net

This proposal supersedes a proposal from 2019-05-25.

Commit message

Add Pyro4 into the Mac build, update some license headers, and add a hidden import for sqlalchemy.ext.baked

Description of the change

Add Pyro4 into the Mac build, update some license headers, and add a hidden import for sqlalchemy.ext.baked

To post a comment you must log in.
Revision history for this message
Tomas Groth (tomasgroth) wrote : Posted in a previous version of this proposal

Nothing majer

review: Needs Fixing
Revision history for this message
Raoul Snyman (raoul-snyman) : Posted in a previous version of this proposal
Revision history for this message
Tomas Groth (tomasgroth) wrote : Posted in a previous version of this proposal

License version...

review: Needs Fixing
Revision history for this message
Phill (phill-ridout) wrote :

Looks ok to me, but I cant test it!!!

review: Approve
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/builder.py'
2--- builders/builder.py 2019-04-09 04:18:23 +0000
3+++ builders/builder.py 2019-06-05 06:14:49 +0000
4@@ -1,24 +1,24 @@
5 # -*- coding: utf-8 -*-
6 # vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4
7
8-###############################################################################
9-# OpenLP - Open Source Lyrics Projection #
10-# --------------------------------------------------------------------------- #
11-# Copyright (c) 2004-2016 OpenLP Developers #
12-# --------------------------------------------------------------------------- #
13-# This program is free software; you can redistribute it and/or modify it #
14-# under the terms of the GNU General Public License as published by the Free #
15-# Software Foundation; version 2 of the License. #
16-# #
17-# This program is distributed in the hope that it will be useful, but WITHOUT #
18-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or #
19-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for #
20-# more details. #
21-# #
22-# You should have received a copy of the GNU General Public License along #
23-# with this program; if not, write to the Free Software Foundation, Inc., 59 #
24-# Temple Place, Suite 330, Boston, MA 02111-1307 USA #
25-###############################################################################
26+##########################################################################
27+# OpenLP - Open Source Lyrics Projection #
28+# ---------------------------------------------------------------------- #
29+# Copyright (c) 2008-2019 OpenLP Developers #
30+# ---------------------------------------------------------------------- #
31+# This program is free software: you can redistribute it and/or modify #
32+# it under the terms of the GNU General Public License as published by #
33+# the Free Software Foundation, either version 3 of the License, or #
34+# (at your option) any later version. #
35+# #
36+# This program is distributed in the hope that it will be useful, #
37+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
38+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
39+# GNU General Public License for more details. #
40+# #
41+# You should have received a copy of the GNU General Public License #
42+# along with this program. If not, see <https://www.gnu.org/licenses/>. #
43+##########################################################################
44 """
45 Base class for the Windows and macOS builders.
46 """
47@@ -251,6 +251,9 @@
48 """
49 self._print('Reverting any changes to the code...')
50 self._bzr('revert', self.branch_path, err_msg='Error reverting the code')
51+ self._print('Cleaning any extra files...')
52+ self._bzr('clean-tree', self.branch_path, ['--quiet', '--force', '--ignored', '--unknown'],
53+ err_msg='Error cleaning up extra files')
54 self._print('Updating the code...')
55 self._bzr('update', self.branch_path, err_msg='Error updating the code')
56
57
58=== modified file 'builders/macosx-builder.py'
59--- builders/macosx-builder.py 2019-03-10 16:33:37 +0000
60+++ builders/macosx-builder.py 2019-06-05 06:14:49 +0000
61@@ -1,24 +1,24 @@
62 # -*- coding: utf-8 -*-
63 # vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4
64
65-###############################################################################
66-# OpenLP - Open Source Lyrics Projection #
67-# --------------------------------------------------------------------------- #
68-# Copyright (c) 2004-2016 OpenLP Developers #
69-# --------------------------------------------------------------------------- #
70-# This program is free software; you can redistribute it and/or modify it #
71-# under the terms of the GNU General Public License as published by the Free #
72-# Software Foundation; version 2 of the License. #
73-# #
74-# This program is distributed in the hope that it will be useful, but WITHOUT #
75-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or #
76-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for #
77-# more details. #
78-# #
79-# You should have received a copy of the GNU General Public License along #
80-# with this program; if not, write to the Free Software Foundation, Inc., 59 #
81-# Temple Place, Suite 330, Boston, MA 02111-1307 USA #
82-###############################################################################
83+##########################################################################
84+# OpenLP - Open Source Lyrics Projection #
85+# ---------------------------------------------------------------------- #
86+# Copyright (c) 2008-2019 OpenLP Developers #
87+# ---------------------------------------------------------------------- #
88+# This program is free software: you can redistribute it and/or modify #
89+# it under the terms of the GNU General Public License as published by #
90+# the Free Software Foundation, either version 3 of the License, or #
91+# (at your option) any later version. #
92+# #
93+# This program is distributed in the hope that it will be useful, #
94+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
95+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
96+# GNU General Public License for more details. #
97+# #
98+# You should have received a copy of the GNU General Public License #
99+# along with this program. If not, see <https://www.gnu.org/licenses/>. #
100+##########################################################################
101
102 """
103 Mac OS X Build Script
104@@ -93,6 +93,7 @@
105
106 """
107
108+import glob
109 import os
110 from pathlib import Path
111 from shutil import copy, copytree, move, rmtree
112@@ -270,6 +271,20 @@
113 """
114 self._relink_mupdf('mutool')
115
116+ def _install_pyro4(self):
117+ """
118+ Install Pyro4 into the vendor directory
119+ """
120+ self._print('Installing Pyro4 for LibreOffice')
121+ target = os.path.join(self.dist_path, 'plugins', 'presentations', 'lib', 'vendor')
122+ self._run_command([self.python, '-m', 'pip', 'install', 'Pyro4', '-t', target, '--disable-pip-version-check',
123+ '--no-compile'], err_msg='Error installing Pyro4')
124+ egg_info_glob = glob(os.path.join(target, '*.egg-info'))
125+ egg_info_glob.extend(glob(os.path.join(target, '*.dist-info')))
126+ self._print_verbose('... glob: {}'.format(egg_info_glob))
127+ for path in egg_info_glob:
128+ rmtree(path, True)
129+
130 def _copy_bundle_files(self):
131 """
132 Copy Info.plist and OpenLP.icns to app bundle.
133
134=== modified file 'builders/windows-builder.py'
135--- builders/windows-builder.py 2019-05-20 22:17:13 +0000
136+++ builders/windows-builder.py 2019-06-05 06:14:49 +0000
137@@ -1,24 +1,24 @@
138 # -*- coding: utf-8 -*-
139 # vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4
140
141-###############################################################################
142-# OpenLP - Open Source Lyrics Projection #
143-# --------------------------------------------------------------------------- #
144-# Copyright (c) OpenLP Developers #
145-# --------------------------------------------------------------------------- #
146-# This program is free software; you can redistribute it and/or modify it #
147-# under the terms of the GNU General Public License as published by the Free #
148-# Software Foundation; version 2 of the License. #
149-# #
150-# This program is distributed in the hope that it will be useful, but WITHOUT #
151-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or #
152-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for #
153-# more details. #
154-# #
155-# You should have received a copy of the GNU General Public License along #
156-# with this program; if not, write to the Free Software Foundation, Inc., 59 #
157-# Temple Place, Suite 330, Boston, MA 02111-1307 USA #
158-###############################################################################
159+##########################################################################
160+# OpenLP - Open Source Lyrics Projection #
161+# ---------------------------------------------------------------------- #
162+# Copyright (c) 2008-2019 OpenLP Developers #
163+# ---------------------------------------------------------------------- #
164+# This program is free software: you can redistribute it and/or modify #
165+# it under the terms of the GNU General Public License as published by #
166+# the Free Software Foundation, either version 3 of the License, or #
167+# (at your option) any later version. #
168+# #
169+# This program is distributed in the hope that it will be useful, #
170+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
171+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
172+# GNU General Public License for more details. #
173+# #
174+# You should have received a copy of the GNU General Public License #
175+# along with this program. If not, see <https://www.gnu.org/licenses/>. #
176+##########################################################################
177 """
178 Windows Build Script
179 --------------------
180
181=== modified file 'osx/settings.py'
182--- osx/settings.py 2017-06-01 05:09:38 +0000
183+++ osx/settings.py 2019-06-05 06:14:49 +0000
184@@ -1,8 +1,31 @@
185+# -*- coding: utf-8 -*-
186+# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4
187+
188+##########################################################################
189+# OpenLP - Open Source Lyrics Projection #
190+# ---------------------------------------------------------------------- #
191+# Copyright (c) 2008-2019 OpenLP Developers #
192+# ---------------------------------------------------------------------- #
193+# This program is free software: you can redistribute it and/or modify #
194+# it under the terms of the GNU General Public License as published by #
195+# the Free Software Foundation, either version 3 of the License, or #
196+# (at your option) any later version. #
197+# #
198+# This program is distributed in the hope that it will be useful, #
199+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
200+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
201+# GNU General Public License for more details. #
202+# #
203+# You should have received a copy of the GNU General Public License #
204+# along with this program. If not, see <https://www.gnu.org/licenses/>. #
205+##########################################################################
206+"""
207+This is the settings file for building the DMG. Run dmgbuild like so::
208+
209+ $ dmgbuild -s dmg-settings.py -D size=<size>,app=<path/to/OpenLP.app> "OpenLP" OpenLP-{version}.dmg
210+"""
211 import os
212
213-# This is the settings file for building the DMG. Run dmgbuild like so:
214-# $ dmgbuild -s dmg-settings.py -D size=<size>,app=<path/to/OpenLP.app> "OpenLP" OpenLP-{version}.dmg
215-
216 HERE = os.getcwd()
217
218 format = 'UDBZ'
219
220=== modified file 'pyinstaller-hooks/hook-mysql.connector.py'
221--- pyinstaller-hooks/hook-mysql.connector.py 2015-06-28 09:51:28 +0000
222+++ pyinstaller-hooks/hook-mysql.connector.py 2019-06-05 06:14:49 +0000
223@@ -1,23 +1,23 @@
224 # -*- coding: utf-8 -*-
225-# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4
226+# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4
227
228-###############################################################################
229-# OpenLP - Open Source Lyrics Projection #
230-# --------------------------------------------------------------------------- #
231-# Copyright (c) 2008-2015 OpenLP Developers #
232-# --------------------------------------------------------------------------- #
233-# This program is free software; you can redistribute it and/or modify it #
234-# under the terms of the GNU General Public License as published by the Free #
235-# Software Foundation; version 2 of the License. #
236-# #
237-# This program is distributed in the hope that it will be useful, but WITHOUT #
238-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or #
239-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for #
240-# more details. #
241-# #
242-# You should have received a copy of the GNU General Public License along #
243-# with this program; if not, write to the Free Software Foundation, Inc., 59 #
244-# Temple Place, Suite 330, Boston, MA 02111-1307 USA #
245-###############################################################################
246+##########################################################################
247+# OpenLP - Open Source Lyrics Projection #
248+# ---------------------------------------------------------------------- #
249+# Copyright (c) 2008-2019 OpenLP Developers #
250+# ---------------------------------------------------------------------- #
251+# This program is free software: you can redistribute it and/or modify #
252+# it under the terms of the GNU General Public License as published by #
253+# the Free Software Foundation, either version 3 of the License, or #
254+# (at your option) any later version. #
255+# #
256+# This program is distributed in the hope that it will be useful, #
257+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
258+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
259+# GNU General Public License for more details. #
260+# #
261+# You should have received a copy of the GNU General Public License #
262+# along with this program. If not, see <https://www.gnu.org/licenses/>. #
263+##########################################################################
264
265 hiddenimports = ['mysql.connector']
266
267=== modified file 'pyinstaller-hooks/hook-openlp.core.ui.media.py'
268--- pyinstaller-hooks/hook-openlp.core.ui.media.py 2015-12-23 17:14:43 +0000
269+++ pyinstaller-hooks/hook-openlp.core.ui.media.py 2019-06-05 06:14:49 +0000
270@@ -1,24 +1,24 @@
271 # -*- coding: utf-8 -*-
272-# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4
273+# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4
274
275-###############################################################################
276-# OpenLP - Open Source Lyrics Projection #
277-# --------------------------------------------------------------------------- #
278-# Copyright (c) 2008-2015 OpenLP Developers #
279-# --------------------------------------------------------------------------- #
280-# This program is free software; you can redistribute it and/or modify it #
281-# under the terms of the GNU General Public License as published by the Free #
282-# Software Foundation; version 2 of the License. #
283-# #
284-# This program is distributed in the hope that it will be useful, but WITHOUT #
285-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or #
286-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for #
287-# more details. #
288-# #
289-# You should have received a copy of the GNU General Public License along #
290-# with this program; if not, write to the Free Software Foundation, Inc., 59 #
291-# Temple Place, Suite 330, Boston, MA 02111-1307 USA #
292-###############################################################################
293+##########################################################################
294+# OpenLP - Open Source Lyrics Projection #
295+# ---------------------------------------------------------------------- #
296+# Copyright (c) 2008-2019 OpenLP Developers #
297+# ---------------------------------------------------------------------- #
298+# This program is free software: you can redistribute it and/or modify #
299+# it under the terms of the GNU General Public License as published by #
300+# the Free Software Foundation, either version 3 of the License, or #
301+# (at your option) any later version. #
302+# #
303+# This program is distributed in the hope that it will be useful, #
304+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
305+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
306+# GNU General Public License for more details. #
307+# #
308+# You should have received a copy of the GNU General Public License #
309+# along with this program. If not, see <https://www.gnu.org/licenses/>. #
310+##########################################################################
311
312 hiddenimports = ['openlp.core.ui.media.systemplayer',
313 'openlp.core.ui.media.vlcplayer',
314
315=== added file 'pyinstaller-hooks/hook-openlp.plugins.presentations.lib.maclocontroller.py'
316--- pyinstaller-hooks/hook-openlp.plugins.presentations.lib.maclocontroller.py 1970-01-01 00:00:00 +0000
317+++ pyinstaller-hooks/hook-openlp.plugins.presentations.lib.maclocontroller.py 2019-06-05 06:14:49 +0000
318@@ -0,0 +1,23 @@
319+# -*- coding: utf-8 -*-
320+# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4
321+
322+###############################################################################
323+# OpenLP - Open Source Lyrics Projection #
324+# --------------------------------------------------------------------------- #
325+# Copyright (c) 2008-2019 OpenLP Developers #
326+# --------------------------------------------------------------------------- #
327+# This program is free software; you can redistribute it and/or modify it #
328+# under the terms of the GNU General Public License as published by the Free #
329+# Software Foundation; version 2 of the License. #
330+# #
331+# This program is distributed in the hope that it will be useful, but WITHOUT #
332+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or #
333+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for #
334+# more details. #
335+# #
336+# You should have received a copy of the GNU General Public License along #
337+# with this program; if not, write to the Free Software Foundation, Inc., 59 #
338+# Temple Place, Suite 330, Boston, MA 02111-1307 USA #
339+###############################################################################
340+
341+hiddenimports = ['Pyro4']
342
343=== modified file 'pyinstaller-hooks/hook-openlp.plugins.presentations.presentationplugin.py'
344--- pyinstaller-hooks/hook-openlp.plugins.presentations.presentationplugin.py 2015-06-16 20:07:34 +0000
345+++ pyinstaller-hooks/hook-openlp.plugins.presentations.presentationplugin.py 2019-06-05 06:14:49 +0000
346@@ -1,26 +1,27 @@
347 # -*- coding: utf-8 -*-
348-# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4
349+# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4
350
351-###############################################################################
352-# OpenLP - Open Source Lyrics Projection #
353-# --------------------------------------------------------------------------- #
354-# Copyright (c) 2008-2015 OpenLP Developers #
355-# --------------------------------------------------------------------------- #
356-# This program is free software; you can redistribute it and/or modify it #
357-# under the terms of the GNU General Public License as published by the Free #
358-# Software Foundation; version 2 of the License. #
359-# #
360-# This program is distributed in the hope that it will be useful, but WITHOUT #
361-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or #
362-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for #
363-# more details. #
364-# #
365-# You should have received a copy of the GNU General Public License along #
366-# with this program; if not, write to the Free Software Foundation, Inc., 59 #
367-# Temple Place, Suite 330, Boston, MA 02111-1307 USA #
368-###############################################################################
369+##########################################################################
370+# OpenLP - Open Source Lyrics Projection #
371+# ---------------------------------------------------------------------- #
372+# Copyright (c) 2008-2019 OpenLP Developers #
373+# ---------------------------------------------------------------------- #
374+# This program is free software: you can redistribute it and/or modify #
375+# it under the terms of the GNU General Public License as published by #
376+# the Free Software Foundation, either version 3 of the License, or #
377+# (at your option) any later version. #
378+# #
379+# This program is distributed in the hope that it will be useful, #
380+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
381+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
382+# GNU General Public License for more details. #
383+# #
384+# You should have received a copy of the GNU General Public License #
385+# along with this program. If not, see <https://www.gnu.org/licenses/>. #
386+##########################################################################
387
388 hiddenimports = ['openlp.plugins.presentations.lib.impresscontroller',
389+ 'openlp.plugins.presentations.lib.maclocontroller',
390 'openlp.plugins.presentations.lib.pdfcontroller',
391 'openlp.plugins.presentations.lib.powerpointcontroller',
392 'openlp.plugins.presentations.lib.pptviewcontroller']
393
394=== modified file 'pyinstaller-hooks/hook-openlp.py'
395--- pyinstaller-hooks/hook-openlp.py 2015-06-16 20:07:34 +0000
396+++ pyinstaller-hooks/hook-openlp.py 2019-06-05 06:14:49 +0000
397@@ -1,31 +1,33 @@
398 # -*- coding: utf-8 -*-
399-# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4
400-
401-###############################################################################
402-# OpenLP - Open Source Lyrics Projection #
403-# --------------------------------------------------------------------------- #
404-# Copyright (c) 2008-2015 OpenLP Developers #
405-# --------------------------------------------------------------------------- #
406-# This program is free software; you can redistribute it and/or modify it #
407-# under the terms of the GNU General Public License as published by the Free #
408-# Software Foundation; version 2 of the License. #
409-# #
410-# This program is distributed in the hope that it will be useful, but WITHOUT #
411-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or #
412-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for #
413-# more details. #
414-# #
415-# You should have received a copy of the GNU General Public License along #
416-# with this program; if not, write to the Free Software Foundation, Inc., 59 #
417-# Temple Place, Suite 330, Boston, MA 02111-1307 USA #
418-###############################################################################
419-
420-hiddenimports = ['openlp.plugins.songs.songsplugin',
421- 'openlp.plugins.bibles.bibleplugin',
422- 'openlp.plugins.presentations.presentationplugin',
423- 'openlp.plugins.media.mediaplugin',
424- 'openlp.plugins.images.imageplugin',
425- 'openlp.plugins.custom.customplugin',
426- 'openlp.plugins.songusage.songusageplugin',
427- 'openlp.plugins.remotes.remoteplugin',
428- 'openlp.plugins.alerts.alertsplugin']
429+# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4
430+
431+##########################################################################
432+# OpenLP - Open Source Lyrics Projection #
433+# ---------------------------------------------------------------------- #
434+# Copyright (c) 2008-2019 OpenLP Developers #
435+# ---------------------------------------------------------------------- #
436+# This program is free software: you can redistribute it and/or modify #
437+# it under the terms of the GNU General Public License as published by #
438+# the Free Software Foundation, either version 3 of the License, or #
439+# (at your option) any later version. #
440+# #
441+# This program is distributed in the hope that it will be useful, #
442+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
443+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
444+# GNU General Public License for more details. #
445+# #
446+# You should have received a copy of the GNU General Public License #
447+# along with this program. If not, see <https://www.gnu.org/licenses/>. #
448+##########################################################################
449+
450+hiddenimports = [
451+ 'openlp.plugins.songs.songsplugin',
452+ 'openlp.plugins.bibles.bibleplugin',
453+ 'openlp.plugins.presentations.presentationplugin',
454+ 'openlp.plugins.media.mediaplugin',
455+ 'openlp.plugins.images.imageplugin',
456+ 'openlp.plugins.custom.customplugin',
457+ 'openlp.plugins.songusage.songusageplugin',
458+ 'openlp.plugins.remotes.remoteplugin',
459+ 'openlp.plugins.alerts.alertsplugin'
460+]
461
462=== renamed file 'pyinstaller-hooks/hook-sqlalchemy.ext.baked.py' => 'pyinstaller-hooks/hook-sqlalchemy.py'
463--- pyinstaller-hooks/hook-sqlalchemy.ext.baked.py 2019-04-12 18:50:36 +0000
464+++ pyinstaller-hooks/hook-sqlalchemy.py 2019-06-05 06:14:49 +0000
465@@ -1,23 +1,23 @@
466 # -*- coding: utf-8 -*-
467-# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4
468+# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4
469
470-###############################################################################
471-# OpenLP - Open Source Lyrics Projection #
472-# --------------------------------------------------------------------------- #
473-# Copyright (c) 2008-2015 OpenLP Developers #
474-# --------------------------------------------------------------------------- #
475-# This program is free software; you can redistribute it and/or modify it #
476-# under the terms of the GNU General Public License as published by the Free #
477-# Software Foundation; version 2 of the License. #
478-# #
479-# This program is distributed in the hope that it will be useful, but WITHOUT #
480-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or #
481-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for #
482-# more details. #
483-# #
484-# You should have received a copy of the GNU General Public License along #
485-# with this program; if not, write to the Free Software Foundation, Inc., 59 #
486-# Temple Place, Suite 330, Boston, MA 02111-1307 USA #
487-###############################################################################
488+##########################################################################
489+# OpenLP - Open Source Lyrics Projection #
490+# ---------------------------------------------------------------------- #
491+# Copyright (c) 2008-2019 OpenLP Developers #
492+# ---------------------------------------------------------------------- #
493+# This program is free software: you can redistribute it and/or modify #
494+# it under the terms of the GNU General Public License as published by #
495+# the Free Software Foundation, either version 3 of the License, or #
496+# (at your option) any later version. #
497+# #
498+# This program is distributed in the hope that it will be useful, #
499+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
500+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
501+# GNU General Public License for more details. #
502+# #
503+# You should have received a copy of the GNU General Public License #
504+# along with this program. If not, see <https://www.gnu.org/licenses/>. #
505+##########################################################################
506
507 hiddenimports = ['sqlalchemy.ext.baked']
508
509=== modified file 'pyinstaller-hooks/hook-ssl.py'
510--- pyinstaller-hooks/hook-ssl.py 2015-09-28 17:33:21 +0000
511+++ pyinstaller-hooks/hook-ssl.py 2019-06-05 06:14:49 +0000
512@@ -1,3 +1,24 @@
513+# -*- coding: utf-8 -*-
514+# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4
515+
516+##########################################################################
517+# OpenLP - Open Source Lyrics Projection #
518+# ---------------------------------------------------------------------- #
519+# Copyright (c) 2008-2019 OpenLP Developers #
520+# ---------------------------------------------------------------------- #
521+# This program is free software: you can redistribute it and/or modify #
522+# it under the terms of the GNU General Public License as published by #
523+# the Free Software Foundation, either version 3 of the License, or #
524+# (at your option) any later version. #
525+# #
526+# This program is distributed in the hope that it will be useful, #
527+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
528+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
529+# GNU General Public License for more details. #
530+# #
531+# You should have received a copy of the GNU General Public License #
532+# along with this program. If not, see <https://www.gnu.org/licenses/>. #
533+##########################################################################
534 from PyInstaller.compat import is_darwin
535 from PyInstaller.utils.hooks import exec_statement
536
537
538=== modified file 'pyinstaller-hooks/rthook_ssl.py'
539--- pyinstaller-hooks/rthook_ssl.py 2015-08-24 00:53:43 +0000
540+++ pyinstaller-hooks/rthook_ssl.py 2019-06-05 06:14:49 +0000
541@@ -1,3 +1,24 @@
542+# -*- coding: utf-8 -*-
543+# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4
544+
545+##########################################################################
546+# OpenLP - Open Source Lyrics Projection #
547+# ---------------------------------------------------------------------- #
548+# Copyright (c) 2008-2019 OpenLP Developers #
549+# ---------------------------------------------------------------------- #
550+# This program is free software: you can redistribute it and/or modify #
551+# it under the terms of the GNU General Public License as published by #
552+# the Free Software Foundation, either version 3 of the License, or #
553+# (at your option) any later version. #
554+# #
555+# This program is distributed in the hope that it will be useful, #
556+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
557+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
558+# GNU General Public License for more details. #
559+# #
560+# You should have received a copy of the GNU General Public License #
561+# along with this program. If not, see <https://www.gnu.org/licenses/>. #
562+##########################################################################
563 import os
564 import sys
565
566
567=== modified file 'scripts/deb_version.py'
568--- scripts/deb_version.py 2015-06-16 20:07:34 +0000
569+++ scripts/deb_version.py 2019-06-05 06:14:49 +0000
570@@ -1,23 +1,25 @@
571 #!/usr/bin/env python
572 # -*- coding: utf-8 -*-
573-###############################################################################
574-# OpenLP - Open Source Lyrics Projection #
575-# --------------------------------------------------------------------------- #
576-# Copyright (c) 2008-2015 OpenLP Developers #
577-# --------------------------------------------------------------------------- #
578-# This program is free software; you can redistribute it and/or modify it #
579-# under the terms of the GNU General Public License as published by the Free #
580-# Software Foundation; version 2 of the License. #
581-# #
582-# This program is distributed in the hope that it will be useful, but WITHOUT #
583-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or #
584-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for #
585-# more details. #
586-# #
587-# You should have received a copy of the GNU General Public License along #
588-# with this program; if not, write to the Free Software Foundation, Inc., 59 #
589-# Temple Place, Suite 330, Boston, MA 02111-1307 USA #
590-###############################################################################
591+# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4
592+
593+##########################################################################
594+# OpenLP - Open Source Lyrics Projection #
595+# ---------------------------------------------------------------------- #
596+# Copyright (c) 2008-2019 OpenLP Developers #
597+# ---------------------------------------------------------------------- #
598+# This program is free software: you can redistribute it and/or modify #
599+# it under the terms of the GNU General Public License as published by #
600+# the Free Software Foundation, either version 3 of the License, or #
601+# (at your option) any later version. #
602+# #
603+# This program is distributed in the hope that it will be useful, #
604+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
605+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
606+# GNU General Public License for more details. #
607+# #
608+# You should have received a copy of the GNU General Public License #
609+# along with this program. If not, see <https://www.gnu.org/licenses/>. #
610+##########################################################################
611
612 from bzrlib.branch import Branch
613 from natsort import nsorted
614
615=== modified file 'scripts/fix_bzr.py'
616--- scripts/fix_bzr.py 2015-06-16 20:07:34 +0000
617+++ scripts/fix_bzr.py 2019-06-05 06:14:49 +0000
618@@ -1,22 +1,25 @@
619 #!/usr/bin/python
620-###############################################################################
621-# OpenLP - Open Source Lyrics Projection #
622-# --------------------------------------------------------------------------- #
623-# Copyright (c) 2008-2015 OpenLP Developers #
624-# --------------------------------------------------------------------------- #
625-# This program is free software; you can redistribute it and/or modify it #
626-# under the terms of the GNU General Public License as published by the Free #
627-# Software Foundation; version 2 of the License. #
628-# #
629-# This program is distributed in the hope that it will be useful, but WITHOUT #
630-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or #
631-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for #
632-# more details. #
633-# #
634-# You should have received a copy of the GNU General Public License along #
635-# with this program; if not, write to the Free Software Foundation, Inc., 59 #
636-# Temple Place, Suite 330, Boston, MA 02111-1307 USA #
637-###############################################################################
638+# -*- coding: utf-8 -*-
639+# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4
640+
641+##########################################################################
642+# OpenLP - Open Source Lyrics Projection #
643+# ---------------------------------------------------------------------- #
644+# Copyright (c) 2008-2019 OpenLP Developers #
645+# ---------------------------------------------------------------------- #
646+# This program is free software: you can redistribute it and/or modify #
647+# it under the terms of the GNU General Public License as published by #
648+# the Free Software Foundation, either version 3 of the License, or #
649+# (at your option) any later version. #
650+# #
651+# This program is distributed in the hope that it will be useful, #
652+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
653+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
654+# GNU General Public License for more details. #
655+# #
656+# You should have received a copy of the GNU General Public License #
657+# along with this program. If not, see <https://www.gnu.org/licenses/>. #
658+##########################################################################
659
660 import sys
661
662
663=== modified file 'scripts/openlp_tweeter.py'
664--- scripts/openlp_tweeter.py 2015-06-16 20:07:34 +0000
665+++ scripts/openlp_tweeter.py 2019-06-05 06:14:49 +0000
666@@ -1,22 +1,25 @@
667 #!/home/openlp/VirtualEnv/stats/bin/python
668-###############################################################################
669-# OpenLP - Open Source Lyrics Projection #
670-# --------------------------------------------------------------------------- #
671-# Copyright (c) 2008-2015 OpenLP Developers #
672-# --------------------------------------------------------------------------- #
673-# This program is free software; you can redistribute it and/or modify it #
674-# under the terms of the GNU General Public License as published by the Free #
675-# Software Foundation; version 2 of the License. #
676-# #
677-# This program is distributed in the hope that it will be useful, but WITHOUT #
678-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or #
679-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for #
680-# more details. #
681-# #
682-# You should have received a copy of the GNU General Public License along #
683-# with this program; if not, write to the Free Software Foundation, Inc., 59 #
684-# Temple Place, Suite 330, Boston, MA 02111-1307 USA #
685-###############################################################################
686+# -*- coding: utf-8 -*-
687+# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4
688+
689+##########################################################################
690+# OpenLP - Open Source Lyrics Projection #
691+# ---------------------------------------------------------------------- #
692+# Copyright (c) 2008-2019 OpenLP Developers #
693+# ---------------------------------------------------------------------- #
694+# This program is free software: you can redistribute it and/or modify #
695+# it under the terms of the GNU General Public License as published by #
696+# the Free Software Foundation, either version 3 of the License, or #
697+# (at your option) any later version. #
698+# #
699+# This program is distributed in the hope that it will be useful, #
700+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
701+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
702+# GNU General Public License for more details. #
703+# #
704+# You should have received a copy of the GNU General Public License #
705+# along with this program. If not, see <https://www.gnu.org/licenses/>. #
706+##########################################################################
707
708 import sys
709 import tweepy
710
711=== modified file 'scripts/openlp_version.py'
712--- scripts/openlp_version.py 2015-06-16 20:07:34 +0000
713+++ scripts/openlp_version.py 2019-06-05 06:14:49 +0000
714@@ -1,23 +1,25 @@
715 #!/usr/bin/env python
716 # -*- coding: utf-8 -*-
717-###############################################################################
718-# OpenLP - Open Source Lyrics Projection #
719-# --------------------------------------------------------------------------- #
720-# Copyright (c) 2008-2015 OpenLP Developers #
721-# --------------------------------------------------------------------------- #
722-# This program is free software; you can redistribute it and/or modify it #
723-# under the terms of the GNU General Public License as published by the Free #
724-# Software Foundation; version 2 of the License. #
725-# #
726-# This program is distributed in the hope that it will be useful, but WITHOUT #
727-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or #
728-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for #
729-# more details. #
730-# #
731-# You should have received a copy of the GNU General Public License along #
732-# with this program; if not, write to the Free Software Foundation, Inc., 59 #
733-# Temple Place, Suite 330, Boston, MA 02111-1307 USA #
734-###############################################################################
735+# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4
736+
737+##########################################################################
738+# OpenLP - Open Source Lyrics Projection #
739+# ---------------------------------------------------------------------- #
740+# Copyright (c) 2008-2019 OpenLP Developers #
741+# ---------------------------------------------------------------------- #
742+# This program is free software: you can redistribute it and/or modify #
743+# it under the terms of the GNU General Public License as published by #
744+# the Free Software Foundation, either version 3 of the License, or #
745+# (at your option) any later version. #
746+# #
747+# This program is distributed in the hope that it will be useful, #
748+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
749+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
750+# GNU General Public License for more details. #
751+# #
752+# You should have received a copy of the GNU General Public License #
753+# along with this program. If not, see <https://www.gnu.org/licenses/>. #
754+##########################################################################
755
756 import sys
757 import os
758@@ -25,6 +27,7 @@
759 from bzrlib.branch import Branch
760 from natsort import natsorted
761
762+
763 def get_version(path):
764 b = Branch.open_containing(path)[0]
765 b.lock_read()
766@@ -45,13 +48,14 @@
767 b.unlock()
768 return result
769
770+
771 def get_path():
772 if len(sys.argv) > 1:
773 return os.path.abspath(sys.argv[1])
774 else:
775 return os.path.abspath('.')
776
777+
778 if __name__ == u'__main__':
779 path = get_path()
780 print get_version(path)
781-
782
783=== modified file 'scripts/openlptweet.py'
784--- scripts/openlptweet.py 2015-06-16 20:07:34 +0000
785+++ scripts/openlptweet.py 2019-06-05 06:14:49 +0000
786@@ -1,23 +1,25 @@
787 #!/usr/bin/env python2
788 # -*- coding: utf-8 -*-
789-###############################################################################
790-# OpenLP - Open Source Lyrics Projection #
791-# --------------------------------------------------------------------------- #
792-# Copyright (c) 2008-2015 OpenLP Developers #
793-# --------------------------------------------------------------------------- #
794-# This program is free software; you can redistribute it and/or modify it #
795-# under the terms of the GNU General Public License as published by the Free #
796-# Software Foundation; version 2 of the License. #
797-# #
798-# This program is distributed in the hope that it will be useful, but WITHOUT #
799-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or #
800-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for #
801-# more details. #
802-# #
803-# You should have received a copy of the GNU General Public License along #
804-# with this program; if not, write to the Free Software Foundation, Inc., 59 #
805-# Temple Place, Suite 330, Boston, MA 02111-1307 USA #
806-###############################################################################
807+# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4
808+
809+##########################################################################
810+# OpenLP - Open Source Lyrics Projection #
811+# ---------------------------------------------------------------------- #
812+# Copyright (c) 2008-2019 OpenLP Developers #
813+# ---------------------------------------------------------------------- #
814+# This program is free software: you can redistribute it and/or modify #
815+# it under the terms of the GNU General Public License as published by #
816+# the Free Software Foundation, either version 3 of the License, or #
817+# (at your option) any later version. #
818+# #
819+# This program is distributed in the hope that it will be useful, #
820+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
821+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
822+# GNU General Public License for more details. #
823+# #
824+# You should have received a copy of the GNU General Public License #
825+# along with this program. If not, see <https://www.gnu.org/licenses/>. #
826+##########################################################################
827
828 from optparse import OptionParser
829

Subscribers

People subscribed via source and target branches