/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: Andrew Bennetts
  • Date: 2009-06-17 02:02:44 UTC
  • mfrom: (4449 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4452.
  • Revision ID: andrew.bennetts@canonical.com-20090617020244-50aantdf95aakvjx
Merge bzr.dev, resolving NEWS conflict.

Show diffs side-by-side

added added

removed removed

Lines of Context:
setup.py
259
259
        define_macros=define_macros, libraries=libraries))
260
260
 
261
261
 
 
262
add_pyrex_extension('bzrlib._bencode_pyx')
262
263
add_pyrex_extension('bzrlib._btree_serializer_c')
 
264
add_pyrex_extension('bzrlib._chunks_to_lines_pyx')
263
265
add_pyrex_extension('bzrlib._groupcompress_pyx',
264
266
                    extra_source=['bzrlib/diff-delta.c'])
265
 
add_pyrex_extension('bzrlib._chunks_to_lines_pyx')
266
267
add_pyrex_extension('bzrlib._knit_load_data_c')
267
 
add_pyrex_extension('bzrlib._chk_map_pyx', libraries=['z'])
 
268
add_pyrex_extension('bzrlib._known_graph_pyx')
 
269
add_pyrex_extension('bzrlib._rio_pyx')
268
270
if sys.platform == 'win32':
269
271
    add_pyrex_extension('bzrlib._dirstate_helpers_c',
270
272
                        libraries=['Ws2_32'])
271
273
    add_pyrex_extension('bzrlib._walkdirs_win32')
 
274
    z_lib = 'zdll'
272
275
else:
273
276
    if have_pyrex and pyrex_version == '0.9.4.1':
274
277
        # Pyrex 0.9.4.1 fails to compile this extension correctly
283
286
    else:
284
287
        add_pyrex_extension('bzrlib._dirstate_helpers_c')
285
288
    add_pyrex_extension('bzrlib._readdir_pyx')
 
289
    z_lib = 'z'
 
290
add_pyrex_extension('bzrlib._chk_map_pyx', libraries=[z_lib])
286
291
ext_modules.append(Extension('bzrlib._patiencediff_c', ['bzrlib/_patiencediff_c.c']))
287
292
 
288
293
 
602
607
        # TORTOISE_OVERLAYS_MSI_WIN32 must be set to the location of the
603
608
        # TortoiseOverlays MSI installer file. It is in the TSVN svn repo and
604
609
        # can be downloaded from (username=guest, blank password):
605
 
        # http://tortoisesvn.tigris.org/svn/tortoisesvn/TortoiseOverlays/version-1.0.4/bin/TortoiseOverlays-1.0.4.11886-win32.msi
 
610
        # http://tortoisesvn.tigris.org/svn/tortoisesvn/TortoiseOverlays
 
611
        # look for: version-1.0.4/bin/TortoiseOverlays-1.0.4.11886-win32.msi
606
612
        # Ditto for TORTOISE_OVERLAYS_MSI_X64, pointing at *-x64.msi.
607
613
        for needed in ('TORTOISE_OVERLAYS_MSI_WIN32',
608
614
                       'TORTOISE_OVERLAYS_MSI_X64'):
 
615
            url = ('http://guest:@tortoisesvn.tigris.org/svn/tortoisesvn'
 
616
                   '/TortoiseOverlays')
609
617
            if not os.path.isfile(os.environ.get(needed, '<nofile>')):
610
 
                raise RuntimeError("Please set %s to the"
611
 
                                   " location of the relevant TortoiseOverlays"
612
 
                                   " .msi installer file" % needed)
 
618
                raise RuntimeError(
 
619
                    "\nPlease set %s to the location of the relevant"
 
620
                    "\nTortoiseOverlays .msi installer file."
 
621
                    " The installers can be found at"
 
622
                    "\n  %s"
 
623
                    "\ncheck in the version-X.Y.Z/bin/ subdir" % (needed, url))
613
624
        get_tbzr_py2exe_info(includes, excludes, packages, console_targets,
614
625
                             gui_targets, data_files)
615
626
    else: