← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to setup.py

  • Committer: Vincent Ladeuil
  • Date: 2010-02-10 15:46:03 UTC
  • mfrom: (4985.3.21 update)
  • mto: This revision was merged to the branch mainline in revision 5021.
  • Revision ID: v.ladeuil+lp@free.fr-20100210154603-k4no1gvfuqpzrw7p
https://launchpad.net/bugs/113809
Update performs two merges in a more logical order but stop on conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
setup.py
37
37
    'version':      bzrlib.__version__,
38
38
    'author':       'Canonical Ltd',
39
39
    'author_email': 'bazaar@lists.canonical.com',
40
 
    'url':          'http://www.bazaar-vcs.org/',
 
40
    'url':          'http://www.bazaar.canonical.com/',
41
41
    'description':  'Friendly distributed version control system',
42
42
    'license':      'GNU GPL v2',
43
 
    'download_url': 'http://bazaar-vcs.org/Download',
 
43
    'download_url': 'https://launchpad.net/bzr/+download',
44
44
    'long_description': get_long_description(),
45
45
    'classifiers': [
46
46
        'Development Status :: 6 - Mature',
65
65
            'package_data': {'bzrlib': ['doc/api/*.txt',
66
66
                                        'tests/test_patches_data/*',
67
67
                                        'help_topics/en/*.txt',
 
68
                                        'tests/ssl_certs/server_without_pass.key',
 
69
                                        'tests/ssl_certs/server_with_pass.key',
 
70
                                        'tests/ssl_certs/server.crt'
68
71
                                       ]},
69
72
           }
70
73
 
93
96
BZRLIB['packages'] = get_bzrlib_packages()
94
97
 
95
98
 
 
99
from distutils import log
96
100
from distutils.core import setup
97
101
from distutils.command.install_scripts import install_scripts
98
102
from distutils.command.install_data import install_data
148
152
    def run(self):
149
153
        build.run(self)
150
154
 
151
 
        import generate_docs
 
155
        from tools import generate_docs
152
156
        generate_docs.main(argv=["bzr", "man"])
153
157
 
154
158
 
163
167
from distutils.extension import Extension
164
168
ext_modules = []
165
169
try:
166
 
    from Pyrex.Distutils import build_ext
 
170
    try:
 
171
        from Pyrex.Distutils import build_ext
 
172
        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
167
177
except ImportError:
168
178
    have_pyrex = False
169
179
    # try to build the extension from the prior generated source.
176
186
    from distutils.command.build_ext import build_ext
177
187
else:
178
188
    have_pyrex = True
179
 
    from Pyrex.Compiler.Version import version as pyrex_version
180
189
 
181
190
 
182
191
class build_ext_if_possible(build_ext):
209
218
            build_ext.build_extension(self, ext)
210
219
        except CCompilerError:
211
220
            if not self.allow_python_fallback:
