← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to setup.py

  • Committer: John Arbash Meinel
  • Date: 2009-03-06 20:42:40 UTC
  • mto: This revision was merged to the branch mainline in revision 4088.
  • Revision ID: john@arbash-meinel.com-20090306204240-mzjavv31z3gu1x7i
Fix a small bug in setup.py when an extension fails to build

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.canonical.com/',
 
40
    'url':          'http://www.bazaar-vcs.org/',
41
41
    'description':  'Friendly distributed version control system',
42
42
    'license':      'GNU GPL v2',
43
 
    'download_url': 'https://launchpad.net/bzr/+download',
 
43
    'download_url': 'http://bazaar-vcs.org/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'
71
68
                                       ]},
72
69
           }
73
70
 
96
93
BZRLIB['packages'] = get_bzrlib_packages()
97
94
 
98
95
 
99
 
from distutils import log
100
96
from distutils.core import setup
101
97
from distutils.command.install_scripts import install_scripts
102
98
from distutils.command.install_data import install_data
152
148
    def run(self):
153
149
        build.run(self)
154
150
 
155
 
        from tools import generate_docs
 
151
        import generate_docs
156
152
        generate_docs.main(argv=["bzr", "man"])
157
153
 
158
154
 
167
163
from distutils.extension import Extension
168
164
ext_modules = []
169
165
try:
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
 
166
    from Pyrex.Distutils import build_ext
177
167
except ImportError:
178
168
    have_pyrex = False
179
169
    # try to build the extension from the prior generated source.
186
176
    from distutils.command.build_ext import build_ext
187
177
else:
188
178
    have_pyrex = True
 
179
    from Pyrex.Compiler.Version import version as pyrex_version
189
180
 
190
181
 
191
182
class build_ext_if_possible(build_ext):
233
224
unavailable_files = []
234
225
 
235
226
 
236
 
def add_pyrex_extension(module_name, libraries=None, extra_source=[]):
 
227
def add_pyrex_extension(module_name, libraries=None):
237
228
    """Add a pyrex module to build.
238
229
 
239
230
    This will use Pyrex to auto-generate the .c file if it is available.
251
242
    c_name = path + '.c'
252
243
    define_macros = []
253
244
    if sys.platform == 'win32':
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.
 
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.
257
248
        define_macros.append(('WIN32', None))
258
249
    if have_pyrex:
259
 
        source = [pyrex_name]
 
250
        ext_modules.append(Extension(module_name, [pyrex_name],
 
251
            define_macros=define_macros, libraries=libraries))
260
252
    else:
261
253
        if not os.path.isfile(c_name):
262
254
            unavailable_files.append(c_name)
263
 
            return
264
255
        else:
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')
 
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')
273
261
add_pyrex_extension('bzrlib._chunks_to_lines_pyx')
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')
 
262
add_pyrex_extension('bzrlib._knit_load_data_c')
279
263
if sys.platform == 'win32':
280
 
    add_pyrex_extension('bzrlib._dirstate_helpers_pyx',
 
264
    add_pyrex_extension('bzrlib._dirstate_helpers_c',
281
265
                        libraries=['Ws2_32'])
282
266
    add_pyrex_extension('bzrlib._walkdirs_win32')
283
 
    z_lib = 'zdll'
284
267
else:
285
 
    if have_pyrex and pyrex_version.startswith('0.9.4'):
 
268
    if have_pyrex and pyrex_version == '0.9.4.1':
286
269
        # Pyrex 0.9.4.1 fails to compile this extension correctly
287
270
        # The code it generates re-uses a "local" pointer and
288
271
        # calls "PY_DECREF" after having set it to NULL. (It mixes PY_XDECREF
289
272
        # which is NULL safe with PY_DECREF which is not.)
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'
 
273
        print 'Cannot build extension "bzrlib._dirstate_helpers_c" using'
293
274
        print 'your version of pyrex "%s". Please upgrade your pyrex' % (
294
275
            pyrex_version,)
295
276
        print 'install. For now, the non-compiled (python) version will'
296
277
        print 'be used instead.'
297
278
    else:
298
 
        add_pyrex_extension('bzrlib._dirstate_helpers_pyx')
 
279
        add_pyrex_extension('bzrlib._dirstate_helpers_c')
299
280
    add_pyrex_extension('bzrlib._readdir_pyx')
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')
 
281
ext_modules.append(Extension('bzrlib._patiencediff_c', ['bzrlib/_patiencediff_c.c']))
308
282
 
309
283
 
310
284
if unavailable_files:
337
311
    # Ensure tbzrlib itself is on sys.path
338
312
    sys.path.append(tbzr_root)
339
313
 
 
314
    # Ensure our COM "entry-point" is on sys.path
 
315
    sys.path.append(os.path.join(tbzr_root, "shellext", "python"))
 
316
 
340
317
    packages.append("tbzrlib")
341
318
 
342
319
    # collect up our icons.
364
341
    excludes.extend("""pywin pywin.dialogs pywin.dialogs.list
