/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: Andrew Bennetts
  • Date: 2010-04-21 07:52:31 UTC
  • mto: This revision was merged to the branch mainline in revision 5176.
  • Revision ID: andrew.bennetts@canonical.com-20100421075231-2n8pfxbhlhqxic6w
https://launchpad.net/bugs/532435
Add example merge_file_content hook based on my answer to <https://answers.edge.launchpad.net/bzr/+question/103163>.

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'
284
285
else:
285
286
    if have_pyrex and pyrex_version_info[:3] == (0,9,4):
286
287
        # Pyrex 0.9.4.1 fails to compile this extension correctly
297
298
    else:
298
299
        add_pyrex_extension('bzrlib._dirstate_helpers_pyx')
299
300
    add_pyrex_extension('bzrlib._readdir_pyx')
300
 
add_pyrex_extension('bzrlib._chk_map_pyx')
 
301
    z_lib = 'z'
 
302
add_pyrex_extension('bzrlib._chk_map_pyx', libraries=[z_lib])
301
303
ext_modules.append(Extension('bzrlib._patiencediff_c',
302
304
                             ['bzrlib/_patiencediff_c.c']))
303
305
if have_pyrex and pyrex_version_info < (0, 9, 6, 3):