← 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-06-22 12:52:39 UTC
  • mto: (4471.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 4472.
  • Revision ID: v.ladeuil+lp@free.fr-20090622125239-kabo9smxt9c3vnir
Use a consistent scheme for naming pyrex source files.

Show diffs side-by-side

added added

removed removed

Lines of Context:
setup.py
242
242
    c_name = path + '.c'
243
243
    define_macros = []
244
244
    if sys.platform == 'win32':
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.
 
245
        # pyrex uses the macro WIN32 to detect the platform, even though it
 
246
        # should be using something like _WIN32 or MS_WINDOWS, oh well, we can
 
247
        # give it the right value.
248
248
        define_macros.append(('WIN32', None))
249
249
    if have_pyrex:
250
250
        source = [pyrex_name]
260
260
 
261
261
 
262
262
add_pyrex_extension('bzrlib._bencode_pyx')
263
 
add_pyrex_extension('bzrlib._btree_serializer_c')
 
263
add_pyrex_extension('bzrlib._btree_serializer_pyx')
264
264
add_pyrex_extension('bzrlib._chunks_to_lines_pyx')
265
265
add_pyrex_extension('bzrlib._groupcompress_pyx',
266
266
                    extra_source=['bzrlib/diff-delta.c'])
267
 
add_pyrex_extension('bzrlib._knit_load_data_c')
 
267
add_pyrex_extension('bzrlib._knit_load_data_pyx')
268
268
add_pyrex_extension('bzrlib._known_graph_pyx')
269
269
add_pyrex_extension('bzrlib._rio_pyx')
270
270
if sys.platform == 'win32':
271
 
    add_pyrex_extension('bzrlib._dirstate_helpers_c',
 
271
    add_pyrex_extension('bzrlib._dirstate_helpers_pyx',
272
272
                        libraries=['Ws2_32'])
273
273
    add_pyrex_extension('bzrlib._walkdirs_win32')
274
274
    z_lib = 'zdll'
278
278
        # The code it generates re-uses a "local" pointer and
279
279
        # calls "PY_DECREF" after having set it to NULL. (It mixes PY_XDECREF
280
280
        # which is NULL safe with PY_DECREF which is not.)
281
 
        print 'Cannot build extension "bzrlib._dirstate_helpers_c" using'
 
281
        print 'Cannot build extension "bzrlib._dirstate_helpers_pyx" using'
282
282
        print 'your version of pyrex "%s". Please upgrade your pyrex' % (
283
283
            pyrex_version,)
284
284
        print 'install. For now, the non-compiled (python) version will'
285
285
        print 'be used instead.'
286
286
    else:
287
 
        add_pyrex_extension('bzrlib._dirstate_helpers_c')
 
287
        add_pyrex_extension('bzrlib._dirstate_helpers_pyx')
288
288
    add_pyrex_extension('bzrlib._readdir_pyx')
289
289
    z_lib = 'z'
290
290
add_pyrex_extension('bzrlib._chk_map_pyx', libraries=[z_lib])
291
 
ext_modules.append(Extension('bzrlib._patiencediff_c', ['bzrlib/_patiencediff_c.c']))
 
291
ext_modules.append(Extension('bzrlib._patiencediff_c',
 
292
                             ['bzrlib/_patiencediff_c.c']))
292
293
 
293
294
 
294
295
if unavailable_files:
655
656
    # ad-hoc for easy_install
656
657
    DATA_FILES = []
657
658
    if not 'bdist_egg' in sys.argv:
658
 
        # generate and install bzr.1 only with plain install, not easy_install one
 
659
        # generate and install bzr.1 only with plain install, not the
 
660
        # easy_install one
659
661
        DATA_FILES = [('man/man1', ['bzr.1'])]
660
662
 
661
663
    # std setup