/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: Jelmer Vernooij
  • Date: 2009-02-25 15:36:48 UTC
  • mfrom: (4048 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4050.
  • Revision ID: jelmer@samba.org-20090225153648-7r5mk20nr9dttqbf
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
setup.py
197
197
        except DistutilsPlatformError, e:
198
198
            if not self.allow_python_fallback:
199
199
                log.warn('\n  Cannot build extensions.\n'
200
 
                         '  Use --allow-python-fallback to use slower'
201
 
                         ' python implementations instead.\n')
 
200
                         '  Use "build_ext --allow-python-fallback" to use'
 
201
                         ' slower python implementations instead.\n')
202
202
                raise
203
203
            log.warn(str(e))
204
204
            log.warn('\n  Extensions cannot be built.\n'
209
209
            build_ext.build_extension(self, ext)
210
210
        except CCompilerError:
211
211
            if not self.allow_python_fallback:
212
 
                log.warn('\n  Failed to build "%s".\n'
213
 
                         '  Use --allow-python-fallback to use slower'
214
 
                         ' python implementations instead.\n'
 
212
                log.warn('\n  Cannot build extensions.\n'
 
213
                         '  Use "build_ext --allow-python-fallback" to use'
 
214
                         ' slower python implementations instead.\n'
215
215
                         % (ext.name,))
216
216
                raise
217
217
            log.warn('\n  Building of "%s" extension failed.\n'
408
408
        os.environ["PATH"] = path + os.pathsep + qt_dir
409
409
 
410
410
 
 
411
def get_svn_py2exe_info(includes, excludes, packages):
 
412
    packages.append('subvertpy')
 
413
 
 
414
 
411
415
if 'bdist_wininst' in sys.argv:
412
416
    def find_docs():
413
417
        docs = []
586
590
    if 'qbzr' in plugins:
587
591
        get_qbzr_py2exe_info(includes, excludes, packages)
588
592
 
 
593
    if 'svn' in plugins:
 
594
        get_svn_py2exe_info(includes, excludes, packages)
 
595
 
589
596
    if "TBZR" in os.environ:
590
597
        # TORTOISE_OVERLAYS_MSI_WIN32 must be set to the location of the
591
598
        # TortoiseOverlays MSI installer file. It is in the TSVN svn repo and
609
616
 
610
617
    # MSWSOCK.dll is a system-specific library, which py2exe accidentally pulls
611
618
    # in on Vista.
612
 
    dll_excludes.append("MSWSOCK.dll")
 
619
    dll_excludes.extend(["MSWSOCK.dll", "MSVCP60.dll", "powrprof.dll"])
613
620
    options_list = {"py2exe": {"packages": packages + list(additional_packages),
614
621
                               "includes": includes,
615
622
                               "excludes": excludes,