/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to setup.py

  • Committer: Jelmer Vernooij
  • Date: 2017-06-10 01:39:46 UTC
  • mto: This revision was merged to the branch mainline in revision 6690.
  • Revision ID: jelmer@jelmer.uk-20170610013946-08donzxbo8iv0ewz
Fix more imports.

Show diffs side-by-side

added added

removed removed

Lines of Context:
setup.py
1
1
#! /usr/bin/env python
2
2
 
3
 
"""Installation script for bzr.
 
3
"""Installation script for brz.
4
4
Run it with
5
5
 './setup.py install', or
6
6
 './setup.py --help' for more options
9
9
import os
10
10
import os.path
11
11
import sys
 
12
import copy
 
13
import glob
12
14
 
13
 
if sys.version_info < (2, 4):
14
 
    sys.stderr.write("[ERROR] Not a supported Python version. Need 2.4+\n")
 
15
if sys.version_info < (2, 7):
 
16
    sys.stderr.write("[ERROR] Not a supported Python version. Need 2.7+\n")
15
17
    sys.exit(1)
16
18
 
17
19
# NOTE: The directory containing setup.py, whether run by 'python setup.py' or
18
20
# './setup.py' or the equivalent with another path, should always be at the
19
21
# start of the path, so this should find the right one...
20
 
import bzrlib
 
22
import breezy
21
23
 
22
24
def get_long_description():
23
25
    dirname = os.path.dirname(__file__)
