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

bzr-revno: 46
This commit is contained in:
Raoul Snyman 2019-06-05 23:37:19 -07:00
commit 2f90f0ea4a
17 changed files with 358 additions and 235 deletions

View File

@ -1,24 +1,24 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4 # vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4
############################################################################### ##########################################################################
# OpenLP - Open Source Lyrics Projection # # OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- # # ---------------------------------------------------------------------- #
# Copyright (c) 2004-2016 OpenLP Developers # # Copyright (c) 2008-2019 OpenLP Developers #
# --------------------------------------------------------------------------- # # ---------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it # # This program is free software: you can redistribute it and/or modify #
# under the terms of the GNU General Public License as published by the Free # # it under the terms of the GNU General Public License as published by #
# Software Foundation; version 2 of the License. # # the Free Software Foundation, either version 3 of the License, or #
# # # (at your option) any later version. #
# This program is distributed in the hope that it will be useful, but WITHOUT # # #
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # # This program is distributed in the hope that it will be useful, #
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for # # but WITHOUT ANY WARRANTY; without even the implied warranty of #
# more details. # # 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 # # You should have received a copy of the GNU General Public License #
# Temple Place, Suite 330, Boston, MA 02111-1307 USA # # along with this program. If not, see <https://www.gnu.org/licenses/>. #
############################################################################### ##########################################################################
""" """
Base class for the Windows and macOS builders. Base class for the Windows and macOS builders.
""" """
@ -251,6 +251,9 @@ class Builder(object):
""" """
self._print('Reverting any changes to the code...') self._print('Reverting any changes to the code...')
self._bzr('revert', self.branch_path, err_msg='Error reverting 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._print('Updating the code...')
self._bzr('update', self.branch_path, err_msg='Error updating the code') self._bzr('update', self.branch_path, err_msg='Error updating the code')

View File

@ -1,24 +1,24 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4 # vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4
############################################################################### ##########################################################################
# OpenLP - Open Source Lyrics Projection # # OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- # # ---------------------------------------------------------------------- #
# Copyright (c) 2004-2016 OpenLP Developers # # Copyright (c) 2008-2019 OpenLP Developers #
# --------------------------------------------------------------------------- # # ---------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it # # This program is free software: you can redistribute it and/or modify #
# under the terms of the GNU General Public License as published by the Free # # it under the terms of the GNU General Public License as published by #
# Software Foundation; version 2 of the License. # # the Free Software Foundation, either version 3 of the License, or #
# # # (at your option) any later version. #
# This program is distributed in the hope that it will be useful, but WITHOUT # # #
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # # This program is distributed in the hope that it will be useful, #
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for # # but WITHOUT ANY WARRANTY; without even the implied warranty of #
# more details. # # 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 # # You should have received a copy of the GNU General Public License #
# Temple Place, Suite 330, Boston, MA 02111-1307 USA # # along with this program. If not, see <https://www.gnu.org/licenses/>. #
############################################################################### ##########################################################################
""" """
Mac OS X Build Script Mac OS X Build Script
@ -93,6 +93,7 @@ You may need to install chardet via pip::
""" """
import glob
import os import os
from pathlib import Path from pathlib import Path
from shutil import copy, copytree, move, rmtree from shutil import copy, copytree, move, rmtree
@ -270,6 +271,20 @@ class MacOSXBuilder(Builder):
""" """
self._relink_mupdf('mutool') 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): def _copy_bundle_files(self):
""" """
Copy Info.plist and OpenLP.icns to app bundle. Copy Info.plist and OpenLP.icns to app bundle.

View File

@ -1,24 +1,24 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4 # vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4
############################################################################### ##########################################################################
# OpenLP - Open Source Lyrics Projection # # OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- # # ---------------------------------------------------------------------- #
# Copyright (c) OpenLP Developers # # Copyright (c) 2008-2019 OpenLP Developers #
# --------------------------------------------------------------------------- # # ---------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it # # This program is free software: you can redistribute it and/or modify #
# under the terms of the GNU General Public License as published by the Free # # it under the terms of the GNU General Public License as published by #
# Software Foundation; version 2 of the License. # # the Free Software Foundation, either version 3 of the License, or #
# # # (at your option) any later version. #
# This program is distributed in the hope that it will be useful, but WITHOUT # # #
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # # This program is distributed in the hope that it will be useful, #
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for # # but WITHOUT ANY WARRANTY; without even the implied warranty of #
# more details. # # 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 # # You should have received a copy of the GNU General Public License #
# Temple Place, Suite 330, Boston, MA 02111-1307 USA # # along with this program. If not, see <https://www.gnu.org/licenses/>. #
############################################################################### ##########################################################################
""" """
Windows Build Script Windows Build Script
-------------------- --------------------

