← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to setup.py

  • Committer: Naoki INADA
  • Date: 2009-10-06 15:32:51 UTC
  • mto: (4634.77.1 2.0)
  • mto: This revision was merged to the branch mainline in revision 4750.
  • Revision ID: inada-n@klab.jp-20091006153251-ap1nsc6qub4rphrp
TBZR: Remove tbzr_old.dll, refactoring directory tree.

Show diffs side-by-side

added added

removed removed

Lines of Context:
setup.py
327
327
    # Ensure tbzrlib itself is on sys.path
328
328
    sys.path.append(tbzr_root)
329
329
 
330
 
    # Ensure our COM "entry-point" is on sys.path
331
 
    sys.path.append(os.path.join(tbzr_root, "shellext", "python"))
332
 
 
333
330
    packages.append("tbzrlib")
334
331
 
335
332
    # collect up our icons.
357
354
    excludes.extend("""pywin pywin.dialogs pywin.dialogs.list
358
355
                       win32ui crawler.Crawler""".split())
359
356
 
360
 
    # NOTE: We still create a DLL version of the Python implemented shell
361
 
    # extension for testing purposes - but it is *not* registered by
362
 
    # default - our C++ one is instead.  To discourage people thinking
363
 
    # this DLL is still necessary, its called 'tbzr_old.dll'
364
 
    tbzr = dict(
365
 
        modules=["tbzr"],
366
 
        create_exe = False, # we only want a .dll
367
 
        dest_base = 'tbzr_old',
368
 
    )
369
 
    com_targets.append(tbzr)
370
 
 
371
357
    # tbzrcache executables - a "console" version for debugging and a
372
358
    # GUI version that is generally used.
373
359
    tbzrcache = dict(
398
384
    console_targets.append(tracer)
399
385
 
400
386
    # The C++ implemented shell extensions.
401
 
    dist_dir = os.path.join(tbzr_root, "shellext", "cpp", "tbzrshellext",
402
 
                            "build", "dist")
 
387
    dist_dir = os.path.join(tbzr_root, "shellext", "build")
403
388
    data_files.append(('', [os.path.join(dist_dir, 'tbzrshellext_x86.dll')]))
404
389
    data_files.append(('', [os.path.join(dist_dir, 'tbzrshellext_x64.dll')]))
405
390
 
636
621
                       'tools/win32/bzr_postinstall.py',
637
622
                       ]
638
623
    gui_targets = []
639
 
    com_targets = []
640
624
    data_files = topics_files + plugins_files
641
625
 
642
626
    if 'qbzr' in plugins:
687
671
    setup(options=options_list,
688
672
          console=console_targets,
689
673
          windows=gui_targets,
690
 
          com_server=com_targets,
691
674
          zipfile='lib/library.zip',
692
675
          data_files=data_files,
693
676
          cmdclass={'install_data': install_data_with_bytecompile},