openlp-core team mailing list archive

[Raoul Snyman <raoul.snyman@xxxxxxxxxxxxxxxxxxxxxxxx>]

Raoul Snyman has proposed merging lp:~raoul-snyman/openlp/sdist into lp:openlp.

    Requested reviews:
    OpenLP Core (openlp-core)

-- 
https://code.launchpad.net/~raoul-snyman/openlp/sdist/+merge/19901
Your team OpenLP Core is subscribed to branch lp:openlp.

=== modified file '.bzrignore'
--- .bzrignore	2009-09-15 18:56:56 +0000
+++ .bzrignore	2010-02-22 19:56:18 +0000
@@ -10,3 +10,5 @@
 documentation/build/html
 documentation/build/doctrees
 *.log*
+dist
+OpenLP.egg-info

=== added file 'MANIFEST.in'
--- MANIFEST.in	1970-01-01 00:00:00 +0000
+++ MANIFEST.in	2010-02-22 19:56:18 +0000
@@ -0,0 +1,11 @@
+recursive-include openlp *.py
+recursive-include openlp *.sqlite
+recursive-include openlp *.csv
+recursive-include documentation *
+recursive-include resources/forms *
+recursive-include resources/i18n *
+recursive-include resources/images *
+recursive-include scripts *.py
+include copyright.txt
+include LICENSE
+include version.txt

=== modified file 'setup.py'
--- setup.py	2009-12-31 12:52:01 +0000
+++ setup.py	2010-02-22 19:56:18 +0000
@@ -1,38 +1,54 @@
-# -*- coding: utf-8 -*-
-# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4
-
-###############################################################################
-# OpenLP - Open Source Lyrics Projection                                      #
-# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2010 Raoul Snyman                                        #
-# Portions copyright (c) 2008-2010 Tim Bentley, Jonathan Corwin, Michael      #
-# Gorven, Scott Guerrieri, Maikel Stuivenberg, Martin Thompson, Jon Tibble,   #
-# Carsten Tinggaard                                                           #
-# --------------------------------------------------------------------------- #
-# 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                          #
-###############################################################################
-
-from setuptools import setup
-
-APP = ['openlp.pyw']
-OPTIONS = {'argv_emulation': True, 'includes': ['sip', 'PyQt4']}
+from setuptools import setup, find_packages
+import sys, os
+
+VERSION_FILE = 'openlp/.version'
+
+try:
+    from bzrlib.branch import Branch
+    b = Branch.open_containing('.')[0]
+    b.lock_read()
+    try:
+        # Get the branch's latest revision number.
+        revno = b.revno()
+        # Convert said revision number into a bzr revision id.
+        revision_id = b.dotted_revno_to_revision_id((revno,))
+        # Get a dict of tags, with the revision id as the key.
+        tags = b.tags.get_reverse_tag_dict()
+        # Check if the latest
+        if revision_id in tags:
+            version = u'%s' % tags[revision_id][0]
+        else:
+            version = '%s-bzr%s' % (sorted(b.tags.get_tag_dict().keys())[-1], revno)
+        ver_file = open(VERSION_FILE, u'w')
+        ver_file.write(version)
+        ver_file.close()
+    finally:
+        b.unlock()
+except:
+    ver_file = open(VERSION_FILE, u'w')
+    version = ver_file.read().strip()
+    ver_file.close()
+
 
 setup(
-    name='openlp.org',
-    version='1.9.0',
-    url='http://www.openlp.org/',
-    app=APP,
-    options={'py2app': OPTIONS},
-    setup_requires=['py2app'],
-)
\ No newline at end of file
+    name='OpenLP',
+    version=version,
+    description="Open source Church presentation and lyrics projection application.",
+    long_description="""\
+OpenLP (previously openlp.org) is free church presentation software, or lyrics projection software, used to display slides of songs, Bible verses, videos, images, and even presentations (if PowerPoint is installed) for church worship using a computer and a data projector.""",
+    classifiers=[], # Get strings from http://pypi.python.org/pypi?%3Aaction=list_classifiers
+    keywords='open source church presentation lyrics projection song bible display project',
+    author='Raoul Snyman',
+    author_email='raoulsnyman@xxxxxxxxxx',
+    url='http://openlp.org/',
+    license='GNU General Public License',
+    packages=find_packages(exclude=['ez_setup', 'examples', 'tests']),
+    include_package_data=True,
+    zip_safe=False,
+    install_requires=[
+        # -*- Extra requirements: -*-
+    ],
+    entry_points="""
+    # -*- Entry points: -*-
+    """
+)