212
 
                log.warn('\n  Cannot build extensions.\n'
 
221
                log.warn('\n  Cannot build extension "%s".\n'
213
222
                         '  Use "build_ext --allow-python-fallback" to use'
214
223
                         ' slower python implementations instead.\n'
215
224
                         % (ext.name,))
224
233
unavailable_files = []
225
234
 
226
235
 
227
 
def add_pyrex_extension(module_name, libraries=None):
 
236
def add_pyrex_extension(module_name, libraries=None, extra_source=[]):
228
237
    """Add a pyrex module to build.
229
238
 
230
239
    This will use Pyrex to auto-generate the .c file if it is available.
242
251
    c_name = path + '.c'
243
252
    define_macros = []
244
253
    if sys.platform == 'win32':
245
 
        # pyrex uses the macro WIN32 to detect the platform, even though it should
246
 
        # be using something like _WIN32 or MS_WINDOWS, oh well, we can give it the
247
 
        # right value.
 
254
        # pyrex uses the macro WIN32 to detect the platform, even though it
 
255
        # should be using something like _WIN32 or MS_WINDOWS, oh well, we can
 
256
        # give it the right value.
248
257
        define_macros.append(('WIN32', None))
249
258
    if have_pyrex:
250
 
        ext_modules.append(Extension(module_name, [pyrex_name],
251
 
            define_macros=define_macros, libraries=libraries))
 
259
        source = [pyrex_name]
252
260
    else:
253
261
        if not os.path.isfile(c_name):
254
262
            unavailable_files.append(c_name)
 
263
            return
255
264
        else:
256
 
            ext_modules.append(Extension(module_name, [c_name],
257
 
                define_macros=define_macros, libraries=libraries))
258
 
 
259
 
 
260
 
add_pyrex_extension('bzrlib._btree_serializer_c')
 
265
            source = [c_name]
 
266
    source.extend(extra_source)
 
267
    ext_modules.append(Extension(module_name, source,
 
268
        define_macros=define_macros, libraries=libraries))
 
269
 
 
270
 
 
271
add_pyrex_extension('bzrlib._annotator_pyx')
 
272
add_pyrex_extension('bzrlib._bencode_pyx')
261
273
add_pyrex_extension('bzrlib._chunks_to_lines_pyx')
262
 
add_pyrex_extension('bzrlib._knit_load_data_c')
 
274
add_pyrex_extension('bzrlib._groupcompress_pyx',
 
275
                    extra_source=['bzrlib/diff-delta.c'])
 
276
add_pyrex_extension('bzrlib._knit_load_data_pyx')
 
277
add_pyrex_extension('bzrlib._known_graph_pyx')
 
278
add_pyrex_extension('bzrlib._rio_pyx')
263
279
if sys.platform == 'win32':
264
 
    add_pyrex_extension('bzrlib._dirstate_helpers_c',
 
280
    add_pyrex_extension('bzrlib._dirstate_helpers_pyx',
265
281
                        libraries=['Ws2_32'])
266
282
    add_pyrex_extension('bzrlib._walkdirs_win32')
 
283
    z_lib = 'zdll'
267
284
else:
268
 
    if have_pyrex and pyrex_version == '0.9.4.1':
 
285
    if have_pyrex and pyrex_version.startswith('0.9.4'):
269
286
        # Pyrex 0.9.4.1 fails to compile this extension correctly
270
287
        # The code it generates re-uses a "local" pointer and
271
288
        # calls "PY_DECREF" after having set it to NULL. (It mixes PY_XDECREF
272
289
        # which is NULL safe with PY_DECREF which is not.)
273
 
        print 'Cannot build extension "bzrlib._dirstate_helpers_c" using'
 
290
        # <https://bugs.edge.launchpad.net/bzr/+bug/449372>
 
291
        # <https://bugs.edge.launchpad.net/bzr/+bug/276868>
 
292
        print 'Cannot build extension "bzrlib._dirstate_helpers_pyx" using'
274
293
        print 'your version of pyrex "%s". Please upgrade your pyrex' % (
275
294
            pyrex_version,)
276
295
        print 'install. For now, the non-compiled (python) version will'
277
296
        print 'be used instead.'
278
297
    else:
279
 
        add_pyrex_extension('bzrlib._dirstate_helpers_c')
 
298
        add_pyrex_extension('bzrlib._dirstate_helpers_pyx')
280
299
    add_pyrex_extension('bzrlib._readdir_pyx')
281
 
ext_modules.append(Extension('bzrlib._patiencediff_c', ['bzrlib/_patiencediff_c.c']))
 
300
    z_lib = 'z'
 
301
add_pyrex_extension('bzrlib._chk_map_pyx', libraries=[z_lib])
 
302
ext_modules.append(Extension('bzrlib._patiencediff_c',
 
303
                             ['bzrlib/_patiencediff_c.c']))
 
304
add_pyrex_extension('bzrlib._simple_set_pyx')
 
305
ext_modules.append(Extension('bzrlib._static_tuple_c',
 
306
                             ['bzrlib/_static_tuple_c.c']))
 
307
add_pyrex_extension('bzrlib._btree_serializer_pyx')
282
308
 
283
309
 
284
310
if unavailable_files:
311
337
    # Ensure tbzrlib itself is on sys.path
312
338
    sys.path.append(tbzr_root)
313
339
 
314
 
    # Ensure our COM "entry-point" is on sys.path
315
 
    sys.path.append(os.path.join(tbzr_root, "shellext", "python"))
316
 
 
317
340
    packages.append("tbzrlib")
318
341
 
319
342
    # collect up our icons.
341
364
    excludes.extend("""pywin pywin.dialogs pywin.dialogs.list
342
365
                       win32ui crawler.Crawler""".split())
343
366
 
344
 
    # NOTE: We still create a DLL version of the Python implemented shell
345
 
    # extension for testing purposes - but it is *not* registered by
346
 
    # default - our C++ one is instead.  To discourage people thinking
347
 
    # this DLL is still necessary, its called 'tbzr_old.dll'
348
 
    tbzr = dict(
349
 
        modules=["tbzr"],
350
 
        create_exe = False, # we only want a .dll
351
 
        dest_base = 'tbzr_old',
352
 
    )
353
 
    com_targets.append(tbzr)
354
 
 
355
367
    # tbzrcache executables - a "console" version for debugging and a
356
368
    # GUI version that is generally used.
357
369
    tbzrcache = dict(
382
394
    console_targets.append(tracer)
383
395
 
384
396
    # The C++ implemented shell extensions.
385
 
    dist_dir = os.path.join(tbzr_root, "shellext", "cpp", "tbzrshellext",
386
 
                            "build", "dist")
 
397
    dist_dir = os.path.join(tbzr_root, "shellext", "build")
387
398
    data_files.append(('', [os.path.join(dist_dir, 'tbzrshellext_x86.dll')]))
388
399
    data_files.append(('', [os.path.join(dist_dir, 'tbzrshellext_x64.dll')]))
389
400
 
390
401
 
391
 
def get_qbzr_py2exe_info(includes, excludes, packages):
 
402
def get_qbzr_py2exe_info(includes, excludes, packages, data_files):
392
403
    # PyQt4 itself still escapes the plugin detection code for some reason...
393
404
    packages.append('PyQt4')
394
405
    excludes.append('PyQt4.elementtree.ElementTree')
 
406
    excludes.append('PyQt4.uic.port_v3')
395
407
    includes.append('sip') # extension module required for Qt.
396
408
    packages.append('pygments') # colorizer for qbzr
397
409
    packages.append('docutils') # html formatting
 
410
    includes.append('win32event')  # for qsubprocess stuff
398
411
    # but we can avoid many Qt4 Dlls.
399
412
    dll_excludes.extend(
400
413
        """QtAssistantClient4.dll QtCLucene4.dll QtDesigner4.dll
402
415
        QtSql4.dll QtTest4.dll QtWebKit4.dll QtXml4.dll
403
416
        qscintilla2.dll""".split())
404
417
    # the qt binaries might not be on PATH...
405
 
    qt_dir = os.path.join(sys.prefix, "PyQt4", "bin")
406
 
    path = os.environ.get("PATH","")
407
 
    if qt_dir.lower() not in [p.lower() for p in path.split(os.pathsep)]:
408
 
        os.environ["PATH"] = path + os.pathsep + qt_dir
 
418
    # They seem to install to a place like C:\Python25\PyQt4\*
 
419
    # Which is not the same as C:\Python25\Lib\site-packages\PyQt4
 
420
    pyqt_dir = os.path.join(sys.prefix, "PyQt4")
 
421
    pyqt_bin_dir = os.path.join(pyqt_dir, "bin")
 
422
    if os.path.isdir(pyqt_bin_dir):
 
423
        path = os.environ.get("PATH", "")
 
424
        if pyqt_bin_dir.lower() not in [p.lower() for p in path.split(os.pathsep)]:
 
425
            os.environ["PATH"] = path + os.pathsep + pyqt_bin_dir
 
426
    # also add all imageformat plugins to distribution
 
427
    # We will look in 2 places, dirname(PyQt4.__file__) and pyqt_dir
 
428
    base_dirs_to_check = []
 
429
    if os.path.isdir(pyqt_dir):
 
430
        base_dirs_to_check.append(pyqt_dir)
 
431
    try:
 
432
        import PyQt4
 
433
    except ImportError:
 
434
        pass
 
435
    else:
 
436
        pyqt4_base_dir = os.path.dirname(PyQt4.__file__)
 
437
        if pyqt4_base_dir != pyqt_dir:
 
438
            base_dirs_to_check.append(pyqt4_base_dir)
 
439
    if not base_dirs_to_check:
 
440
        log.warn("Can't find PyQt4 installation -> not including imageformat"
 
441
                 " plugins")
 
442
    else:
 
443
        files = []
 
444
        for base_dir in base_dirs_to_check:
 
445
            plug_dir = os.path.join(base_dir, 'plugins', 'imageformats')
 
446
            if os.path.isdir(plug_dir):
 
447
                for fname in os.listdir(plug_dir):
 
448
                    # Include plugin dlls, but not debugging dlls
 
449
                    fullpath = os.path.join(plug_dir, fname)
 
450
                    if fname.endswith('.dll') and not fname.endswith('d4.dll'):
 
451
                        files.append(fullpath)
 
452
        if files:
 
453
            data_files.append(('imageformats', files))
 
454
        else:
 
455
            log.warn('PyQt4 was found, but we could not find any imageformat'
 
456
                     ' plugins. Are you sure your configuration is correct?')
 
457
 
 
458
 
 
459
def get_svn_py2exe_info(includes, excludes, packages):
 
460
    packages.append('subvertpy')
409
461
 
410
462
 
411
463
if 'bdist_wininst' in sys.argv:
489
541
                                     version = version_str,
490
542
                                     description = META_INFO['description'],
491
543
                                     author = META_INFO['author'],
492
 
                                     copyright = "(c) Canonical Ltd, 2005-2007",
 
544
                                     copyright = "(c) Canonical Ltd, 2005-2009",
493
545
                                     company_name = "Canonical Ltd.",
494
546
                                     comments = META_INFO['description'],
495
547
                                    )
522
574
                  ImaginaryModule cElementTree elementtree.ElementTree
523
575
                  Crypto.PublicKey._fastmath
524
576
                  medusa medusa.filesys medusa.ftp_server
525
 
                  tools tools.doc_generate
 
577
                  tools
526
578
                  resource validate""".split()
527
579
    dll_excludes = []
528
580
 
580
632
                       'tools/win32/bzr_postinstall.py',
581
633
                       ]
