← 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: 2009-05-05 15:31:34 UTC
  • mto: (4343.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 4344.
  • Revision ID: v.ladeuil+lp@free.fr-20090505153134-q4bp4is9gywsmzrv
Clean up test for log formats.

* bzrlib/tests/blackbox/test_logformats.py:
Update tests to actual style.

Show diffs side-by-side

added added

removed removed

Lines of Context:
setup.py
93
93
BZRLIB['packages'] = get_bzrlib_packages()
94
94
 
95
95
 
96
 
from distutils import log
97
96
from distutils.core import setup
98
97
from distutils.command.install_scripts import install_scripts
99
98
from distutils.command.install_data import install_data
149
148
    def run(self):
150
149
        build.run(self)
151
150
 
152
 
        from tools import generate_docs
 
151
        import generate_docs
153
152
        generate_docs.main(argv=["bzr", "man"])
154
153
 
155
154
 
243
242
    c_name = path + '.c'
244
243
    define_macros = []
245
244
    if sys.platform == 'win32':
246
 
        # pyrex uses the macro WIN32 to detect the platform, even though it
247
 
        # should be using something like _WIN32 or MS_WINDOWS, oh well, we can
248
 
        # 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.
249
248
        define_macros.append(('WIN32', None))
250
249
    if have_pyrex:
251
250
        source = [pyrex_name]
260
259
        define_macros=define_macros, libraries=libraries))
261
260
 
262
261
 
263
 
add_pyrex_extension('bzrlib._annotator_pyx')
264
 
add_pyrex_extension('bzrlib._bencode_pyx')
265
 
add_pyrex_extension('bzrlib._btree_serializer_pyx')
266
 
add_pyrex_extension('bzrlib._chunks_to_lines_pyx')
 
262
add_pyrex_extension('bzrlib._btree_serializer_c')
267
263
add_pyrex_extension('bzrlib._groupcompress_pyx',
268
264
                    extra_source=['bzrlib/diff-delta.c'])
269
 
add_pyrex_extension('bzrlib._knit_load_data_pyx')
270
 
add_pyrex_extension('bzrlib._known_graph_pyx')
271
 
add_pyrex_extension('bzrlib._rio_pyx')
 
265
add_pyrex_extension('bzrlib._chunks_to_lines_pyx')
 
266
add_pyrex_extension('bzrlib._knit_load_data_c')
 