View File

@ -1,7 +1,30 @@
import os # -*- coding: utf-8 -*-
# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4
# This is the settings file for building the DMG. Run dmgbuild like so: ##########################################################################
# $ dmgbuild -s dmg-settings.py -D size=<size>,app=<path/to/OpenLP.app> "OpenLP" OpenLP-{version}.dmg # 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, either version 3 of the License, or #
# (at your option) any later version. #
# #
# 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, see <https://www.gnu.org/licenses/>. #
##########################################################################
"""
This is the settings file for building the DMG. Run dmgbuild like so::
$ dmgbuild -s dmg-settings.py -D size=<size>,app=<path/to/OpenLP.app> "OpenLP" OpenLP-{version}.dmg
"""
import os
HERE = os.getcwd() HERE = os.getcwd()

View File

@ -1,23 +1,23 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 # vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4
############################################################################### ##########################################################################
# OpenLP - Open Source Lyrics Projection # # OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- # # ---------------------------------------------------------------------- #
# Copyright (c) 2008-2015 OpenLP Developers # # Copyright (c) 2008-2019 OpenLP Developers #
# --------------------------------------------------------------------------- # # ---------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it # # This program is free software: you can redistribute it and/or modify #
# under the terms of the GNU General Public License as published by the Free # # it under the terms of the GNU General Public License as published by #
# Software Foundation; version 2 of the License. # # the Free Software Foundation, either version 3 of the License, or #
# # # (at your option) any later version. #
# This program is distributed in the hope that it will be useful, but WITHOUT # # #
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # # This program is distributed in the hope that it will be useful, #
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for # # but WITHOUT ANY WARRANTY; without even the implied warranty of #
# more details. # # 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 # # You should have received a copy of the GNU General Public License #
# Temple Place, Suite 330, Boston, MA 02111-1307 USA # # along with this program. If not, see <https://www.gnu.org/licenses/>. #
############################################################################### ##########################################################################
hiddenimports = ['mysql.connector'] hiddenimports = ['mysql.connector']

View File