582
634
    gui_targets = []
583
 
    com_targets = []
584
635
    data_files = topics_files + plugins_files
585
636
 
586
637
    if 'qbzr' in plugins:
587
 
        get_qbzr_py2exe_info(includes, excludes, packages)
 
638
        get_qbzr_py2exe_info(includes, excludes, packages, data_files)
 
639
 
 
640
    if 'svn' in plugins:
 
641
        get_svn_py2exe_info(includes, excludes, packages)
588
642
 
589
643
    if "TBZR" in os.environ:
590
644
        # TORTOISE_OVERLAYS_MSI_WIN32 must be set to the location of the
591
645
        # TortoiseOverlays MSI installer file. It is in the TSVN svn repo and
592
646
        # can be downloaded from (username=guest, blank password):
593
 
        # http://tortoisesvn.tigris.org/svn/tortoisesvn/TortoiseOverlays/version-1.0.4/bin/TortoiseOverlays-1.0.4.11886-win32.msi
 
647
        # http://tortoisesvn.tigris.org/svn/tortoisesvn/TortoiseOverlays
 
648
        # look for: version-1.0.4/bin/TortoiseOverlays-1.0.4.11886-win32.msi
594
649
        # Ditto for TORTOISE_OVERLAYS_MSI_X64, pointing at *-x64.msi.