267
add_pyrex_extension('bzrlib._chk_map_pyx', libraries=['z'])
272
268
if sys.platform == 'win32':
273
 
    add_pyrex_extension('bzrlib._dirstate_helpers_pyx',
 
269
    add_pyrex_extension('bzrlib._dirstate_helpers_c',
274
270
                        libraries=['Ws2_32'])
275
271
    add_pyrex_extension('bzrlib._walkdirs_win32')
276
 
    z_lib = 'zdll'
277
272
else:
278
273
    if have_pyrex and pyrex_version == '0.9.4.1':
279
274
        # Pyrex 0.9.4.1 fails to compile this extension correctly
280
275
        # The code it generates re-uses a "local" pointer and
281
276
        # calls "PY_DECREF" after having set it to NULL. (It mixes PY_XDECREF
282
277
        # which is NULL safe with PY_DECREF which is not.)
283
 
        print 'Cannot build extension "bzrlib._dirstate_helpers_pyx" using'
 
278
        print 'Cannot build extension "bzrlib._dirstate_helpers_c" using'
284
279
        print 'your version of pyrex "%s". Please upgrade your pyrex' % (
285
280
            pyrex_version,)
286
281
        print 'install. For now, the non-compiled (python) version will'
287
282
        print 'be used instead.'
288
283
    else:
289
 
        add_pyrex_extension('bzrlib._dirstate_helpers_pyx')
 
284
        add_pyrex_extension('bzrlib._dirstate_helpers_c')
290
285
    add_pyrex_extension('bzrlib._readdir_pyx')
291
 
    z_lib = 'z'
292
 
add_pyrex_extension('bzrlib._chk_map_pyx', libraries=[z_lib])
293
 
ext_modules.append(Extension('bzrlib._patiencediff_c',
294
 
                             ['bzrlib/_patiencediff_c.c']))
 
286
ext_modules.append(Extension('bzrlib._patiencediff_c', ['bzrlib/_patiencediff_c.c']))
295
287
 
296
288
 
297
289
if unavailable_files:
401
393
    data_files.append(('', [os.path.join(dist_dir, 'tbzrshellext_x64.dll')]))
402
394
 
403
395
 
404
 
def get_qbzr_py2exe_info(includes, excludes, packages, data_files):
 
396
def get_qbzr_py2exe_info(includes, excludes, packages):
405
397
    # PyQt4 itself still escapes the plugin detection code for some reason...
406
398
    packages.append('PyQt4')
407
399
    excludes.append('PyQt4.elementtree.ElementTree')
415
407
        QtSql4.dll QtTest4.dll QtWebKit4.dll QtXml4.dll
416
408
        qscintilla2.dll""".split())
417
409
    # 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?')
 
410
    qt_dir = os.path.join(sys.prefix, "PyQt4", "bin")
 
411
    path = os.environ.get("PATH","")
 
412
    if qt_dir.lower() not in [p.lower() for p in path.split(os.pathsep)]:
 
413
        os.environ["PATH"] = path + os.pathsep + qt_dir
457
414
 
458
415
 
459
416
def get_svn_py2exe_info(includes, excludes, packages):
574
531
                  ImaginaryModule cElementTree elementtree.ElementTree
575
532
                  Crypto.PublicKey._fastmath
576
533
                  medusa medusa.filesys medusa.ftp_server
577
 
                  tools
 
534
                  tools tools.doc_generate
578
535
                  resource validate""".split()
579
536
    dll_excludes = []
580
537
 
636
593
    data_files = topics_files + plugins_files
637
594
 
638
595
    if 'qbzr' in plugins:
639
 
        get_qbzr_py2exe_info(includes, excludes, packages, data_files)
 
596
        get_qbzr_py2exe_info(includes, excludes, packages)
640
597
 
641
598
    if 'svn' in plugins:
642
599
        get_svn_py2exe_info(includes, excludes, packages)
645
602
        # TORTOISE_OVERLAYS_MSI_WIN32 must be set to the location of the
646
603
        # TortoiseOverlays MSI installer file. It is in the TSVN svn repo and
647
604
        # can be downloaded from (username=guest, blank password):
648
 
        # http://tortoisesvn.tigris.org/svn/tortoisesvn/TortoiseOverlays
649
 
        # look for: version-1.0.4/bin/TortoiseOverlays-1.0.4.11886-win32.msi
 
605
        # http://tortoisesvn.tigris.org/svn/tortoisesvn/TortoiseOverlays/version-1.0.4/bin/TortoiseOverlays-1.0.4.11886-win32.msi
650
606
        # Ditto for TORTOISE_OVERLAYS_MSI_X64, pointing at *-x64.msi.
651
607
        for needed in ('TORTOISE_OVERLAYS_MSI_WIN32',
652
608
                       'TORTOISE_OVERLAYS_MSI_X64'):
653
 
            url = ('http://guest:@tortoisesvn.tigris.org/svn/tortoisesvn'
654
 
                   '/TortoiseOverlays')
655
609
            if not os.path.isfile(os.environ.get(needed, '<nofile>')):
656
 
                raise RuntimeError(
657
 
                    "\nPlease set %s to the location of the relevant"
658
 
                    "\nTortoiseOverlays .msi installer file."
659
 
                    " The installers can be found at"
660
 
                    "\n  %s"
661
 
                    "\ncheck in the version-X.Y.Z/bin/ subdir" % (needed, url))
 
610
                raise RuntimeError("Please set %s to the"
 
611
                                   " location of the relevant TortoiseOverlays"
 
612
                                   " .msi installer file" % needed)
662
613
        get_tbzr_py2exe_info(includes, excludes, packages, console_targets,
663
614
                             gui_targets, data_files)
664
615
    else:
693
644
    # ad-hoc for easy_install
694
645
    DATA_FILES = []
695
646
    if not 'bdist_egg' in sys.argv:
696
 
        # generate and install bzr.1 only with plain install, not the
697
 
        # easy_install one
 
647
        # generate and install bzr.1 only with plain install, not easy_install one
698
648
        DATA_FILES = [('man/man1', ['bzr.1'])]
699
649
 
700
650
    # std setup