/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: Robert Collins
  • Date: 2010-05-20 02:57:52 UTC
  • mfrom: (4797.43.11 2.1)
  • mto: This revision was merged to the branch mainline in revision 5243.
  • Revision ID: robertc@robertcollins.net-20100520025752-dbfi4kx7y4ivtiff
Merge up from 2.0/2.1:

* Support Pyrex 0.9.9, required changing how we handle exceptions in Pyrex.
  (John Arbash Meinel, #582656)

* ``bzr clean-tree`` should not delete nested bzrdirs. Required for proper
  support of bzr-externals and scmproj plugins.
  (Alexander Belchenko, bug #572098)

* Reduce peak memory by one copy of compressed text.
  (John Arbash Meinel, #566940)

* Support Pyrex 0.9.9, required changing how we handle exceptions in Pyrex.
  (John Arbash Meinel, #582656)

Show diffs side-by-side

added added

removed removed

Lines of Context:
setup.py
281
281
    add_pyrex_extension('bzrlib._dirstate_helpers_pyx',
282
282
                        libraries=['Ws2_32'])
283
283
    add_pyrex_extension('bzrlib._walkdirs_win32')
284
 
    z_lib = 'zdll'
285
284
else:
286
285
    if have_pyrex and pyrex_version_info[:3] == (0,9,4):
287
286
        # Pyrex 0.9.4.1 fails to compile this extension correctly
298
297
    else:
299
298
        add_pyrex_extension('bzrlib._dirstate_helpers_pyx')
300
299
    add_pyrex_extension('bzrlib._readdir_pyx')
301
 
    z_lib = 'z'
302
 
add_pyrex_extension('bzrlib._chk_map_pyx', libraries=[z_lib])
 
300
add_pyrex_extension('bzrlib._chk_map_pyx')
303
301
ext_modules.append(Extension('bzrlib._patiencediff_c',
304
302
                             ['bzrlib/_patiencediff_c.c']))
305
303
if have_pyrex and pyrex_version_info < (0, 9, 6, 3):