1
=== modified file '.bzrignore'
2
--- .bzrignore	2010-10-13 00:26:41 +0000
3
+++ .bzrignore	2012-03-27 13:43:19 +0000
4
@@ -25,6 +25,8 @@
5
25
# setup.py working directory
25
# setup.py working directory
6
26
./build
26
./build
7
27
./build-win32
27
./build-win32
8
28
# local .mo files
9
29
./bzrlib/locale
10
28
# Editor temporary/working/backup files
30
# Editor temporary/working/backup files
11
29
*$
31
*$
12
30
.*.sw[nop]
32
.*.sw[nop]
13
31
33
14
=== modified file 'tools/bzr_distutils.py'
15
--- tools/bzr_distutils.py	2012-03-27 13:43:19 +0000
16
+++ tools/bzr_distutils.py	2012-03-27 13:43:19 +0000
17
@@ -42,25 +42,37 @@
18
42
    user_options = [('build-dir=', 'd', 'Directory to build locale files'),
42
    user_options = [('build-dir=', 'd', 'Directory to build locale files'),
19
43
                    ('output-base=', 'o', 'mo-files base name'),
43
                    ('output-base=', 'o', 'mo-files base name'),
20
44
                    ('source-dir=', None, 'Directory with sources po files'),
44
                    ('source-dir=', None, 'Directory with sources po files'),
21
45
                    ('inplace', 'i', 'Ignore build-dir and put locale dir '
22
46
                                     'alongside source files.'),
23
45
                    ('force', 'f', 'Force creation of mo files'),
47
                    ('force', 'f', 'Force creation of mo files'),
24
46
                    ('lang=', None, 'Comma-separated list of languages '
48
                    ('lang=', None, 'Comma-separated list of languages '
25
47
                                    'to process'),
49
                                    'to process'),
26
48
                   ]
50
                   ]
27
49
51
29
50
    boolean_options = ['force']
52
    boolean_options = ['force', 'inplace']
30
51
53
31
52
    def initialize_options(self):
54
    def initialize_options(self):
32
55
        self.build_lib = None
33
53
        self.build_dir = None
56
        self.build_dir = None
34
54
        self.output_base = None
57
        self.output_base = None
35
55
        self.source_dir = None
58
        self.source_dir = None
36
59
        self.inplace = False
37
56
        self.force = None
60
        self.force = None
38
57
        self.lang = None
61
        self.lang = None
39
58
62
40
59
    def finalize_options(self):
63
    def finalize_options(self):
42
60
        self.set_undefined_options('build', ('force', 'force'))
64
        self.set_undefined_options('build',
43
65
            ('build_lib', 'build_lib'),
44
66
            ('force', 'force'),
45
67
            )
46
61
        self.prj_name = self.distribution.get_name()
68
        self.prj_name = self.distribution.get_name()
47
69
        if self.inplace:
48
70
            # Relies on knowledge of where bzr will look for locale files.
49
71
            self.build_dir = "bzrlib/locale"
50
62
        if self.build_dir is None:
72
        if self.build_dir is None:
52
63
            self.build_dir = 'bzrlib/locale'
73
            # Really should use build_base subdir rather than build_lib, but
53
74
            # would break `clean --all` and generally be annoying.
54
75
            self.build_dir = os.path.join(self.build_lib, "bzrlib/locale")
55
64
        if not self.output_base:
76
        if not self.output_base:
56
65
            self.output_base = self.prj_name or 'messages'
77
            self.output_base = self.prj_name or 'messages'
57
66
        if self.source_dir is None:
78
        if self.source_dir is None:
Reviewer	Review Type	Date Requested	Status
Jelmer Vernooij (community)		2012-03-27	Approve on 2012-03-27
Review via email: mp+99523@code.launchpad.net