365
342
                       win32ui crawler.Crawler""".split())
366
343
 
 
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
 
367
355
    # tbzrcache executables - a "console" version for debugging and a
368
356
    # GUI version that is generally used.
369
357
    tbzrcache = dict(
394
382
    console_targets.append(tracer)
395
383
 
396
384
    # The C++ implemented shell extensions.
397
 
    dist_dir = os.path.join(tbzr_root, "shellext", "build")
 
385
    dist_dir = os.path.join(tbzr_root, "shellext", "cpp", "tbzrshellext",
 
386
                            "build", "dist")
398
387
    data_files.append(('', [os.path.join(dist_dir, 'tbzrshellext_x86.dll')]))
399
388
    data_files.append(('', [os.path.join(dist_dir, 'tbzrshellext_x64.dll')]))
400
389
 
401
390
 
402
 
def get_qbzr_py2exe_info(includes, excludes, packages, data_files):
 
391
def get_qbzr_py2exe_info(includes, excludes, packages):
403
392
    # PyQt4 itself still escapes the plugin detection code for some reason...
404
393
    packages.append('PyQt4')
405
394
    excludes.append('PyQt4.elementtree.ElementTree')
406
 
    excludes.append('PyQt4.uic.port_v3')
407
395
    includes.append('sip') # extension module required for Qt.
408
396
    packages.append('pygments') # colorizer for qbzr
409
397
    packages.append('docutils') # html formatting
410
 
    includes.append('win32event')  # for qsubprocess stuff
411
398
    # but we can avoid many Qt4 Dlls.
412
399
    dll_excludes.extend(
413
400
        """QtAssistantClient4.dll QtCLucene4.dll QtDesigner4.dll
415
402
        QtSql4.dll QtTest4.dll QtWebKit4.dll QtXml4.dll
416
403
        qscintilla2.dll""".split())
417
404
    # the qt binaries might not be on PATH...
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?')
 
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
457
409
 
458
410
 
459
411
def get_svn_py2exe_info(includes, excludes, packages):
541
493
                                     version = version_str,
542
494
                                     description = META_INFO['description'],
543
495
                                     author = META_INFO['author'],
544
 
                                     copyright = "(c) Canonical Ltd, 2005-2009",
 
496
                                     copyright = "(c) Canonical Ltd, 2005-2007",
545
497
                                     company_name = "Canonical Ltd.",
546
498
                                     comments = META_INFO['description'],
547
499
                                    )
574
526
                  ImaginaryModule cElementTree elementtree.ElementTree
575
527
                  Crypto.PublicKey._fastmath
576
528
                  medusa medusa.filesys medusa.ftp_server
577
 
                  tools
 
529
                  tools tools.doc_generate
578
530
                  resource validate""".split()
579
531
    dll_excludes = []
580
532
 
632
584
                       'tools/win32/bzr_postinstall.py',
633
585
                       ]
634
586
    gui_targets = []
 
587
    com_targets = []
635
588
    data_files = topics_files + plugins_files
636
589
 
637
590
    if 'qbzr' in plugins:
638
 
        get_qbzr_py2exe_info(includes, excludes, packages, data_files)
 
591
        get_qbzr_py2exe_info(includes, excludes, packages)
639
592
 
640
593
    if 'svn' in plugins:
641
594
        get_svn_py2exe_info(includes, excludes, packages)
644
597
        # TORTOISE_OVERLAYS_MSI_WIN32 must be set to the location of the
645
598
        # TortoiseOverlays MSI installer file. It is in the TSVN svn repo and
646
599
        # can be downloaded from (username=guest, blank password):
647
 
        # http://tortoisesvn.tigris.org/svn/tortoisesvn/TortoiseOverlays
648
 
        # look for: version-1.0.4/bin/TortoiseOverlays-1.0.4.11886-win32.msi
 
600
        # http://tortoisesvn.tigris.org/svn/tortoisesvn/TortoiseOverlays/version-1.0.4/bin/TortoiseOverlays-1.0.4.11886-win32.msi
649
601
        # Ditto for TORTOISE_OVERLAYS_MSI_X64, pointing at *-x64.msi.
650
602
        for needed in ('TORTOISE_OVERLAYS_MSI_WIN32',
651
603
                       'TORTOISE_OVERLAYS_MSI_X64'):
652
 
            url = ('http://guest:@tortoisesvn.tigris.org/svn/tortoisesvn'
653
 
                   '/TortoiseOverlays')
654
604
            if not os.path.isfile(os.environ.get(needed, '<nofile>')):
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))
 
605
                raise RuntimeError("Please set %s to the"
 
606
                                   " location of the relevant TortoiseOverlays"
 
607
                                   " .msi installer file" % needed)
661
608
        get_tbzr_py2exe_info(includes, excludes, packages, console_targets,
662
609
                             gui_targets, data_files)
663
610
    else:
682
629
    setup(options=options_list,
683
630
          console=console_targets,
684
631
          windows=gui_targets,
 
632
          com_server=com_targets,
685
633
          zipfile='lib/library.zip',
686
634
          data_files=data_files,
687
635
          cmdclass={'install_data': install_data_with_bytecompile},
691
639
    # ad-hoc for easy_install
692
640
    DATA_FILES = []
693
641
    if not 'bdist_egg' in sys.argv:
694
 
        # generate and install bzr.1 only with plain install, not the
695
 
        # easy_install one
 
642
        # generate and install bzr.1 only with plain install, not easy_install one
696
643
        DATA_FILES = [('man/man1', ['bzr.1'])]
697
644
 
698
645
    # std setup