← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to setup.py

  • Committer: Joe Julian
  • Date: 2010-01-10 02:25:31 UTC
  • mto: (4634.119.7 2.0)
  • mto: This revision was merged to the branch mainline in revision 4959.
  • Revision ID: joe@julianfamily.org-20100110022531-wqk61rsagz8xsiga
https://launchpad.net/bugs/175839
Added MANIFEST.in to allow bdist_rpm to have all the required include files and tools. bdist_rpm will still fail to build correctly on some distributions due to a disttools bug http://bugs.python.org/issue644744

Show diffs side-by-side

added added

removed removed

Lines of Context:
setup.py
9
9
import os
10
10
import os.path
11
11
import sys
12
 
import copy
13
12
 
14
 
if sys.version_info < (2, 6):
15
 
    sys.stderr.write("[ERROR] Not a supported Python version. Need 2.6+\n")
 
13
if sys.version_info < (2, 4):
 
14
    sys.stderr.write("[ERROR] Not a supported Python version. Need 2.4+\n")
16
15
    sys.exit(1)
17
16
 
18
17
# NOTE: The directory containing setup.py, whether run by 'python setup.py' or
38
37
    'version':      bzrlib.__version__,
39
38
    'author':       'Canonical Ltd',
40
39
    'author_email': 'bazaar@lists.canonical.com',
41
 
    'url':          'http://bazaar.canonical.com/',
 
40
    'url':          'http://www.bazaar-vcs.org/',
42
41
    'description':  'Friendly distributed version control system',
43
42
    'license':      'GNU GPL v2',
44
43
    'download_url': 'https://launchpad.net/bzr/+download',
66
65
            'package_data': {'bzrlib': ['doc/api/*.txt',
67
66
                                        'tests/test_patches_data/*',
68
67
                                        'help_topics/en/*.txt',
69
 
                                        'tests/ssl_certs/ca.crt',
70
68
                                        'tests/ssl_certs/server_without_pass.key',
71
69
                                        'tests/ssl_certs/server_with_pass.key',
72
 
                                        'tests/ssl_certs/server.crt',
73
 
                                        'locale/*/LC_MESSAGES/*.mo',
 
70
                                        'tests/ssl_certs/server.crt'
74
71
                                       ]},
75
72
           }
76
73
 
128
125
                f = file(batch_path, "w")
129
126
                f.write(batch_str)
130
127
                f.close()
131
 
                print("Created: %s" % batch_path)
132
 
            except Exception:
133
 
                e = sys.exc_info()[1]
134
 
                print("ERROR: Unable to create %s: %s" % (batch_path, e))
 
128
                print "Created:", batch_path
 
129
            except Exception, e:
 
130
                print "ERROR: Unable to create %s: %s" % (batch_path, e)
135
131
 
136
132
    def _quoted_path(self, path):
137
133
        if ' ' in path:
153
149
    Generate bzr.1.