33
35
# META INFORMATION FOR SETUP
34
36
# see http://docs.python.org/dist/meta-data.html
35
37
META_INFO = {
36
 
    'name':         'bzr',
37
 
    'version':      bzrlib.__version__,
 
38
    'name':         'brz',
 
39
    'version':      breezy.__version__,
38
40
    'author':       'Canonical Ltd',
39
41
    'author_email': 'bazaar@lists.canonical.com',
40
 
    'url':          'http://bazaar.canonical.com/',
 
42
    'maintainer':   'Breezy Developers',
 
43
    'url':          'https://www.breezy-vcs.org/',
41
44
    'description':  'Friendly distributed version control system',
42
45
    'license':      'GNU GPL v2',
43
 
    'download_url': 'https://launchpad.net/bzr/+download',
 
46
    'download_url': 'https://launchpad.net/brz/+download',
44
47
    'long_description': get_long_description(),
45
48
    'classifiers': [
46
49
        'Development Status :: 6 - Mature',
62
65
BZRLIB = {}
63
66
 
64
67
PKG_DATA = {# install files from selftest suite
65
 
            'package_data': {'bzrlib': ['doc/api/*.txt',
 
68
            'package_data': {'breezy': ['doc/api/*.txt',
66
69
                                        'tests/test_patches_data/*',
67
70
                                        'help_topics/en/*.txt',
 
71
                                        'tests/ssl_certs/ca.crt',
68
72
                                        'tests/ssl_certs/server_without_pass.key',
69
73
                                        'tests/ssl_certs/server_with_pass.key',
70
 
                                        'tests/ssl_certs/server.crt'
 
74
                                        'tests/ssl_certs/server.crt',
71
75
                                       ]},
72
76
           }
73
 
 
74
 
 
75
 
def get_bzrlib_packages():
76
 
    """Recurse through the bzrlib directory, and extract the package names"""
 
77
I18N_FILES = []
 
78
for filepath in glob.glob("breezy/locale/*/LC_MESSAGES/*.mo"):
 
79
    langfile = filepath[len("breezy/locale/"):]
 
80
    targetpath = os.path.dirname(os.path.join("share/locale", langfile))
 
81
    I18N_FILES.append((targetpath, [filepath]))
 
82
 
 
83
def get_breezy_packages():
 
84
    """Recurse through the breezy directory, and extract the package names"""
77
85
 
78
86
    packages = []
79
 
    base_path = os.path.dirname(os.path.abspath(bzrlib.__file__))
 
87
    base_path = os.path.dirname(os.path.abspath(breezy.__file__))
80
88
    for root, dirs, files in os.walk(base_path):
81
89
        if '__init__.py' in files:
82
90
            assert root.startswith(base_path)
83
 
            # Get just the path below bzrlib
 
91
            # Get just the path below breezy
84
92
            package_path = root[len(base_path):]
85
93
            # Remove leading and trailing slashes
86
94
            package_path = package_path.strip('\\/')
87
95
            if not package_path:
88
 
                package_name = 'bzrlib'
 
96
                package_name = 'breezy'
89
97
            else:
90
 
                package_name = ('bzrlib.' +
 
98
                package_name = ('breezy.' +
91
99
                            package_path.replace('/', '.').replace('\\', '.'))
92
100
            packages.append(package_name)
93
101
    return sorted(packages)
94
102
 
95
103
 
96
 
BZRLIB['packages'] = get_bzrlib_packages()
 
104
BZRLIB['packages'] = get_breezy_packages()
97
105
 
98
106
 
99
107
from distutils import log
100
108
from distutils.core import setup
 
109
from distutils.version import LooseVersion
101
110
from distutils.command.install_scripts import install_scripts
102
111
from distutils.command.install_data import install_data
103
112
from distutils.command.build import build
108
117
 
109
118
class my_install_scripts(install_scripts):
110
119
    """ Customized install_scripts distutils action.
111
 
    Create bzr.bat for win32.
 
120
    Create brz.bat for win32.
112
121
    """
113
122
    def run(self):
114
123
        install_scripts.run(self)   # standard action
117
126
            try:
118
127
                scripts_dir = os.path.join(sys.prefix, 'Scripts')
119
128
                script_path = self._quoted_path(os.path.join(scripts_dir,
120
 
                                                             "bzr"))
 
129
                                                             "brz"))
121
130
                python_exe = self._quoted_path(sys.executable)
122
131
                args = self._win_batch_args()
123
132
                batch_str = "@%s %s %s" % (python_exe, script_path, args)
124
 
                batch_path = os.path.join(self.install_dir, "bzr.bat")
 
133
                batch_path = os.path.join(self.install_dir, "brz.bat")
125
134
                f = file(batch_path, "w")
126
135
                f.write(batch_str)
127
136
                f.close()
128
 
                print "Created:", batch_path
129
 
            except Exception, e:
130
 
                print "ERROR: Unable to create %s: %s" % (batch_path, e)
 
137
                print(("Created: %s" % batch_path))
 
138
            except Exception:
 
139
                e = sys.exc_info()[1]
 
140
                print(("ERROR: Unable to create %s: %s" % (batch_path, e)))
131
141
 
132
142
    def _quoted_path(self, path):
133
143
        if ' ' in path:
136
146
            return path
137
147
 
138
148
    def _win_batch_args(self):
139
 
        from bzrlib.win32utils import winver
 
149
        from breezy.win32utils import winver
140
150
        if winver == 'Windows NT':
141
151
            return '%*'
142
152
        else:
146
156
 
147
157
class bzr_build(build):
148
158
    """Customized build distutils action.
149
 
    Generate bzr.1.
 
159
    Generate brz.1.
150
160
    """
151
161
 
 
162
    sub_commands = build.sub_commands + [
 
163
            ('build_mo', lambda _: True),
 
164
            ]
 
165
 
152
166
    def run(self):
153
167
        build.run(self)
154
168
 
155
169
        from tools import generate_docs
156
 
        generate_docs.main(argv=["bzr", "man"])
 
170
        generate_docs.main(argv=["brz", "man"])
157
171
 
158
172
 
159
173
########################
160
174
## Setup
161
175
########################
162
176
 
 
177
from breezy.bzr_distutils import build_mo
 
178
 
163
179
command_classes = {'install_scripts': my_install_scripts,
164
 
                   'build': bzr_build}
 
180
                   'build': bzr_build,
 
181
                   'build_mo': build_mo,
 
182
                   }
165
183
from distutils import log
166
184
from distutils.errors import CCompilerError, DistutilsPlatformError
167
185
from distutils.extension import Extension
168
186
ext_modules = []
169
187
try:
170
188
    try:
 
189
        from Cython.Distutils import build_ext
 
190
        from Cython.Compiler.Version import version as pyrex_version
 
191
    except ImportError:
 
192
        print("No Cython, trying Pyrex...")
171
193
        from Pyrex.Distutils import build_ext
172
194
        from Pyrex.Compiler.Version import version as pyrex_version
173
 
    except ImportError:
174
 
        print "No Pyrex, trying Cython..."
175
 
        from Cython.Distutils import build_ext
176
 
        from Cython.Compiler.Version import version as pyrex_version
177
195
except ImportError:
178
196
    have_pyrex = False
179
197
    # try to build the extension from the prior generated source.
180
 
    print
181
 
    print ("The python package 'Pyrex' is not available."
182
 
           " If the .c files are available,")
183
 
    print ("they will be built,"
184
 
           " but modifying the .pyx files will not rebuild them.")
185
 
    print
 
198
    print("")
 
199
    print("The python package 'Pyrex' is not available."
 
200
          " If the .c files are available,")
 
201
    print("they will be built,"
 
202
          " but modifying the .pyx files will not rebuild them.")
 
203
    print("")
186
204
    from distutils.command.build_ext import build_ext
187
205
else:
188
206
    have_pyrex = True
189
 
    pyrex_version_info = tuple(map(int, pyrex_version.split('.')))
 
207
    pyrex_version_info = LooseVersion(pyrex_version)
190
208
 
191
209
 
192
210
class build_ext_if_possible(build_ext):
204
222
    def run(self):
205
223
        try:
206
224
            build_ext.run(self)
207
 
        except DistutilsPlatformError, e:
 
225
        except DistutilsPlatformError:
 
226
            e = sys.exc_info()[1]
208
227
            if not self.allow_python_fallback:
209
228
                log.warn('\n  Cannot build extensions.\n'
210
229
                         '  Use "build_ext --allow-python-fallback" to use'
269
288
        define_macros=define_macros, libraries=libraries))
270
289
 
271
290
 
272
 
add_pyrex_extension('bzrlib._annotator_pyx')
273
 
add_pyrex_extension('bzrlib._bencode_pyx')
274
 
add_pyrex_extension('bzrlib._chunks_to_lines_pyx')
275
 
add_pyrex_extension('bzrlib._groupcompress_pyx',
276
 
                    extra_source=['bzrlib/diff-delta.c'])
277
 
add_pyrex_extension('bzrlib._knit_load_data_pyx')
278
 
add_pyrex_extension('bzrlib._known_graph_pyx')
279
 
add_pyrex_extension('bzrlib._rio_pyx')
 
291
add_pyrex_extension('breezy._annotator_pyx')
 
292
add_pyrex_extension('breezy._bencode_pyx')
 
293
add_pyrex_extension('breezy._chunks_to_lines_pyx')
 
294
add_pyrex_extension('breezy.bzr._groupcompress_pyx',
 
295
                    extra_source=['breezy/bzr/diff-delta.c'])
 
296
add_pyrex_extension('breezy.bzr._knit_load_data_pyx')
 
297
add_pyrex_extension('breezy._known_graph_pyx')
 
298
add_pyrex_extension('breezy._rio_pyx')
280
299
if sys.platform == 'win32':
281
 
    add_pyrex_extension('bzrlib._dirstate_helpers_pyx',
 
300
    add_pyrex_extension('breezy.bzr._dirstate_helpers_pyx',
282
301
                        libraries=['Ws2_32'])
283
 
    add_pyrex_extension('bzrlib._walkdirs_win32')
284
 
    z_lib = 'zdll'
 
302
    add_pyrex_extension('breezy._walkdirs_win32')
285
303
else:
286
 
    if have_pyrex and pyrex_version_info[:3] == (0,9,4):
 
304
    if have_pyrex and pyrex_version_info == LooseVersion("0.9.4.1"):
287
305
        # Pyrex 0.9.4.1 fails to compile this extension correctly
288
306
        # The code it generates re-uses a "local" pointer and
289
307
        # calls "PY_DECREF" after having set it to NULL. (It mixes PY_XDECREF
290
308
        # which is NULL safe with PY_DECREF which is not.)
291
 
        # <https://bugs.edge.launchpad.net/bzr/+bug/449372>
292
 
        # <https://bugs.edge.launchpad.net/bzr/+bug/276868>
293
 
        print 'Cannot build extension "bzrlib._dirstate_helpers_pyx" using'
294
 
        print 'your version of pyrex "%s". Please upgrade your pyrex' % (
295
 
            pyrex_version,)
296
 
        print 'install. For now, the non-compiled (python) version will'
297
 
        print 'be used instead.'
 
309
        # <https://bugs.launchpad.net/bzr/+bug/449372>
 
310
        # <https://bugs.launchpad.net/bzr/+bug/276868>
 
311
        print('Cannot build extension "breezy.bzr._dirstate_helpers_pyx" using')
 
312
        print(('your version of pyrex "%s". Please upgrade your pyrex'
 
313
              % (pyrex_version,)))
 
314
        print('install. For now, the non-compiled (python) version will')
 
315
        print('be used instead.')
298
316
    else:
299
 
        add_pyrex_extension('bzrlib._dirstate_helpers_pyx')
300
 
    add_pyrex_extension('bzrlib._readdir_pyx')
301
 
    z_lib = 'z'
302
 
add_pyrex_extension('bzrlib._chk_map_pyx', libraries=[z_lib])
303
 
ext_modules.append(Extension('bzrlib._patiencediff_c',
304
 
                             ['bzrlib/_patiencediff_c.c']))
305
 
if have_pyrex and pyrex_version_info < (0, 9, 6, 3):
306
 
    print
307
 
    print 'Your Pyrex/Cython version %s is too old to build the simple_set' % (
308
 
        pyrex_version)
309
 
    print 'and static_tuple extensions.'
310
 
    print 'Please upgrade to at least Pyrex 0.9.6.3'
311
 
    print
 
317
        add_pyrex_extension('breezy.bzr._dirstate_helpers_pyx')
 
318
    add_pyrex_extension('breezy._readdir_pyx')
 
319
add_pyrex_extension('breezy.bzr._chk_map_pyx')
 
320
ext_modules.append(Extension('breezy._patiencediff_c',
 
321
                             ['breezy/_patiencediff_c.c']))
 
322
if have_pyrex and pyrex_version_info < LooseVersion("0.9.6.3"):
 
323
    print("")
 
324
    print(('Your Pyrex/Cython version %s is too old to build the simple_set' % (
 
325
        pyrex_version)))
 
326
    print('and static_tuple extensions.')
 
327
    print('Please upgrade to at least Pyrex 0.9.6.3')
 
328
    print("")
312
329
    # TODO: Should this be a fatal error?
313
330
else:
314
331
    # We only need 0.9.6.3 to build _simple_set_pyx, but static_tuple depends
315
332
    # on simple_set
316
 
    add_pyrex_extension('bzrlib._simple_set_pyx')
317
 
    ext_modules.append(Extension('bzrlib._static_tuple_c',
318
 
                                 ['bzrlib/_static_tuple_c.c']))
319
 
add_pyrex_extension('bzrlib._btree_serializer_pyx')
 
333
    add_pyrex_extension('breezy._simple_set_pyx')
 
334
    ext_modules.append(Extension('breezy._static_tuple_c',
 
335
                                 ['breezy/_static_tuple_c.c']))
 
336
add_pyrex_extension('breezy.bzr._btree_serializer_pyx')
320
337
 
321
338
 
322
339
if unavailable_files:
323
 
    print 'C extension(s) not found:'
324
 
    print '   %s' % ('\n  '.join(unavailable_files),)
325
 
    print 'The python versions will be used instead.'
326
 
    print
 
340
    print('C extension(s) not found:')
 
341
    print(('   %s' % ('\n  '.join(unavailable_files),)))
 
342
    print('The python versions will be used instead.')
 
343
    print("")
327
344
 
328
345
 
329
346
def get_tbzr_py2exe_info(includes, excludes, packages, console_targets,
346
363
    # TBZR points to the TBZR directory
347
364
    tbzr_root = os.environ["TBZR"]
348
365
 
349
 
    # Ensure tbzrlib itself is on sys.path
 
366
    # Ensure tbreezy itself is on sys.path
350
367
    sys.path.append(tbzr_root)
351
368
 
352
 
    packages.append("tbzrlib")
 
369
    packages.append("tbreezy")
353
370
 
354
371
    # collect up our icons.
355
372
    cwd = os.getcwd()
356
 
    ico_root = os.path.join(tbzr_root, 'tbzrlib', 'resources')
 
373
    ico_root = os.path.join(tbzr_root, 'tbreezy', 'resources')
357
374
    icos = [] # list of (path_root, relative_ico_path)
358
 
    # First always bzr's icon and its in the root of the bzr tree.
359
 
    icos.append(('', 'bzr.ico'))
 
375
    # First always brz's icon and its in the root of the brz tree.
 
376
    icos.append(('', 'brz.ico'))
360
377
    for root, dirs, files in os.walk(ico_root):
361
378
        icos.extend([(ico_root, os.path.join(root, f)[len(ico_root)+1:])
362
379
                     for f in files if f.endswith('.ico')])
393
410
    # ditto for the tbzrcommand tool
394
411
    tbzrcommand = dict(
395
412
        script = os.path.join(tbzr_root, "scripts", "tbzrcommand.py"),
396
 
        icon_resources = [(0,'bzr.ico')],
 
413
        icon_resources = icon_resources,
 
414
        other_resources = other_resources,
397
415
    )
398
416
    console_targets.append(tbzrcommand)
399
417
    tbzrcommandw = tbzrcommand.copy()
413
431
 
414
432
def get_qbzr_py2exe_info(includes, excludes, packages, data_files):
415
433
    # PyQt4 itself still escapes the plugin detection code for some reason...
416
 
    packages.append('PyQt4')
417
 
    excludes.append('PyQt4.elementtree.ElementTree')
418
 
    excludes.append('PyQt4.uic.port_v3')
 
434
    includes.append('PyQt4.QtCore')
 
435
    includes.append('PyQt4.QtGui')
 
436
    includes.append('PyQt4.QtTest')
419
437
    includes.append('sip') # extension module required for Qt.
420
438
    packages.append('pygments') # colorizer for qbzr
421
439
    packages.append('docutils') # html formatting
422
440
    includes.append('win32event')  # for qsubprocess stuff
423
 
    # but we can avoid many Qt4 Dlls.
424
 
    dll_excludes.extend(
425
 
        """QtAssistantClient4.dll QtCLucene4.dll QtDesigner4.dll
426
 
        QtHelp4.dll QtNetwork4.dll QtOpenGL4.dll QtScript4.dll
427
 
        QtSql4.dll QtTest4.dll QtWebKit4.dll QtXml4.dll
428
 
        qscintilla2.dll""".split())
429
441
    # the qt binaries might not be on PATH...
430
442
    # They seem to install to a place like C:\Python25\PyQt4\*
431
443
    # Which is not the same as C:\Python25\Lib\site-packages\PyQt4
473
485
    packages.append('sqlite3')
474
486
 
475
487
 
 
488
def get_git_py2exe_info(includes, excludes, packages):
 
489
    packages.append('dulwich')
 
490
 
 
491
 
 
492
def get_fastimport_py2exe_info(includes, excludes, packages):
 
493
    # This is the python-fastimport package, not to be confused with the
 
494
    # brz-fastimport plugin.
 
495
    packages.append('fastimport')
 
496
 
 
497
 
476
498
if 'bdist_wininst' in sys.argv:
477
499
    def find_docs():
478
500
        docs = []
485
507
            if r:
486
508
                relative = root[4:]
487
509
                if relative:
488
 
                    target = os.path.join('Doc\\Bazaar', relative)
 
510
                    target = os.path.join('Doc\\Breezy', relative)
489
511
                else:
490
 
                    target = 'Doc\\Bazaar'
 
512
                    target = 'Doc\\Breezy'
491
513
                docs.append((target, r))
492
514
        return docs
493
515
 
494
516
    # python's distutils-based win32 installer
495
 
    ARGS = {'scripts': ['bzr', 'tools/win32/bzr-win32-bdist-postinstall.py'],
 
517
    ARGS = {'scripts': ['brz', 'tools/win32/brz-win32-bdist-postinstall.py'],
496
518
            'ext_modules': ext_modules,
497
519
            # help pages
498
520
            'data_files': find_docs(),
499
521
            # for building pyrex extensions
500
 
            'cmdclass': {'build_ext': build_ext_if_possible},
 
522
            'cmdclass': command_classes,
501
523
           }
502
524
 
503
525
    ARGS.update(META_INFO)
504
526
    ARGS.update(BZRLIB)
 
527
    PKG_DATA['package_data']['breezy'].append('locale/*/LC_MESSAGES/*.mo')
505
528
    ARGS.update(PKG_DATA)
506
 
    
 
529
 
507
530
    setup(**ARGS)
508
531
 
509
532
elif 'py2exe' in sys.argv:
510
 
    import glob
511
533
    # py2exe setup
512
534
    import py2exe
513
535
 
514
 
    # pick real bzr version
515
 
    import bzrlib
 
536
    # pick real brz version
 
537
    import breezy
516
538
 
517
539
    version_number = []
518
 
    for i in bzrlib.version_info[:4]:
 
540
    for i in breezy.version_info[:4]:
519
541
        try:
520
542
            i = int(i)
521
543
        except ValueError:
534
556
            install_data.run(self)
535
557
 
536
558
            py2exe = self.distribution.get_command_obj('py2exe', False)
537
 
            optimize = py2exe.optimize
 
559
            # GZ 2010-04-19: Setup has py2exe.optimize as 2, but give plugins
 
560
            #                time before living with docstring stripping
 
561
            optimize = 1
538
562
            compile_names = [f for f in self.outfiles if f.endswith('.py')]
 
563
            # Round mtime to nearest even second so that installing on a FAT
 
564
            # filesystem bytecode internal and script timestamps will match
 
565
            for f in compile_names:
 
566
                mtime = os.stat(f).st_mtime
 
567
                remainder = mtime % 2
 
568
                if remainder:
 
569
                    mtime -= remainder
 
570
                    os.utime(f, (mtime, mtime))
539
571
            byte_compile(compile_names,
540
572
                         optimize=optimize,
541
573
                         force=self.force, prefix=self.install_dir,
542
574
                         dry_run=self.dry_run)
543
 
            if optimize:
544
 
                suffix = 'o'
545
 
            else:
546
 
                suffix = 'c'
547
 
            self.outfiles.extend([f + suffix for f in compile_names])
 
575
            self.outfiles.extend([f + 'o' for f in compile_names])
548
576
    # end of class install_data_with_bytecompile
549
577
 
550
 
    target = py2exe.build_exe.Target(script = "bzr",
551
 
                                     dest_base = "bzr",
552
 
                                     icon_resources = [(0,'bzr.ico')],
 
578
    target = py2exe.build_exe.Target(script = "brz",
 
579
                                     dest_base = "brz",
 
580
                                     icon_resources = [(0,'brz.ico')],
553
581
                                     name = META_INFO['name'],
554
582
                                     version = version_str,
555
583
                                     description = META_INFO['description'],
558
586
                                     company_name = "Canonical Ltd.",
559
587
                                     comments = META_INFO['description'],
560
588
                                    )
 
589
    gui_target = copy.copy(target)
 
590
    gui_target.dest_base = "bzrw"
561
591
 
562
592
    packages = BZRLIB['packages']
563
 
    packages.remove('bzrlib')
564
 
    packages = [i for i in packages if not i.startswith('bzrlib.plugins')]
 
593
    packages.remove('breezy')
 
594
    packages = [i for i in packages if not i.startswith('breezy.plugins')]
565
595
    includes = []
566
 
    for i in glob.glob('bzrlib\\*.py'):
 
596
    for i in glob.glob('breezy\\*.py'):
567
597
        module = i[:-3].replace('\\', '.')
568
598
        if module.endswith('__init__'):
569
599
            module = module[:-len('__init__')]
604
634
        excludes.append("email.MIME" + oldname)
605
635
 
606
636
    # text files for help topis
607
 
    text_topics = glob.glob('bzrlib/help_topics/en/*.txt')
 
637
    text_topics = glob.glob('breezy/help_topics/en/*.txt')
608
638
    topics_files = [('lib/help_topics/en', text_topics)]
609
639
 
610
640
    # built-in plugins
613
643
    # which hard-codes the list of plugins, gets more upset if modules are
614
644
    # missing, etc?
615
645
    plugins = None # will be a set after plugin sniffing...
616
 
    for root, dirs, files in os.walk('bzrlib/plugins'):
617
 
        if root == 'bzrlib/plugins':
 
646
    for root, dirs, files in os.walk('breezy/plugins'):
 
647
        if root == 'breezy/plugins':
618
648
            plugins = set(dirs)
619
649
            # We ship plugins as normal files on the file-system - however,
620
650
            # the build process can cause *some* of these plugin files to end
622
652
            # library.zip, and then saw import errors related to that as the
623
653
            # rest of the svn plugin wasn't. So we tell py2exe to leave the
624
654
            # plugins out of the .zip file
625
 
            excludes.extend(["bzrlib.plugins." + d for d in dirs])
 
655
            excludes.extend(["breezy.plugins." + d for d in dirs])
626
656
        x = []
627
657
        for i in files:
628
658
            # Throw away files we don't want packaged. Note that plugins may
631
661
            ext = os.path.splitext(i)[1]
632
662
            if ext.endswith('~') or ext in [".pyc", ".swp"]:
633
663
                continue
634
 
            if i == '__init__.py' and root == 'bzrlib/plugins':
 
664
            if i == '__init__.py' and root == 'breezy/plugins':
635
665
                continue
636
666
            x.append(os.path.join(root, i))
637
667
        if x:
638
 
            target_dir = root[len('bzrlib/'):]  # install to 'plugins/...'
 
668
            target_dir = root[len('breezy/'):]  # install to 'plugins/...'
639
669
            plugins_files.append((target_dir, x))
640
670
    # find modules for built-in plugins
641
671
    import tools.package_mf
642
672
    mf = tools.package_mf.CustomModuleFinder()
643
 
    mf.run_package('bzrlib/plugins')
 
673
    mf.run_package('breezy/plugins')
644
674
    packs, mods = mf.get_result()
645
675
    additional_packages.update(packs)
646
676
    includes.extend(mods)
648
678
    console_targets = [target,
649
679
                       'tools/win32/bzr_postinstall.py',
650
680
                       ]
651
 
    gui_targets = []
652
 
    data_files = topics_files + plugins_files
 
681
    gui_targets = [gui_target]
 
682
    data_files = topics_files + plugins_files + I18N_FILES
653
683
 
654
684
    if 'qbzr' in plugins:
655
685
        get_qbzr_py2exe_info(includes, excludes, packages, data_files)
657
687
    if 'svn' in plugins:
658
688
        get_svn_py2exe_info(includes, excludes, packages)
659
689
 
 
690
    if 'git' in plugins:
 
691
        get_git_py2exe_info(includes, excludes, packages)
 
692
 
 
693
    if 'fastimport' in plugins:
 
694
        get_fastimport_py2exe_info(includes, excludes, packages)
 
695
 
660
696
    if "TBZR" in os.environ:
661
697
        # TORTOISE_OVERLAYS_MSI_WIN32 must be set to the location of the
662
698
        # TortoiseOverlays MSI installer file. It is in the TSVN svn repo and
681
717
        # print this warning to stderr as output is redirected, so it is seen
682
718
        # at build time.  Also to stdout so it appears in the log
683
719
        for f in (sys.stderr, sys.stdout):
684
 
            print >> f, \
685
 
                "Skipping TBZR binaries - please set TBZR to a directory to enable"
 
720
            f.write("Skipping TBZR binaries - "
 
721
                "please set TBZR to a directory to enable\n")
686
722
 
687
723
    # MSWSOCK.dll is a system-specific library, which py2exe accidentally pulls
688
724
    # in on Vista.
689
 
    dll_excludes.extend(["MSWSOCK.dll", "MSVCP60.dll", "powrprof.dll"])
 
725
    dll_excludes.extend(["MSWSOCK.dll",
 
726
                         "MSVCP60.dll",
 
727
                         "MSVCP90.dll",
 
728
                         "powrprof.dll",
 
729
                         "SHFOLDER.dll"])
690
730
    options_list = {"py2exe": {"packages": packages + list(additional_packages),
691
731
                               "includes": includes,
692
732
                               "excludes": excludes,
693
733
                               "dll_excludes": dll_excludes,
694
734
                               "dist_dir": "win32_bzr.exe",
695
 
                               "optimize": 1,
 
735
                               "optimize": 2,
 
736
                               "custom_boot_script":
 
737
                                        "tools/win32/py2exe_boot_common.py",
696
738
                              },
697
739
                   }
698
740
 
699
 
    setup(options=options_list,
700
 
          console=console_targets,
701
 
          windows=gui_targets,
702
 
          zipfile='lib/library.zip',
703
 
          data_files=data_files,
704
 
          cmdclass={'install_data': install_data_with_bytecompile},
705
 
          )
 
741
    # We want the libaray.zip to have optimize = 2, but the exe to have
 
742
    # optimize = 1, so that .py files that get compilied at run time
 
743
    # (e.g. user installed plugins) dont have their doc strings removed.
 
744
    class py2exe_no_oo_exe(py2exe.build_exe.py2exe):
 
745
        def build_executable(self, *args, **kwargs):
 
746
            self.optimize = 1
 
747
            py2exe.build_exe.py2exe.build_executable(self, *args, **kwargs)
 
748
            self.optimize = 2
 
749
 
 
750
    if __name__ == '__main__':
 
751
        command_classes['install_data'] = install_data_with_bytecompile
 
752
        command_classes['py2exe'] = py2exe_no_oo_exe
 
753
        setup(options=options_list,
 
754
              console=console_targets,
 
755
              windows=gui_targets,
 
756
              zipfile='lib/library.zip',
 
757
              data_files=data_files,
 
758
              cmdclass=command_classes,
 
759
              )
706
760
 
707
761
else:
708
762
    # ad-hoc for easy_install
709
763
    DATA_FILES = []
710
764
    if not 'bdist_egg' in sys.argv:
711
 
        # generate and install bzr.1 only with plain install, not the
 
765
        # generate and install brz.1 only with plain install, not the
712
766
        # easy_install one
713
 
        DATA_FILES = [('man/man1', ['bzr.1'])]
714
 
 
715
 
    if sys.platform != 'win32':
716
 
        # see https://wiki.kubuntu.org/Apport/DeveloperHowTo
717
 
        #
718
 
        # checking the paths and hardcoding the check for root is a bit gross,
719
 
        # but I don't see a cleaner way to find out the locations in a way
720
 
        # that's going to align with the hardcoded paths in apport.
721
 
        if os.geteuid() == 0:
722
 
            DATA_FILES += [
723
 
                ('/usr/share/apport/package-hooks',
724
 
                    ['apport/source_bzr.py']),
725
 
                ('/etc/apport/crashdb.conf.d/',
726
 
                    ['apport/bzr-crashdb.conf']),]
727
 
 
 
767
        DATA_FILES = [('man/man1', ['brz.1'])]
 
768
 
 
769
    DATA_FILES = DATA_FILES + I18N_FILES
728
770
    # std setup
729
 
    ARGS = {'scripts': ['bzr'],
 
771
    ARGS = {'scripts': ['brz'],
730
772
            'data_files': DATA_FILES,
731
773
            'cmdclass': command_classes,
732
774
            'ext_modules': ext_modules,
736
778
    ARGS.update(BZRLIB)
737
779
    ARGS.update(PKG_DATA)
738
780
 
739
 
    setup(**ARGS)
 
781
    if __name__ == '__main__':
 
782
        setup(**ARGS)