/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
 
#!/usr/bin/env python2.4
 
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
 
        def run(self):
14
 
                self.data_files.extend(self._compile_po_files())
15
 
                install_data.run(self)
16
 
 
17
 
        def _compile_po_files(self):
18
 
                data_files = []
19
 
                
20
 
                # Don't install language files on Win32
21
 
                if sys.platform == 'win32':
22
 
                    return data_files
23
 
                
24
 
                PO_DIR = 'po'
25
 
                for po in glob.glob(os.path.join(PO_DIR,'*.po')):
26
 
                        lang = os.path.basename(po[:-3])
27
 
                        # It's necessary to compile in this directory (not in po_dir)
28
 
                        # because install_data can't rename file
29
 
                        mo = os.path.join('build', 'mo', lang, 'olive-gtk.mo')
30
 
                        
31
 
                        directory = os.path.dirname(mo)
32
 
                        if not os.path.exists(directory):
33
 
                                info('creating %s' % directory)
34
 
                                os.makedirs(directory)
35
 
                        
36
 
                        if newer(po, mo):
37
 
                                # True if mo doesn't exist
38
 
                                cmd = 'msgfmt -o %s %s' % (mo, po)
39
 
                                info('compiling %s -> %s' % (po, mo))
40
 
                                if os.system(cmd) != 0:
41
 
                                        raise SystemExit('Error while running msgfmt')
42
 
 
43
 
                                dest = os.path.dirname(os.path.join('share', 'locale', lang, 'LC_MESSAGES', 'olive-gtk.mo'))
44
 
                                data_files.append((dest, [mo]))
45
 
                
46
 
                return data_files
47
 
 
 
37
    def run(self):
 
38
        self.data_files.extend(self._compile_po_files())
 
39
        self.data_files.extend(self._nautilus_plugin())
 
40
        install_data.run(self)
 
41
 
 
42
        try:
 
43
            subprocess.check_call('gtk-update-icon-cache -f -t /usr/share/icons/hicolor')
 
44
        except:
 
45
            pass
 
46
 
 
47
    def _compile_po_files(self):
 
48
        data_files = []
 
49
        
 
50
        # Don't install language files on Win32
 
51
        if sys.platform == 'win32':
 
52
            return data_files
 
53
        
 
54
        PO_DIR = 'po'
 
55
        for po in glob.glob(os.path.join(PO_DIR,'*.po')):
 
56
            lang = os.path.basename(po[:-3])
 
57
            # It's necessary to compile in this directory (not in po_dir)
 
58
            # because install_data can't rename file
 
59
            mo = os.path.join('build', 'mo', lang, 'olive-gtk.mo')
 
60
            
 
61
            directory = os.path.dirname(mo)
 
62
            if not os.path.exists(directory):
 
63
                info('creating %s' % directory)
 
64
                os.makedirs(directory)
 
65
            
 
66
            if newer(po, mo):
 
67
                # True if mo doesn't exist
 
68
                cmd = 'msgfmt -o %s %s' % (mo, po)
 
69
                info('compiling %s -> %s' % (po, mo))
 
70
                if os.system(cmd) != 0:
 
71
                    raise SystemExit('Error while running msgfmt')
 
72
                
 
73
                dest = os.path.dirname(os.path.join('share', 'locale', lang, 'LC_MESSAGES', 'olive-gtk.mo'))
 
74
                data_files.append((dest, [mo]))
 
75
        
 
76
        return data_files
 
77
    
 
78
    def _nautilus_plugin(self):
 
79
        files = []
 
80
        if sys.platform[:5] == 'linux':
 
81
            cmd = os.popen('pkg-config --variable=pythondir nautilus-python', 'r')
 
82
            res = cmd.readline()
 
83
            ret = cmd.close()
 
84
            
 
85
            if ret is None:
 
86
                dest = res[5:]
 
87
                files.append((dest, ['nautilus-bzr.py']))
 
88
        
 
89
        return files
48
90
 
49
91
 
50
92
setup(
51
93
    name = "bzr-gtk",
52
 
    version = "0.14.0",
 
94
    version = "0.94.0rc1",
53
95
    maintainer = "Jelmer Vernooij",
54
96
    maintainer_email = "jelmer@samba.org",
55
97
    description = "GTK+ Frontends for various Bazaar commands",
59
101
        "bzrlib.plugins.gtk": ".",
60
102
        "bzrlib.plugins.gtk.viz": "viz", 
61
103
        "bzrlib.plugins.gtk.annotate": "annotate",
62
 
        "bzrlib.plugins.gtk.olive": "olive"
 
104
        "bzrlib.plugins.gtk.olive": "olive",
 
105
        "bzrlib.plugins.gtk.tests": "tests",
 
106
        "bzrlib.plugins.gtk.branchview": "branchview",
63
107
        },
64
108
    packages = [
65
 
                "olive",
66
109
        "bzrlib.plugins.gtk",
67
110
        "bzrlib.plugins.gtk.viz",
68
111
        "bzrlib.plugins.gtk.annotate",
69
 
        "bzrlib.plugins.gtk.olive"
 
112
        "bzrlib.plugins.gtk.olive",
 
113
        "bzrlib.plugins.gtk.tests",
 
114
        "bzrlib.plugins.gtk.branchview",
70
115
        ],
71
 
      data_files=[('share/olive', ['olive.glade',
72
 
                                   'oliveicon2.png',
73
 
                                   'cmenu.ui',
74
 
                                  ]),
75
 
                  ('share/olive/icons', [\
76
 
                                   'icons/commit.png',
77
 
                                   'icons/commit16.png',
78
 
                                   'icons/diff.png',
79
 
                                   'icons/diff16.png',
80
 
                                   'icons/log.png',
81
 
                                   'icons/log16.png',
82
 
                                   'icons/pull.png',
83
 
                                   'icons/pull16.png',
84
 
                                   'icons/push.png',
85
 
                                   'icons/push16.png',
86
 
                                   'icons/refresh.png']),
87
 
                  ('share/applications', ['olive-gtk.desktop']),
88
 
                  ('share/pixmaps', ['icons/olive-gtk.png'])
89
 
                 ],
90
 
        cmdclass={'install_data': InstallData}
 
116
    data_files=[('share/olive', ['olive.glade',
 
117
                                 'cmenu.ui',
 
118
                                ]),
 
119
                ('share/olive/icons', ['icons/commit.png',
 
120
                                 'icons/commit16.png',
 
121
                                 'icons/diff.png',
 
122
                                 'icons/diff16.png',
 
123
                                 'icons/log.png',
 
124
                                 'icons/log16.png',
 
125
                                 'icons/pull.png',
 
126
                                 'icons/pull16.png',
 
127
                                 'icons/push.png',
 
128
                                 'icons/push16.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']),
 
137
                ('share/applications', ['olive-gtk.desktop',
 
138
                                        'bazaar-properties.desktop',
 
139
                                        'bzr-handle-patch.desktop',
 
140
                                        'bzr-notify.desktop']),
 
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'])
 
149
               ],
 
150
    cmdclass={'install_data': InstallData,
 
151
              'check': Check}
91
152
)