154
150
    """
155
151
 
156
 
    sub_commands = build.sub_commands + [
157
 
            ('build_mo', lambda _: True),
158
 
            ]
159
 
 
160
152
    def run(self):
161
153
        build.run(self)
162
154
 
168
160
## Setup
169
161
########################
170
162
 
171
 
from tools.build_mo import build_mo
172
 
 
173
163
command_classes = {'install_scripts': my_install_scripts,
174
 
                   'build': bzr_build,
175
 
                   'build_mo': build_mo,
176
 
                   }
 
164
                   'build': bzr_build}
177
165
from distutils import log
178
166
from distutils.errors import CCompilerError, DistutilsPlatformError
179
167
from distutils.extension import Extension
180
168
ext_modules = []
181
169
try:
182
 
    try:
183
 
        from Cython.Distutils import build_ext
184
 
        from Cython.Compiler.Version import version as pyrex_version
185
 
    except ImportError:
186
 
        print("No Cython, trying Pyrex...")
187
 
        from Pyrex.Distutils import build_ext
188
 
        from Pyrex.Compiler.Version import version as pyrex_version
 
170
    from Pyrex.Distutils import build_ext
189
171
except ImportError:
190
172
    have_pyrex = False
191
173
    # try to build the extension from the prior generated source.
192
 
    print("")
193
 
    print("The python package 'Pyrex' is not available."
194
 
          " If the .c files are available,")
195
 
    print("they will be built,"
196
 
          " but modifying the .pyx files will not rebuild them.")
197
 
    print("")
 
174
    print
 
175
    print ("The python package 'Pyrex' is not available."
 
176
           " If the .c files are available,")
 
177
    print ("they will be built,"
 
178
           " but modifying the .pyx files will not rebuild them.")
 
179
    print
198
180
    from distutils.command.build_ext import build_ext
199
181
else:
200
182
    have_pyrex = True
201
 
    pyrex_version_info = tuple(map(int, pyrex_version.split('.')))
 
183
    from Pyrex.Compiler.Version import version as pyrex_version
202
184
 
203
185
 
204
186
class build_ext_if_possible(build_ext):
216
198
    def run(self):
217
199
        try:
218
200
            build_ext.run(self)
219
 
        except DistutilsPlatformError:
220
 
            e = sys.exc_info()[1]
 
201
        except DistutilsPlatformError, e:
221
202
            if not self.allow_python_fallback:
222
203
                log.warn('\n  Cannot build extensions.\n'
223
204
                         '  Use "build_ext --allow-python-fallback" to use'
284
265
 
285
266
add_pyrex_extension('bzrlib._annotator_pyx')
286
267
add_pyrex_extension('bzrlib._bencode_pyx')
 
268
add_pyrex_extension('bzrlib._btree_serializer_pyx')
287
269
add_pyrex_extension('bzrlib._chunks_to_lines_pyx')
288
270
add_pyrex_extension('bzrlib._groupcompress_pyx',
289
271
                    extra_source=['bzrlib/diff-delta.c'])
294
276
    add_pyrex_extension('bzrlib._dirstate_helpers_pyx',
295
277
                        libraries=['Ws2_32'])
296
278
    add_pyrex_extension('bzrlib._walkdirs_win32')
 
279
    z_lib = 'zdll'
297
280
else:
298
 
    if have_pyrex and pyrex_version_info[:3] == (0,9,4):
 
281
    if have_pyrex and pyrex_version == '0.9.4.1':
299
282
        # Pyrex 0.9.4.1 fails to compile this extension correctly
300
283
        # The code it generates re-uses a "local" pointer and
301
284
        # calls "PY_DECREF" after having set it to NULL. (It mixes PY_XDECREF
302
285
        # which is NULL safe with PY_DECREF which is not.)
303
 
        # <https://bugs.launchpad.net/bzr/+bug/449372>
304
 
        # <https://bugs.launchpad.net/bzr/+bug/276868>
305
 
        print('Cannot build extension "bzrlib._dirstate_helpers_pyx" using')
306
 
        print('your version of pyrex "%s". Please upgrade your pyrex'
307
 
              % (pyrex_version,))
308
 
        print('install. For now, the non-compiled (python) version will')
309
 
        print('be used instead.')
 
286
        print 'Cannot build extension "bzrlib._dirstate_helpers_pyx" using'
 
287
        print 'your version of pyrex "%s". Please upgrade your pyrex' % (
 
288
            pyrex_version,)
 
289
        print 'install. For now, the non-compiled (python) version will'
 
290
        print 'be used instead.'
310
291
    else:
311
292
        add_pyrex_extension('bzrlib._dirstate_helpers_pyx')
312
293
    add_pyrex_extension('bzrlib._readdir_pyx')
313
 
add_pyrex_extension('bzrlib._chk_map_pyx')
 
294
    z_lib = 'z'
 
295
add_pyrex_extension('bzrlib._chk_map_pyx', libraries=[z_lib])
314
296
ext_modules.append(Extension('bzrlib._patiencediff_c',
315
297
                             ['bzrlib/_patiencediff_c.c']))
316
 
if have_pyrex and pyrex_version_info < (0, 9, 6, 3):
317
 
    print("")
318
 
    print('Your Pyrex/Cython version %s is too old to build the simple_set' % (
319
 
        pyrex_version))
320
 
    print('and static_tuple extensions.')
321
 
    print('Please upgrade to at least Pyrex 0.9.6.3')
322
 
    print("")
323
 
    # TODO: Should this be a fatal error?
324
 
else:
325
 
    # We only need 0.9.6.3 to build _simple_set_pyx, but static_tuple depends
326
 
    # on simple_set
327
 
    add_pyrex_extension('bzrlib._simple_set_pyx')
328
 
    ext_modules.append(Extension('bzrlib._static_tuple_c',
329
 
                                 ['bzrlib/_static_tuple_c.c']))
330
 
add_pyrex_extension('bzrlib._btree_serializer_pyx')
331
298
 
332
299
 
333
300
if unavailable_files:
334
 
    print('C extension(s) not found:')
335
 
    print('   %s' % ('\n  '.join(unavailable_files),))
336
 
    print('The python versions will be used instead.')
337
 
    print("")
 
301
    print 'C extension(s) not found:'
 
302
    print '   %s' % ('\n  '.join(unavailable_files),)
 
303
    print 'The python versions will be used instead.'
 
304
    print
338
305
 
339
306
 
340
307
def get_tbzr_py2exe_info(includes, excludes, packages, console_targets,
404
371
    # ditto for the tbzrcommand tool
405
372
    tbzrcommand = dict(
406
373
        script = os.path.join(tbzr_root, "scripts", "tbzrcommand.py"),
407
 
        icon_resources = icon_resources,
408
 
        other_resources = other_resources,
 
374
        icon_resources = [(0,'bzr.ico')],
409
375
    )
410
376
    console_targets.append(tbzrcommand)
411
377
    tbzrcommandw = tbzrcommand.copy()
425
391
 
426
392
def get_qbzr_py2exe_info(includes, excludes, packages, data_files):
427
393
    # PyQt4 itself still escapes the plugin detection code for some reason...
428
 
    includes.append('PyQt4.QtCore')
429
 
    includes.append('PyQt4.QtGui')
 
394
    packages.append('PyQt4')
 
395
    excludes.append('PyQt4.elementtree.ElementTree')
430
396
    includes.append('sip') # extension module required for Qt.
431
397
    packages.append('pygments') # colorizer for qbzr
432
398
    packages.append('docutils') # html formatting
433
399
    includes.append('win32event')  # for qsubprocess stuff
 
400
    # but we can avoid many Qt4 Dlls.
 
401
    dll_excludes.extend(
 
402
        """QtAssistantClient4.dll QtCLucene4.dll QtDesigner4.dll
 
403
        QtHelp4.dll QtNetwork4.dll QtOpenGL4.dll QtScript4.dll
 
404
        QtSql4.dll QtTest4.dll QtWebKit4.dll QtXml4.dll
 
405
        qscintilla2.dll""".split())
434
406
    # the qt binaries might not be on PATH...
435
407
    # They seem to install to a place like C:\Python25\PyQt4\*
436
408
    # Which is not the same as C:\Python25\Lib\site-packages\PyQt4
475
447
 
476
448
def get_svn_py2exe_info(includes, excludes, packages):
477
449
    packages.append('subvertpy')
478
 
    packages.append('sqlite3')
479
 
 
480
 
 
481
 
def get_fastimport_py2exe_info(includes, excludes, packages):
482
 
    # This is the python-fastimport package, not to be confused with the
483
 
    # bzr-fastimport plugin.
484
 
    packages.append('fastimport')
485
450
 
486
451
 
487
452
if 'bdist_wininst' in sys.argv:
508
473
            # help pages
509
474
            'data_files': find_docs(),
510
475
            # for building pyrex extensions
511
 
            'cmdclass': command_classes,
 
476
            'cmdclass': {'build_ext': build_ext_if_possible},
512
477
           }
513
478
 
514
479
    ARGS.update(META_INFO)
515
480
    ARGS.update(BZRLIB)
516
481
    ARGS.update(PKG_DATA)
517
 
 
 
482
    
518
483
    setup(**ARGS)
519
484
 
520
485
elif 'py2exe' in sys.argv:
545
510
            install_data.run(self)
546
511
 
547
512
            py2exe = self.distribution.get_command_obj('py2exe', False)
548
 
            # GZ 2010-04-19: Setup has py2exe.optimize as 2, but give plugins
549
 
            #                time before living with docstring stripping
550
 
            optimize = 1
 
513
            optimize = py2exe.optimize
551
514
            compile_names = [f for f in self.outfiles if f.endswith('.py')]
552
 
            # Round mtime to nearest even second so that installing on a FAT
553
 
            # filesystem bytecode internal and script timestamps will match
554
 
            for f in compile_names:
555
 
                mtime = os.stat(f).st_mtime
556
 
                remainder = mtime % 2
557
 
                if remainder:
558
 
                    mtime -= remainder
559
 
                    os.utime(f, (mtime, mtime))
560
515
            byte_compile(compile_names,
561
516
                         optimize=optimize,
562
517
                         force=self.force, prefix=self.install_dir,
563
518
                         dry_run=self.dry_run)
564
 
            self.outfiles.extend([f + 'o' for f in compile_names])
 
519
            if optimize:
 
520
                suffix = 'o'
 
521
            else:
 
522
                suffix = 'c'
 
523
            self.outfiles.extend([f + suffix for f in compile_names])
565
524
    # end of class install_data_with_bytecompile
566
525
 
567
526
    target = py2exe.build_exe.Target(script = "bzr",
571
530
                                     version = version_str,
572
531
                                     description = META_INFO['description'],
573
532
                                     author = META_INFO['author'],
574
 
                                     copyright = "(c) Canonical Ltd, 2005-2010",
 
533
                                     copyright = "(c) Canonical Ltd, 2005-2009",
575
534
                                     company_name = "Canonical Ltd.",
576
535
                                     comments = META_INFO['description'],
577
536
                                    )
578
 
    gui_target = copy.copy(target)
579
 
    gui_target.dest_base = "bzrw"
580
537
 
581
538
    packages = BZRLIB['packages']
582
539
    packages.remove('bzrlib')
592
549
    if sys.version.startswith('2.4'):
593
550
        # adding elementtree package
594
551
        additional_packages.add('elementtree')
595
 
    elif sys.version.startswith('2.6') or sys.version.startswith('2.5'):
 
552
    elif sys.version.startswith('2.5'):
596
553
        additional_packages.add('xml.etree')
597
554
    else:
598
555
        import warnings
644
601
            excludes.extend(["bzrlib.plugins." + d for d in dirs])
645
602
        x = []
646
603
        for i in files:
647
 
            # Throw away files we don't want packaged. Note that plugins may
648
 
            # have data files with all sorts of extensions so we need to
649
 
            # be conservative here about what we ditch.
650
 
            ext = os.path.splitext(i)[1]
651
 
            if ext.endswith('~') or ext in [".pyc", ".swp"]:
 
604
            if os.path.splitext(i)[1] not in [".py", ".pyd", ".dll", ".mo"]:
652
605
                continue
653
606
            if i == '__init__.py' and root == 'bzrlib/plugins':
654
607
                continue
667
620
    console_targets = [target,
668
621
                       'tools/win32/bzr_postinstall.py',
669
622
                       ]
670
 
    gui_targets = [gui_target]
 
623
    gui_targets = []
671
624
    data_files = topics_files + plugins_files
672
625
 
673
626
    if 'qbzr' in plugins:
676
629
    if 'svn' in plugins:
677
630
        get_svn_py2exe_info(includes, excludes, packages)
678
631
 
679
 
    if 'fastimport' in plugins:
680
 
        get_fastimport_py2exe_info(includes, excludes, packages)
681
 
 
682
632
    if "TBZR" in os.environ:
683
633
        # TORTOISE_OVERLAYS_MSI_WIN32 must be set to the location of the
684
634
        # TortoiseOverlays MSI installer file. It is in the TSVN svn repo and
703
653
        # print this warning to stderr as output is redirected, so it is seen
704
654
        # at build time.  Also to stdout so it appears in the log
705
655
        for f in (sys.stderr, sys.stdout):
706
 
            f.write("Skipping TBZR binaries - "
707
 
                "please set TBZR to a directory to enable\n")
 
656
            print >> f, \
 
657
                "Skipping TBZR binaries - please set TBZR to a directory to enable"
708
658
 
709
659
    # MSWSOCK.dll is a system-specific library, which py2exe accidentally pulls
710
660
    # in on Vista.
711
 
    dll_excludes.extend(["MSWSOCK.dll",
712
 
                         "MSVCP60.dll",
713
 
                         "MSVCP90.dll",
714
 
                         "powrprof.dll",
715
 
                         "SHFOLDER.dll"])
 
661
    dll_excludes.extend(["MSWSOCK.dll", "MSVCP60.dll", "powrprof.dll"])
716
662
    options_list = {"py2exe": {"packages": packages + list(additional_packages),
717
663
                               "includes": includes,
718
664
                               "excludes": excludes,
719
665
                               "dll_excludes": dll_excludes,
720
666
                               "dist_dir": "win32_bzr.exe",
721
 
                               "optimize": 2,
722
 
                               "custom_boot_script":
723
 
                                        "tools/win32/py2exe_boot_common.py",
 
667
                               "optimize": 1,
724
668
                              },
725
669
                   }
726
670
 
727
 
    # We want the libaray.zip to have optimize = 2, but the exe to have
728
 
    # optimize = 1, so that .py files that get compilied at run time
729
 
    # (e.g. user installed plugins) dont have their doc strings removed.
730
 
    class py2exe_no_oo_exe(py2exe.build_exe.py2exe):
731
 
        def build_executable(self, *args, **kwargs):
732
 
            self.optimize = 1
733
 
            py2exe.build_exe.py2exe.build_executable(self, *args, **kwargs)
734
 
            self.optimize = 2
735
 
 
736
 
    if __name__ == '__main__':
737
 
        command_classes['install_data'] = install_data_with_bytecompile
738
 
        command_classes['py2exe'] = py2exe_no_oo_exe
739
 
        setup(options=options_list,
740
 
              console=console_targets,
741
 
              windows=gui_targets,
742
 
              zipfile='lib/library.zip',
743
 
              data_files=data_files,
744
 
              cmdclass=command_classes,
745
 
              )
 
671
    setup(options=options_list,
 
672
          console=console_targets,
 
673
          windows=gui_targets,
 
674
          zipfile='lib/library.zip',
 
675
          data_files=data_files,
 
676
          cmdclass={'install_data': install_data_with_bytecompile},
 
677
          )
746
678
 
747
679
else:
748
680
    # ad-hoc for easy_install
763
695
    ARGS.update(BZRLIB)
764
696
    ARGS.update(PKG_DATA)
765
697
 
766
 
    if __name__ == '__main__':
767
 
        setup(**ARGS)
 
698
    setup(**ARGS)