/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

merge bzr.dev r3564

Show diffs side-by-side

added added

removed removed

Lines of Context:
setup.py
216
216
    pyrex_name = path + '.pyx'
217
217
    c_name = path + '.c'
218
218
    if have_pyrex:
219
 
        ext_modules.append(Extension(module_name, [pyrex_name]))
 
219
        ext_modules.append(Extension(module_name, [pyrex_name], **kwargs))
220
220
    else:
221
221
        if not os.path.isfile(c_name):
222
222
            unavailable_files.append(c_name)
223
223
        else:
224
 
            ext_modules.append(Extension(module_name, [c_name]))
 
224
            ext_modules.append(Extension(module_name, [c_name], **kwargs))
225
225
 
226
226
 
227
227
add_pyrex_extension('bzrlib._dirstate_helpers_c')
228
228
add_pyrex_extension('bzrlib._knit_load_data_c')
 
229
if sys.platform == 'win32':
 
230
    # pyrex uses the macro WIN32 to detect the platform, even though it should
 
231
    # be using something like _WIN32 or MS_WINDOWS, oh well, we can give it the
 
232
    # right value.
 
233
    add_pyrex_extension('bzrlib._walkdirs_win32',
 
234
                        define_macros=[('WIN32', None)])
229
235
ext_modules.append(Extension('bzrlib._patiencediff_c', ['bzrlib/_patiencediff_c.c']))
230
236
 
231
237
 
346
352
    packs, mods = mf.get_result()
347
353
    additional_packages.update(packs)
348
354
 
 
355
    # MSWSOCK.dll is a system-specific library, which py2exe accidentally pulls
 
356
    # in on Vista.
349
357
    options_list = {"py2exe": {"packages": packages + list(additional_packages),
350
358
                               "includes": includes + mods,
351
359
                               "excludes": ["Tkinter", "medusa", "tools"],
 
360
                               "dll_excludes": ["MSWSOCK.dll"],
352
361
                               "dist_dir": "win32_bzr.exe",
353
362
                              },
354
363
                   }