← 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: 2010-01-12 22:51:31 UTC
  • mto: This revision was merged to the branch mainline in revision 4955.
  • Revision ID: john@arbash-meinel.com-20100112225131-he8h411p6aeeb947
Delay grabbing an output stream until we actually go to show a diff.

This makes the test suite happy, but it also seems to be reasonable.
If we aren't going to write anything, we don't need to hold an
output stream open.

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://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
43
    'download_url': 'https://launchpad.net/bzr/+download',
186
186
    from distutils.command.build_ext import build_ext
187
187
else:
188
188
    have_pyrex = True
189
 
    pyrex_version_info = tuple(map(int, pyrex_version.split('.')))
190
189
 
191
190
 
192
191
class build_ext_if_possible(build_ext):
283
282
    add_pyrex_extension('bzrlib._walkdirs_win32')
284
283
    z_lib = 'zdll'
285
284
else:
286
 
    if have_pyrex and pyrex_version_info[:3] == (0,9,4):
 
285
    if have_pyrex and pyrex_version.startswith('0.9.4'):
287
286
        # Pyrex 0.9.4.1 fails to compile this extension correctly
288
287
        # The code it generates re-uses a "local" pointer and
289
288
        # calls "PY_DECREF" after having set it to NULL. (It mixes PY_XDECREF
302
301
add_pyrex_extension('bzrlib._chk_map_pyx', libraries=[z_lib])
303
302
ext_modules.append(Extension('bzrlib._patiencediff_c',
304
303
                             ['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
312
 
    # TODO: Should this be a fatal error?
313
 
else:
314
 
    # We only need 0.9.6.3 to build _simple_set_pyx, but static_tuple depends
315
 
    # 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']))
 
304
add_pyrex_extension('bzrlib._simple_set_pyx')
 
305
ext_modules.append(Extension('bzrlib._static_tuple_c',
 
306
                             ['bzrlib/_static_tuple_c.c']))
319
307
add_pyrex_extension('bzrlib._btree_serializer_pyx')
320
308
 
321
309
 
470
458
 
471
459
def get_svn_py2exe_info(includes, excludes, packages):
472
460
    packages.append('subvertpy')
473
 
    packages.append('sqlite3')
474
461
 
475
462
 
476
463
if 'bdist_wininst' in sys.argv:
554
541
                                     version = version_str,
555
542
                                     description = META_INFO['description'],
556
543
                                     author = META_INFO['author'],
557
 
                                     copyright = "(c) Canonical Ltd, 2005-2010",
 
544
                                     copyright = "(c) Canonical Ltd, 2005-2009",
558
545
                                     company_name = "Canonical Ltd.",
559
546
                                     comments = META_INFO['description'],
560
547
                                    )
573
560
    if sys.version.startswith('2.4'):
574
561
        # adding elementtree package
575
562
        additional_packages.add('elementtree')
576
 
    elif sys.version.startswith('2.6') or sys.version.startswith('2.5'):
 
563
    elif sys.version.startswith('2.5'):
577
564
        additional_packages.add('xml.etree')
578
565
    else:
579
566
        import warnings
625
612
            excludes.extend(["bzrlib.plugins." + d for d in dirs])
626
613
        x = []
627
614
        for i in files:
628
 
            # Throw away files we don't want packaged. Note that plugins may
629
 
            # have data files with all sorts of extensions so we need to
630
 
            # be conservative here about what we ditch.
631
 
            ext = os.path.splitext(i)[1]
632
 
            if ext.endswith('~') or ext in [".pyc", ".swp"]:
 
615
            if os.path.splitext(i)[1] not in [".py", ".pyd", ".dll", ".mo"]:
633
616
                continue
634
617
            if i == '__init__.py' and root == 'bzrlib/plugins':
635
618
                continue
712
695
        # easy_install one
713
696
        DATA_FILES = [('man/man1', ['bzr.1'])]
714
697
 
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
 
 
728
698
    # std setup
729
699
    ARGS = {'scripts': ['bzr'],
730
700
            'data_files': DATA_FILES,