595
650
        for needed in ('TORTOISE_OVERLAYS_MSI_WIN32',
596
651
                       'TORTOISE_OVERLAYS_MSI_X64'):
 
652
            url = ('http://guest:@tortoisesvn.tigris.org/svn/tortoisesvn'
 
653
                   '/TortoiseOverlays')
597
654
            if not os.path.isfile(os.environ.get(needed, '<nofile>')):
598
 
                raise RuntimeError("Please set %s to the"
599
 
                                   " location of the relevant TortoiseOverlays"
600
 
                                   " .msi installer file" % needed)
 
655
                raise RuntimeError(
 
656
                    "\nPlease set %s to the location of the relevant"
 
657
                    "\nTortoiseOverlays .msi installer file."
 
658
                    " The installers can be found at"
 
659
                    "\n  %s"
 
660
                    "\ncheck in the version-X.Y.Z/bin/ subdir" % (needed, url))
601
661
        get_tbzr_py2exe_info(includes, excludes, packages, console_targets,
602
662
                             gui_targets, data_files)
603
663
    else:
609
669
 
610
670
    # MSWSOCK.dll is a system-specific library, which py2exe accidentally pulls
611
671
    # in on Vista.
612
 
    dll_excludes.append("MSWSOCK.dll")
 
672
    dll_excludes.extend(["MSWSOCK.dll", "MSVCP60.dll", "powrprof.dll"])
613
673
    options_list = {"py2exe": {"packages": packages + list(additional_packages),
614
674
                               "includes": includes,
615
675
                               "excludes": excludes,
622
682
    setup(options=options_list,
623
683
          console=console_targets,
624
684
          windows=gui_targets,
625
 
          com_server=com_targets,
626
685
          zipfile='lib/library.zip',
627
686
          data_files=data_files,
628
687
          cmdclass={'install_data': install_data_with_bytecompile},
632
691
    # ad-hoc for easy_install
633
692
    DATA_FILES = []
634
693
    if not 'bdist_egg' in sys.argv:
635
 
        # generate and install bzr.1 only with plain install, not easy_install one
 
694
        # generate and install bzr.1 only with plain install, not the
 
695
        # easy_install one
636
696
        DATA_FILES = [('man/man1', ['bzr.1'])]
637
697
 
638
698
    # std setup