← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to setup.py

  • Committer: Johan Walles
  • Date: 2009-05-06 05:36:28 UTC
  • mfrom: (4332 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4343.
  • Revision ID: johan.walles@gmail.com-20090506053628-tbf1wz4a0m9t684g
Merge from upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
setup.py
264
264
                    extra_source=['bzrlib/diff-delta.c'])
265
265
add_pyrex_extension('bzrlib._chunks_to_lines_pyx')
266
266
add_pyrex_extension('bzrlib._knit_load_data_c')
267
 
add_pyrex_extension('bzrlib._rio_pyx')
268
267
add_pyrex_extension('bzrlib._chk_map_pyx', libraries=['z'])
269
268
if sys.platform == 'win32':
270
269
    add_pyrex_extension('bzrlib._dirstate_helpers_c',
603
602
        # TORTOISE_OVERLAYS_MSI_WIN32 must be set to the location of the
604
603
        # TortoiseOverlays MSI installer file. It is in the TSVN svn repo and
605
604
        # can be downloaded from (username=guest, blank password):
606
 
        # http://tortoisesvn.tigris.org/svn/tortoisesvn/TortoiseOverlays
607
 
        # look for: version-1.0.4/bin/TortoiseOverlays-1.0.4.11886-win32.msi
 
605
        # http://tortoisesvn.tigris.org/svn/tortoisesvn/TortoiseOverlays/version-1.0.4/bin/TortoiseOverlays-1.0.4.11886-win32.msi
608
606
        # Ditto for TORTOISE_OVERLAYS_MSI_X64, pointing at *-x64.msi.
609
607
        for needed in ('TORTOISE_OVERLAYS_MSI_WIN32',
610
608
                       'TORTOISE_OVERLAYS_MSI_X64'):
611
 
            url = ('http://guest:@tortoisesvn.tigris.org/svn/tortoisesvn'
612
 
                   '/TortoiseOverlays')
613
609
            if not os.path.isfile(os.environ.get(needed, '<nofile>')):
614
 
                raise RuntimeError(
615
 
                    "\nPlease set %s to the location of the relevant"
616
 
                    "\nTortoiseOverlays .msi installer file."
617
 
                    " The installers can be found at"
618
 
                    "\n  %s"
619
 
                    "\ncheck in the version-X.Y.Z/bin/ subdir" % (needed, url))
 
610
                raise RuntimeError("Please set %s to the"
 
611
                                   " location of the relevant TortoiseOverlays"
 
612
                                   " .msi installer file" % needed)
620
613
        get_tbzr_py2exe_info(includes, excludes, packages, console_targets,
621
614
                             gui_targets, data_files)
622
615
    else: