/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-04-21 23:54:16 UTC
  • mto: (4300.1.7 groupcompress_info)
  • mto: This revision was merged to the branch mainline in revision 4301.
  • Revision ID: john@arbash-meinel.com-20090421235416-f0cz6ilf5cufbugi
https://launchpad.net/bugs/364900
Fix bug #364900, properly remove the 64kB that was just encoded in the copy.
Also, stop supporting None as a copy length in 'encode_copy_instruction'.
It was only used by the test suite, and it is good to pull that sort of thing out of
production code. (Besides, setting the copy to 64kB has the same effect.)

Show diffs side-by-side

added added

removed removed

Lines of Context:
setup.py
37
37
    'version':      bzrlib.__version__,
38
38
    'author':       'Canonical Ltd',
39
39
    'author_email': 'bazaar@lists.canonical.com',
40
 
    'url':          'http://bazaar.canonical.com/',
 
40
    'url':          'http://www.bazaar-vcs.org/',
41
41
    'description':  'Friendly distributed version control system',
42
42
    'license':      'GNU GPL v2',
43
 
    'download_url': 'https://launchpad.net/bzr/+download',
 
43
    'download_url': 'http://bazaar-vcs.org/Download',
44
44
    'long_description': get_long_description(),
45
45
    'classifiers': [
46
46
        'Development Status :: 6 - Mature',
65
65
            'package_data': {'bzrlib': ['doc/api/*.txt',
66
66
                                        'tests/test_patches_data/*',
67
67
                                        'help_topics/en/*.txt',
68
 
                                        'tests/ssl_certs/server_without_pass.key',
69
 
                                        'tests/ssl_certs/server_with_pass.key',
70
 
                                        'tests/ssl_certs/server.crt'
71
68
                                       ]},
72
69
           }
73
70
 
96
93
BZRLIB['packages'] = get_bzrlib_packages()
97
94
 
98
95
 
99
 
from distutils import log
100
96
from distutils.core import setup
101
97
from distutils.command.install_scripts import install_scripts
102
98
from distutils.command.install_data import install_data
152
148
    def run(self):
153
149
        build.run(self)
154
150
 
155
 
        from tools import generate_docs
 
151
        import generate_docs
156
152
        generate_docs.main(argv=["bzr", "man"])
157
153
 
158
154
 
167
163
from distutils.extension import Extension
168
164
ext_modules = []
169
165
try:
170
 
    try:
171
 
        from Pyrex.Distutils import build_ext
172
 
        from Pyrex.Compiler.Version import version as pyrex_version
173
 
    except ImportError:
174
 
        print "No Pyrex, trying Cython..."
175
 
        from Cython.Distutils import build_ext
176
 
        from Cython.Compiler.Version import version as pyrex_version
 
166
    from Pyrex.Distutils import build_ext
177
167
except ImportError:
178
168
    have_pyrex = False
179
169
    # try to build the extension from the prior generated source.
186
176
    from distutils.command.build_ext import build_ext
187
177
else:
188
178
    have_pyrex = True
189
 
    pyrex_version_info = tuple(map(int, pyrex_version.split('.')))
 
179
    from Pyrex.Compiler.Version import version as pyrex_version
190
180
 
191
181
 
192
182
class build_ext_if_possible(build_ext):
252
242
    c_name = path + '.c'
253
243
    define_macros = []
254
244
    if sys.platform == 'win32':
255
 
        # pyrex uses the macro WIN32 to detect the platform, even though it
256
 
        # should be using something like _WIN32 or MS_WINDOWS, oh well, we can
257
 
        # give it the right value.
 
245
        # pyrex uses the macro WIN32 to detect the platform, even though it should
 
246
        # be using something like _WIN32 or MS_WINDOWS, oh well, we can give it the
 
247
        # right value.
258
248
        define_macros.append(('WIN32', None))
259
249
    if have_pyrex:
260
250
        source = [pyrex_name]
269
259
        define_macros=define_macros, libraries=libraries))
270
260
 
271
261
 
272
 
add_pyrex_extension('bzrlib._annotator_pyx')
273
 
add_pyrex_extension('bzrlib._bencode_pyx')
274
 
add_pyrex_extension('bzrlib._chunks_to_lines_pyx')
 
262
add_pyrex_extension('bzrlib._btree_serializer_c')
275
263
add_pyrex_extension('bzrlib._groupcompress_pyx',
276
264
                    extra_source=['bzrlib/diff-delta.c'])
277
 
add_pyrex_extension('bzrlib._knit_load_data_pyx')
278
 
add_pyrex_extension('bzrlib._known_graph_pyx')
279
 
add_pyrex_extension('bzrlib._rio_pyx')
 
265
add_pyrex_extension('bzrlib._chunks_to_lines_pyx')
 
266
add_pyrex_extension('bzrlib._knit_load_data_c')
 
267
add_pyrex_extension('bzrlib._chk_map_pyx', libraries=['z'])
280
268
if sys.platform == 'win32':
281
 
    add_pyrex_extension('bzrlib._dirstate_helpers_pyx',
 
269
    add_pyrex_extension('bzrlib._dirstate_helpers_c',
282
270
                        libraries=['Ws2_32'])
283
271
    add_pyrex_extension('bzrlib._walkdirs_win32')
284
 
    z_lib = 'zdll'
285
272
else:
286
 
    if have_pyrex and pyrex_version_info[:3] == (0,9,4):
 
273
    if have_pyrex and pyrex_version == '0.9.4.1':
287
274
        # Pyrex 0.9.4.1 fails to compile this extension correctly
288
275
        # The code it generates re-uses a "local" pointer and
289
276
        # calls "PY_DECREF" after having set it to NULL. (It mixes PY_XDECREF
290
277
        # which is NULL safe with PY_DECREF which is not.)
291
 
        # <https://bugs.edge.launchpad.net/bzr/+bug/449372>
292
 
        # <https://bugs.edge.launchpad.net/bzr/+bug/276868>
293
 
        print 'Cannot build extension "bzrlib._dirstate_helpers_pyx" using'
 
278
        print 'Cannot build extension "bzrlib._dirstate_helpers_c" using'
294
279
        print 'your version of pyrex "%s". Please upgrade your pyrex' % (
295
280
            pyrex_version,)
296
281
        print 'install. For now, the non-compiled (python) version will'
297
282
        print 'be used instead.'
298
283
    else:
299
 
        add_pyrex_extension('bzrlib._dirstate_helpers_pyx')
 
284
        add_pyrex_extension('bzrlib._dirstate_helpers_c')
300
285
    add_pyrex_extension('bzrlib._readdir_pyx')
301
 
    z_lib = 'z'
302
 
add_pyrex_extension('bzrlib._chk_map_pyx', libraries=[z_lib])
303
 
ext_modules.append(Extension('bzrlib._patiencediff_c',
304
 
                             ['bzrlib/_patiencediff_c.c']))
305
 
if have_pyrex and pyrex_version_info < (0, 9, 6, 3):
306
 
    print
307
 
    print 'Your Pyrex/Cython version %s is too old to build the simple_set' % (
308
 
        pyrex_version)
309
 
    print 'and static_tuple extensions.'
310
 
    print 'Please upgrade to at least Pyrex 0.9.6.3'
311
 
    print
312
 
    # TODO: Should this be a fatal error?
313
 
else:
314
 
    # We only need 0.9.6.3 to build _simple_set_pyx, but static_tuple depends
315
 
    # on simple_set
316
 
    add_pyrex_extension('bzrlib._simple_set_pyx')
317
 
    ext_modules.append(Extension('bzrlib._static_tuple_c',
318
 
                                 ['bzrlib/_static_tuple_c.c']))
319
 
add_pyrex_extension('bzrlib._btree_serializer_pyx')
 
286
ext_modules.append(Extension('bzrlib._patiencediff_c', ['bzrlib/_patiencediff_c.c']))
320
287
 
321
288
 
322
289
if unavailable_files:
349
316
    # Ensure tbzrlib itself is on sys.path
350
317
    sys.path.append(tbzr_root)
351
318
 
 
319
    # Ensure our COM "entry-point" is on sys.path
 
320
    sys.path.append(os.path.join(tbzr_root, "shellext", "python"))
 
321
 
352
322
    packages.append("tbzrlib")
353
323
 
354
324
    # collect up our icons.
376
346
    excludes.extend("""pywin pywin.dialogs pywin.dialogs.list
377
347
                       win32ui crawler.Crawler""".split())
378
348
 
 
349
    # NOTE: We still create a DLL version of the Python implemented shell
 
350
    # extension for testing purposes - but it is *not* registered by
 
351
    # default - our C++ one is instead.  To discourage people thinking
 
352
    # this DLL is still necessary, its called 'tbzr_old.dll'
 
353
    tbzr = dict(
 
354
        modules=["tbzr"],
 
355
        create_exe = False, # we only want a .dll
 
356
        dest_base = 'tbzr_old',
 
357
    )
 
358
    com_targets.append(tbzr)
 
359
 
379
360
    # tbzrcache executables - a "console" version for debugging and a
380
361
    # GUI version that is generally used.
381
362
    tbzrcache = dict(
406
387
    console_targets.append(tracer)
407
388
 
408
389
    # The C++ implemented shell extensions.
409
 
    dist_dir = os.path.join(tbzr_root, "shellext", "build")
 
390
    dist_dir = os.path.join(tbzr_root, "shellext", "cpp", "tbzrshellext",
 
391
                            "build", "dist")
410
392
    data_files.append(('', [os.path.join(dist_dir, 'tbzrshellext_x86.dll')]))
411
393
    data_files.append(('', [os.path.join(dist_dir, 'tbzrshellext_x64.dll')]))
412
394
 
413
395
 
414
 
def get_qbzr_py2exe_info(includes, excludes, packages, data_files):
 
396
def get_qbzr_py2exe_info(includes, excludes, packages):
415
397
    # PyQt4 itself still escapes the plugin detection code for some reason...
416
398
    packages.append('PyQt4')
417
399
    excludes.append('PyQt4.elementtree.ElementTree')
418
 
    excludes.append('PyQt4.uic.port_v3')
419
400
    includes.append('sip') # extension module required for Qt.
420
401
    packages.append('pygments') # colorizer for qbzr
421
402
    packages.append('docutils') # html formatting
422
 
    includes.append('win32event')  # for qsubprocess stuff
423
403
    # but we can avoid many Qt4 Dlls.
424
404
    dll_excludes.extend(
425
405
        """QtAssistantClient4.dll QtCLucene4.dll QtDesigner4.dll
427
407
        QtSql4.dll QtTest4.dll QtWebKit4.dll QtXml4.dll
428
408
        qscintilla2.dll""".split())
429
409
    # the qt binaries might not be on PATH...
430
 
    # They seem to install to a place like C:\Python25\PyQt4\*
431
 
    # Which is not the same as C:\Python25\Lib\site-packages\PyQt4
432
 
    pyqt_dir = os.path.join(sys.prefix, "PyQt4")
433
 
    pyqt_bin_dir = os.path.join(pyqt_dir, "bin")
434
 
    if os.path.isdir(pyqt_bin_dir):
435
 
        path = os.environ.get("PATH", "")
436
 
        if pyqt_bin_dir.lower() not in [p.lower() for p in path.split(os.pathsep)]:
437
 
            os.environ["PATH"] = path + os.pathsep + pyqt_bin_dir
438
 
    # also add all imageformat plugins to distribution
439
 
    # We will look in 2 places, dirname(PyQt4.__file__) and pyqt_dir
440
 
    base_dirs_to_check = []
441
 
    if os.path.isdir(pyqt_dir):
442
 
        base_dirs_to_check.append(pyqt_dir)
443
 
    try:
444
 
        import PyQt4
445
 
    except ImportError:
446
 
        pass
447
 
    else:
448
 
        pyqt4_base_dir = os.path.dirname(PyQt4.__file__)
449
 
        if pyqt4_base_dir != pyqt_dir:
450
 
            base_dirs_to_check.append(pyqt4_base_dir)
451
 
    if not base_dirs_to_check:
452
 
        log.warn("Can't find PyQt4 installation -> not including imageformat"
453
 
                 " plugins")
454
 
    else:
455
 
        files = []
456
 
        for base_dir in base_dirs_to_check:
457
 
            plug_dir = os.path.join(base_dir, 'plugins', 'imageformats')
458
 
            if os.path.isdir(plug_dir):
459
 
                for fname in os.listdir(plug_dir):
460
 
                    # Include plugin dlls, but not debugging dlls
461
 
                    fullpath = os.path.join(plug_dir, fname)
462
 
                    if fname.endswith('.dll') and not fname.endswith('d4.dll'):
463
 
                        files.append(fullpath)
464
 
        if files:
465
 
            data_files.append(('imageformats', files))
466
 
        else:
467
 
            log.warn('PyQt4 was found, but we could not find any imageformat'
468
 
                     ' plugins. Are you sure your configuration is correct?')
 
410
    qt_dir = os.path.join(sys.prefix, "PyQt4", "bin")
 
411
    path = os.environ.get("PATH","")
 
412
    if qt_dir.lower() not in [p.lower() for p in path.split(os.pathsep)]:
 
413
        os.environ["PATH"] = path + os.pathsep + qt_dir
469
414
 
470
415
 
471
416
def get_svn_py2exe_info(includes, excludes, packages):
472
417
    packages.append('subvertpy')
473
 
    packages.append('sqlite3')
474
418
 
475
419
 
476
420
if 'bdist_wininst' in sys.argv:
554
498
                                     version = version_str,
555
499
                                     description = META_INFO['description'],
556
500
                                     author = META_INFO['author'],
557
 
                                     copyright = "(c) Canonical Ltd, 2005-2010",
 
501
                                     copyright = "(c) Canonical Ltd, 2005-2007",
558
502
                                     company_name = "Canonical Ltd.",
559
503
                                     comments = META_INFO['description'],
560
504
                                    )
573
517
    if sys.version.startswith('2.4'):
574
518
        # adding elementtree package
575
519
        additional_packages.add('elementtree')
576
 
    elif sys.version.startswith('2.6') or sys.version.startswith('2.5'):
 
520
    elif sys.version.startswith('2.5'):
577
521
        additional_packages.add('xml.etree')
578
522
    else:
579
523
        import warnings
587
531
                  ImaginaryModule cElementTree elementtree.ElementTree
588
532
                  Crypto.PublicKey._fastmath
589
533
                  medusa medusa.filesys medusa.ftp_server
590
 
                  tools
 
534
                  tools tools.doc_generate
591
535
                  resource validate""".split()
592
536
    dll_excludes = []
593
537
 
625
569
            excludes.extend(["bzrlib.plugins." + d for d in dirs])
626
570
        x = []
627
571
        for i in files:
628
 
            # Throw away files we don't want packaged. Note that plugins may
629
 
            # have data files with all sorts of extensions so we need to
630
 
            # be conservative here about what we ditch.
631
 
            ext = os.path.splitext(i)[1]
632
 
            if ext.endswith('~') or ext in [".pyc", ".swp"]:
 
572
            if os.path.splitext(i)[1] not in [".py", ".pyd", ".dll", ".mo"]:
633
573
                continue
634
574
            if i == '__init__.py' and root == 'bzrlib/plugins':
635
575
                continue
649
589
                       'tools/win32/bzr_postinstall.py',
650
590
                       ]
651
591
    gui_targets = []
 
592
    com_targets = []
652
593
    data_files = topics_files + plugins_files
653
594
 
654
595
    if 'qbzr' in plugins:
655
 
        get_qbzr_py2exe_info(includes, excludes, packages, data_files)
 
596
        get_qbzr_py2exe_info(includes, excludes, packages)
656
597
 
657
598
    if 'svn' in plugins:
658
599
        get_svn_py2exe_info(includes, excludes, packages)
661
602
        # TORTOISE_OVERLAYS_MSI_WIN32 must be set to the location of the
662
603
        # TortoiseOverlays MSI installer file. It is in the TSVN svn repo and
663
604
        # can be downloaded from (username=guest, blank password):
664
 
        # http://tortoisesvn.tigris.org/svn/tortoisesvn/TortoiseOverlays
665
 
        # 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
666
606
        # Ditto for TORTOISE_OVERLAYS_MSI_X64, pointing at *-x64.msi.
667
607
        for needed in ('TORTOISE_OVERLAYS_MSI_WIN32',
668
608
                       'TORTOISE_OVERLAYS_MSI_X64'):
669
 
            url = ('http://guest:@tortoisesvn.tigris.org/svn/tortoisesvn'
670
 
                   '/TortoiseOverlays')
671
609
            if not os.path.isfile(os.environ.get(needed, '<nofile>')):
672
 
                raise RuntimeError(
673
 
                    "\nPlease set %s to the location of the relevant"
674
 
                    "\nTortoiseOverlays .msi installer file."
675
 
                    " The installers can be found at"
676
 
                    "\n  %s"
677
 
                    "\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)
678
613
        get_tbzr_py2exe_info(includes, excludes, packages, console_targets,
679
614
                             gui_targets, data_files)
680
615
    else:
699
634
    setup(options=options_list,
700
635
          console=console_targets,
701
636
          windows=gui_targets,
 
637
          com_server=com_targets,
702
638
          zipfile='lib/library.zip',
703
639
          data_files=data_files,
704
640
          cmdclass={'install_data': install_data_with_bytecompile},
708
644
    # ad-hoc for easy_install
709
645
    DATA_FILES = []
710
646
    if not 'bdist_egg' in sys.argv:
711
 
        # generate and install bzr.1 only with plain install, not the
712
 
        # easy_install one
 
647
        # generate and install bzr.1 only with plain install, not easy_install one
713
648
        DATA_FILES = [('man/man1', ['bzr.1'])]
714
649
 
715
 
    if sys.platform != 'win32':
716
 
        # see https://wiki.kubuntu.org/Apport/DeveloperHowTo
717
 
        #
718
 
        # checking the paths and hardcoding the check for root is a bit gross,
719
 
        # but I don't see a cleaner way to find out the locations in a way
720
 
        # that's going to align with the hardcoded paths in apport.
721
 
        if os.geteuid() == 0:
722
 
            DATA_FILES += [
723
 
                ('/usr/share/apport/package-hooks',
724
 
                    ['apport/source_bzr.py']),
725
 
                ('/etc/apport/crashdb.conf.d/',
726
 
                    ['apport/bzr-crashdb.conf']),]
727
 
 
728
650
    # std setup
729
651
    ARGS = {'scripts': ['bzr'],
730
652
            'data_files': DATA_FILES,