/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: John Arbash Meinel
  • Date: 2009-10-17 00:34:28 UTC
  • mfrom: (4754 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4755.
  • Revision ID: john@arbash-meinel.com-20091017003428-opg71qwkbzr3clko
Merge bzr.dev resolve test conflict.

Show diffs side-by-side

added added

removed removed

Lines of Context:
270
270
 
271
271
add_pyrex_extension('bzrlib._annotator_pyx')
272
272
add_pyrex_extension('bzrlib._bencode_pyx')
273
 
add_pyrex_extension('bzrlib._btree_serializer_pyx')
274
273
add_pyrex_extension('bzrlib._chunks_to_lines_pyx')
275
274
add_pyrex_extension('bzrlib._groupcompress_pyx',
276
275
                    extra_source=['bzrlib/diff-delta.c'])
303
302
add_pyrex_extension('bzrlib._simple_set_pyx')
304
303
ext_modules.append(Extension('bzrlib._static_tuple_c',
305
304
                             ['bzrlib/_static_tuple_c.c']))
 
305
add_pyrex_extension('bzrlib._btree_serializer_pyx')
 
306
 
306
307
 
307
308
if unavailable_files:
308
309
    print 'C extension(s) not found:'
334
335
    # Ensure tbzrlib itself is on sys.path
335
336
    sys.path.append(tbzr_root)
336
337
 
337
 
    # Ensure our COM "entry-point" is on sys.path
338
 
    sys.path.append(os.path.join(tbzr_root, "shellext", "python"))
339
 
 
340
338
    packages.append("tbzrlib")
341
339
 
342
340
    # collect up our icons.
364
362
    excludes.extend("""pywin pywin.dialogs pywin.dialogs.list
365
363
                       win32ui crawler.Crawler""".split())
366
364
 
367
 
    # NOTE: We still create a DLL version of the Python implemented shell
368
 
    # extension for testing purposes - but it is *not* registered by
369
 
    # default - our C++ one is instead.  To discourage people thinking
370
 
    # this DLL is still necessary, its called 'tbzr_old.dll'
371
 
    tbzr = dict(
372
 
        modules=["tbzr"],
373
 
        create_exe = False, # we only want a .dll
374
 
        dest_base = 'tbzr_old',
375
 
    )
376
 
    com_targets.append(tbzr)
377
 
 
378
365
    # tbzrcache executables - a "console" version for debugging and a
379
366
    # GUI version that is generally used.
380
367
    tbzrcache = dict(
405
392
    console_targets.append(tracer)
406
393
 
407
394
    # The C++ implemented shell extensions.
408
 
    dist_dir = os.path.join(tbzr_root, "shellext", "cpp", "tbzrshellext",
409
 
                            "build", "dist")
 
395
    dist_dir = os.path.join(tbzr_root, "shellext", "build")
410
396
    data_files.append(('', [os.path.join(dist_dir, 'tbzrshellext_x86.dll')]))
411
397
    data_files.append(('', [os.path.join(dist_dir, 'tbzrshellext_x64.dll')]))
412
398
 
643
629
                       'tools/win32/bzr_postinstall.py',
644
630
                       ]
645
631
    gui_targets = []
646
 
    com_targets = []
647
632
    data_files = topics_files + plugins_files
648
633
 
649
634
    if 'qbzr' in plugins:
694
679
    setup(options=options_list,
695
680
          console=console_targets,
696
681
          windows=gui_targets,
697
 
          com_server=com_targets,
698
682
          zipfile='lib/library.zip',
699
683
          data_files=data_files,
700
684
          cmdclass={'install_data': install_data_with_bytecompile},