← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to setup.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-10-15 21:28:14 UTC
  • mfrom: (4634.75.2 jam-integration)
  • Revision ID: pqm@pqm.ubuntu.com-20091015212814-i4j0hjrcob5cdw6j
(mbp) Fix bug #446033 by skipping non-existing entries in readdir.

Show diffs side-by-side

added added

removed removed

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