/b-gtk/fix-viz

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/b-gtk/fix-viz

« back to all changes in this revision

Viewing changes to setup.py

  • Committer: Vincent Ladeuil
  • Date: 2008-05-05 18:16:46 UTC
  • mto: (487.1.1 gtk)
  • mto: This revision was merged to the branch mainline in revision 490.
  • Revision ID: v.ladeuil+lp@free.fr-20080505181646-n95l8ltw2u6jtr26
Fix bug #187283 fix replacing _() by _i18n().

* genpot.sh 
Remove duplication. Add the ability to specify the genrated pot
file on command-line for debugging purposes.

* po/olive-gtk.pot:
Regenerated.

* __init__.py, branch.py, branchview/treeview.py, checkout.py,
commit.py, conflicts.py, diff.py, errors.py, initialize.py,
merge.py, nautilus-bzr.py, olive/__init__.py, olive/add.py,
olive/bookmark.py, olive/guifiles.py, olive/info.py,
olive/menu.py, olive/mkdir.py, olive/move.py, olive/remove.py,
olive/rename.py, push.py, revbrowser.py, status.py, tags.py:
Replace all calls to _() by calls to _i18n(), the latter being
defined in __init__.py and imported in the other modules from
there. This fix the problem encountered countless times when
running bzr selftest and getting silly error messages about
boolean not being callables.

Show diffs side-by-side

added added

removed removed

Lines of Context:
setup.py
1
1
#!/usr/bin/python
2
2
"""GTK+ Frontends for various Bazaar commands."""
3
3
 
4
 
from distutils.core import setup
 
4
from distutils.core import setup, Command
5
5
from distutils.command.install_data import install_data
6
6
from distutils.dep_util import newer
7
7
from distutils.log import info
9
9
import os
10
10
import sys
11
11
 
 
12
class Check(Command):
 
13
    description = "Run unit tests"
 
14
 
 
15
    user_options = []
 
16
 
 
17
    def initialize_options(self):
 
18
        pass
 
19
 
 
20
    def finalize_options(self):
 
21
        pass
 
22
 
 
23
    def get_command_name(self):
 
24
        return 'test'
 
25
 
 
26
    def run(self):
 
27
        from bzrlib.tests import TestLoader, TestSuite, TextTestRunner
 
28
        import __init__ as bzrgtk
 
29
        runner = TextTestRunner()
 
30
        loader = TestLoader()
 
31
        suite = TestSuite()
 
32
        suite.addTest(bzrgtk.test_suite())
 
33
        result = runner.run(suite)
 
34
        return result.wasSuccessful()
 
35
 
12
36
class InstallData(install_data):
13
37
    def run(self):
14
38
        self.data_files.extend(self._compile_po_files())
15
 
        # Disable for now - performance issues
16
 
        #self.data_files.extend(self._nautilus_plugin())
 
39
        self.data_files.extend(self._nautilus_plugin())
17
40
        install_data.run(self)
18
 
    
 
41
 
 
42
        try:
 
43
            subprocess.check_call('gtk-update-icon-cache -f -t /usr/share/icons/hicolor')
 
44
        except:
 
45
            pass
 
46
 
19
47
    def _compile_po_files(self):
20
48
        data_files = []
21
49
        
63
91
 
64
92
setup(
65
93
    name = "bzr-gtk",
66
 
    version = "0.19.0",
 
94
    version = "0.94.0rc1",
67
95
    maintainer = "Jelmer Vernooij",
68
96
    maintainer_email = "jelmer@samba.org",
69
97
    description = "GTK+ Frontends for various Bazaar commands",
74
102
        "bzrlib.plugins.gtk.viz": "viz", 
75
103
        "bzrlib.plugins.gtk.annotate": "annotate",
76
104
        "bzrlib.plugins.gtk.olive": "olive",
77
 
        "bzrlib.plugins.gtk.tests": "tests"
 
105
        "bzrlib.plugins.gtk.tests": "tests",
 
106
        "bzrlib.plugins.gtk.branchview": "branchview",
78
107
        },
79
108
    packages = [
80
 
        "olive",
81
109
        "bzrlib.plugins.gtk",
82
110
        "bzrlib.plugins.gtk.viz",
83
111
        "bzrlib.plugins.gtk.annotate",
84
112
        "bzrlib.plugins.gtk.olive",
85
 
        "bzrlib.plugins.gtk.tests"
 
113
        "bzrlib.plugins.gtk.tests",
 
114
        "bzrlib.plugins.gtk.branchview",
86
115
        ],
87
116
    data_files=[('share/olive', ['olive.glade',
88
 
                                 'oliveicon2.png',
89
117
                                 'cmenu.ui',
90
118
                                ]),
91
 
                ('share/olive', ['icons/commit.png',
 
119
                ('share/olive/icons', ['icons/commit.png',
92
120
                                 'icons/commit16.png',
93
121
                                 'icons/diff.png',
94
122
                                 'icons/diff16.png',
98
126
                                 'icons/pull16.png',
99
127
                                 'icons/push.png',
100
128
                                 'icons/push16.png',
101
 
                                 'icons/refresh.png']),
 
129
                                 'icons/refresh.png',
 
130
                                 'icons/oliveicon2.png']),
 
131
                ('share/bzr-gtk/icons', ['icons/sign-bad.png',
 
132
                                 'icons/sign-ok.png',
 
133
                                 'icons/sign.png',
 
134
                                 'icons/sign-unknown.png',
 
135
                                 'icons/bug.png',
 
136
                                 'icons/bzr-icon-64.png']),
102
137
                ('share/applications', ['olive-gtk.desktop',
103
138
                                        'bazaar-properties.desktop',
 
139
                                        'bzr-handle-patch.desktop',
104
140
                                        'bzr-notify.desktop']),
105
 
                ('share/pixmaps', ['icons/olive-gtk.png'])
 
141
                ('share/application-registry', ['bzr-gtk.applications']),
 
142
                ('share/pixmaps', ['icons/olive-gtk.png', 'icons/bzr-icon-64.png']),
 
143
                ('share/icons/hicolor/scalable/emblems', 
 
144
                    ['icons/emblem-bzr-added.svg', 
 
145
                        'icons/emblem-bzr-conflict.svg', 
 
146
                        'icons/emblem-bzr-controlled.svg', 
 
147
                        'icons/emblem-bzr-modified.svg',
 
148
                        'icons/emblem-bzr-removed.svg'])
106
149
               ],
107
 
    cmdclass={'install_data': InstallData}
 
150
    cmdclass={'install_data': InstallData,
 
151
              'check': Check}
108
152
)