@ -1,24 +1,24 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 # vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4
############################################################################### ##########################################################################
# OpenLP - Open Source Lyrics Projection # # OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- # # ---------------------------------------------------------------------- #
# Copyright (c) 2008-2015 OpenLP Developers # # Copyright (c) 2008-2019 OpenLP Developers #
# --------------------------------------------------------------------------- # # ---------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it # # This program is free software: you can redistribute it and/or modify #
# under the terms of the GNU General Public License as published by the Free # # it under the terms of the GNU General Public License as published by #
# Software Foundation; version 2 of the License. # # the Free Software Foundation, either version 3 of the License, or #
# # # (at your option) any later version. #
# This program is distributed in the hope that it will be useful, but WITHOUT # # #
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # # This program is distributed in the hope that it will be useful, #
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for # # but WITHOUT ANY WARRANTY; without even the implied warranty of #
# more details. # # 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 # # You should have received a copy of the GNU General Public License #
# Temple Place, Suite 330, Boston, MA 02111-1307 USA # # along with this program. If not, see <https://www.gnu.org/licenses/>. #
############################################################################### ##########################################################################
hiddenimports = ['openlp.core.ui.media.systemplayer', hiddenimports = ['openlp.core.ui.media.systemplayer',
'openlp.core.ui.media.vlcplayer', 'openlp.core.ui.media.vlcplayer',

View File

@ -4,7 +4,7 @@
############################################################################### ###############################################################################
# OpenLP - Open Source Lyrics Projection # # OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# Copyright (c) 2008-2015 OpenLP Developers # # Copyright (c) 2008-2019 OpenLP Developers #
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it # # 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 # # under the terms of the GNU General Public License as published by the Free #
@ -20,4 +20,4 @@
# Temple Place, Suite 330, Boston, MA 02111-1307 USA # # Temple Place, Suite 330, Boston, MA 02111-1307 USA #
############################################################################### ###############################################################################
hiddenimports = ['sqlalchemy.ext.baked'] hiddenimports = ['Pyro4']

View File

@ -1,26 +1,27 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 # vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4
############################################################################### ##########################################################################
# OpenLP - Open Source Lyrics Projection # # OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- # # ---------------------------------------------------------------------- #
# Copyright (c) 2008-2015 OpenLP Developers # # Copyright (c) 2008-2019 OpenLP Developers #
# --------------------------------------------------------------------------- # # ---------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it # # This program is free software: you can redistribute it and/or modify #
# under the terms of the GNU General Public License as published by the Free # # it under the terms of the GNU General Public License as published by #
# Software Foundation; version 2 of the License. # # the Free Software Foundation, either version 3 of the License, or #
# # # (at your option) any later version. #
# This program is distributed in the hope that it will be useful, but WITHOUT # # #
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # # This program is distributed in the hope that it will be useful, #
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for # # but WITHOUT ANY WARRANTY; without even the implied warranty of #
# more details. # # 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 # # You should have received a copy of the GNU General Public License #
# Temple Place, Suite 330, Boston, MA 02111-1307 USA # # along with this program. If not, see <https://www.gnu.org/licenses/>. #
############################################################################### ##########################################################################
hiddenimports = ['openlp.plugins.presentations.lib.impresscontroller', hiddenimports = ['openlp.plugins.presentations.lib.impresscontroller',
'openlp.plugins.presentations.lib.maclocontroller',
'openlp.plugins.presentations.lib.pdfcontroller', 'openlp.plugins.presentations.lib.pdfcontroller',
'openlp.plugins.presentations.lib.powerpointcontroller', 'openlp.plugins.presentations.lib.powerpointcontroller',
'openlp.plugins.presentations.lib.pptviewcontroller'] 'openlp.plugins.presentations.lib.pptviewcontroller']

View File

@ -1,31 +1,33 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4 # vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4
############################################################################### ##########################################################################
# OpenLP - Open Source Lyrics Projection # # OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- # # ---------------------------------------------------------------------- #
# Copyright (c) 2008-2015 OpenLP Developers # # Copyright (c) 2008-2019 OpenLP Developers #
# --------------------------------------------------------------------------- # # ---------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it # # This program is free software: you can redistribute it and/or modify #
# under the terms of the GNU General Public License as published by the Free # # it under the terms of the GNU General Public License as published by #
# Software Foundation; version 2 of the License. # # the Free Software Foundation, either version 3 of the License, or #
# # # (at your option) any later version. #
# This program is distributed in the hope that it will be useful, but WITHOUT # # #
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # # This program is distributed in the hope that it will be useful, #
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for # # but WITHOUT ANY WARRANTY; without even the implied warranty of #
# more details. # # 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 # # You should have received a copy of the GNU General Public License #
# Temple Place, Suite 330, Boston, MA 02111-1307 USA # # along with this program. If not, see <https://www.gnu.org/licenses/>. #
############################################################################### ##########################################################################
hiddenimports = ['openlp.plugins.songs.songsplugin', hiddenimports = [
'openlp.plugins.bibles.bibleplugin', 'openlp.plugins.songs.songsplugin',
'openlp.plugins.presentations.presentationplugin', 'openlp.plugins.bibles.bibleplugin',
'openlp.plugins.media.mediaplugin', 'openlp.plugins.presentations.presentationplugin',
'openlp.plugins.images.imageplugin', 'openlp.plugins.media.mediaplugin',
'openlp.plugins.custom.customplugin', 'openlp.plugins.images.imageplugin',
'openlp.plugins.songusage.songusageplugin', 'openlp.plugins.custom.customplugin',
'openlp.plugins.remotes.remoteplugin', 'openlp.plugins.songusage.songusageplugin',
'openlp.plugins.alerts.alertsplugin'] 'openlp.plugins.remotes.remoteplugin',
'openlp.plugins.alerts.alertsplugin'
]

View File

@ -0,0 +1,23 @@
# -*- coding: utf-8 -*-
# vim: autoindent shiftwidth=4 expandtab textwidth=120 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, either version 3 of the License, or #
# (at your option) any later version. #
# #
# 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, see <https://www.gnu.org/licenses/>. #
##########################################################################
hiddenimports = ['sqlalchemy.ext.baked']

View File

@ -1,3 +1,24 @@
# -*- coding: utf-8 -*-
# vim: autoindent shiftwidth=4 expandtab textwidth=120 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, either version 3 of the License, or #
# (at your option) any later version. #
# #
# 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, see <https://www.gnu.org/licenses/>. #
##########################################################################
from PyInstaller.compat import is_darwin from PyInstaller.compat import is_darwin
from PyInstaller.utils.hooks import exec_statement from PyInstaller.utils.hooks import exec_statement

View File

@ -1,3 +1,24 @@
# -*- coding: utf-8 -*-
# vim: autoindent shiftwidth=4 expandtab textwidth=120 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, either version 3 of the License, or #
# (at your option) any later version. #
# #
# 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, see <https://www.gnu.org/licenses/>. #
##########################################################################
import os import os
import sys import sys

View File

@ -1,23 +1,25 @@
#!/usr/bin/env python #!/usr/bin/env python
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
############################################################################### # vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- # ##########################################################################
# Copyright (c) 2008-2015 OpenLP Developers # # OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- # # ---------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it # # Copyright (c) 2008-2019 OpenLP Developers #
# under the terms of the GNU General Public License as published by the Free # # ---------------------------------------------------------------------- #
# Software Foundation; version 2 of the License. # # 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 #
# This program is distributed in the hope that it will be useful, but WITHOUT # # the Free Software Foundation, either version 3 of the License, or #
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # # (at your option) any later version. #
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for # # #
# more details. # # This program is distributed in the hope that it will be useful, #
# # # but WITHOUT ANY WARRANTY; without even the implied warranty of #
# You should have received a copy of the GNU General Public License along # # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
# with this program; if not, write to the Free Software Foundation, Inc., 59 # # GNU General Public License for more details. #
# Temple Place, Suite 330, Boston, MA 02111-1307 USA # # #
############################################################################### # You should have received a copy of the GNU General Public License #
# along with this program. If not, see <https://www.gnu.org/licenses/>. #
##########################################################################
from bzrlib.branch import Branch from bzrlib.branch import Branch
from natsort import nsorted from natsort import nsorted

View File

@ -1,22 +1,25 @@
#!/usr/bin/python #!/usr/bin/python
############################################################################### # -*- coding: utf-8 -*-
# OpenLP - Open Source Lyrics Projection # # vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2015 OpenLP Developers # ##########################################################################
# --------------------------------------------------------------------------- # # OpenLP - Open Source Lyrics Projection #
# 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 # # Copyright (c) 2008-2019 OpenLP Developers #
# Software Foundation; version 2 of the License. # # ---------------------------------------------------------------------- #
# # # This program is free software: you can redistribute it and/or modify #
# This program is distributed in the hope that it will be useful, but WITHOUT # # it under the terms of the GNU General Public License as published by #
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # # the Free Software Foundation, either version 3 of the License, or #
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for # # (at your option) any later version. #
# more details. # # #
# # # This program is distributed in the hope that it will be useful, #
# You should have received a copy of the GNU General Public License along # # but WITHOUT ANY WARRANTY; without even the implied warranty of #
# with this program; if not, write to the Free Software Foundation, Inc., 59 # # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
# Temple Place, Suite 330, Boston, MA 02111-1307 USA # # 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, see <https://www.gnu.org/licenses/>. #
##########################################################################
import sys import sys

View File

@ -1,22 +1,25 @@
#!/home/openlp/VirtualEnv/stats/bin/python #!/home/openlp/VirtualEnv/stats/bin/python
############################################################################### # -*- coding: utf-8 -*-
# OpenLP - Open Source Lyrics Projection # # vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4
# --------------------------------------------------------------------------- #
# Copyright (c) 2008-2015 OpenLP Developers # ##########################################################################
# --------------------------------------------------------------------------- # # OpenLP - Open Source Lyrics Projection #
# 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 # # Copyright (c) 2008-2019 OpenLP Developers #
# Software Foundation; version 2 of the License. # # ---------------------------------------------------------------------- #
# # # This program is free software: you can redistribute it and/or modify #
# This program is distributed in the hope that it will be useful, but WITHOUT # # it under the terms of the GNU General Public License as published by #
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # # the Free Software Foundation, either version 3 of the License, or #
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for # # (at your option) any later version. #
# more details. # # #
# # # This program is distributed in the hope that it will be useful, #
# You should have received a copy of the GNU General Public License along # # but WITHOUT ANY WARRANTY; without even the implied warranty of #
# with this program; if not, write to the Free Software Foundation, Inc., 59 # # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
# Temple Place, Suite 330, Boston, MA 02111-1307 USA # # 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, see <https://www.gnu.org/licenses/>. #
##########################################################################
import sys import sys
import tweepy import tweepy

View File

@ -1,23 +1,25 @@
#!/usr/bin/env python #!/usr/bin/env python
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
############################################################################### # vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- # ##########################################################################
# Copyright (c) 2008-2015 OpenLP Developers # # OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- # # ---------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it # # Copyright (c) 2008-2019 OpenLP Developers #
# under the terms of the GNU General Public License as published by the Free # # ---------------------------------------------------------------------- #
# Software Foundation; version 2 of the License. # # 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 #
# This program is distributed in the hope that it will be useful, but WITHOUT # # the Free Software Foundation, either version 3 of the License, or #
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # # (at your option) any later version. #
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for # # #
# more details. # # This program is distributed in the hope that it will be useful, #
# # # but WITHOUT ANY WARRANTY; without even the implied warranty of #
# You should have received a copy of the GNU General Public License along # # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
# with this program; if not, write to the Free Software Foundation, Inc., 59 # # GNU General Public License for more details. #
# Temple Place, Suite 330, Boston, MA 02111-1307 USA # # #
############################################################################### # You should have received a copy of the GNU General Public License #
# along with this program. If not, see <https://www.gnu.org/licenses/>. #
##########################################################################
import sys import sys
import os import os
@ -25,6 +27,7 @@ import os
from bzrlib.branch import Branch from bzrlib.branch import Branch
from natsort import natsorted from natsort import natsorted
def get_version(path): def get_version(path):
b = Branch.open_containing(path)[0] b = Branch.open_containing(path)[0]
b.lock_read() b.lock_read()
@ -45,13 +48,14 @@ def get_version(path):
b.unlock() b.unlock()
return result return result
def get_path(): def get_path():
if len(sys.argv) > 1: if len(sys.argv) > 1:
return os.path.abspath(sys.argv[1]) return os.path.abspath(sys.argv[1])
else: else:
return os.path.abspath('.') return os.path.abspath('.')
if __name__ == u'__main__': if __name__ == u'__main__':
path = get_path() path = get_path()
print get_version(path) print get_version(path)

View File

@ -1,23 +1,25 @@
#!/usr/bin/env python2 #!/usr/bin/env python2
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
############################################################################### # vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4
# OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- # ##########################################################################
# Copyright (c) 2008-2015 OpenLP Developers # # OpenLP - Open Source Lyrics Projection #
# --------------------------------------------------------------------------- # # ---------------------------------------------------------------------- #
# This program is free software; you can redistribute it and/or modify it # # Copyright (c) 2008-2019 OpenLP Developers #
# under the terms of the GNU General Public License as published by the Free # # ---------------------------------------------------------------------- #
# Software Foundation; version 2 of the License. # # 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 #
# This program is distributed in the hope that it will be useful, but WITHOUT # # the Free Software Foundation, either version 3 of the License, or #
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # # (at your option) any later version. #
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for # # #
# more details. # # This program is distributed in the hope that it will be useful, #
# # # but WITHOUT ANY WARRANTY; without even the implied warranty of #
# You should have received a copy of the GNU General Public License along # # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
# with this program; if not, write to the Free Software Foundation, Inc., 59 # # GNU General Public License for more details. #
# Temple Place, Suite 330, Boston, MA 02111-1307 USA # # #
############################################################################### # You should have received a copy of the GNU General Public License #
# along with this program. If not, see <https://www.gnu.org/licenses/>. #
##########################################################################
from optparse import OptionParser from optparse import OptionParser