/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

(parthm) Lock URL shown in case of failure to acquire lock (for smart server
 access) is now valid. Default timeout for lock contention is now 30s.
 (Parth Malwankar)

Show diffs side-by-side

added added

removed removed

Lines of Context:
setup.py
281
281
    add_pyrex_extension('bzrlib._dirstate_helpers_pyx',
282
282
                        libraries=['Ws2_32'])
283
283
    add_pyrex_extension('bzrlib._walkdirs_win32')
284
 
    z_lib = 'zdll'
285
284
else:
286
285
    if have_pyrex and pyrex_version_info[:3] == (0,9,4):
287
286
        # Pyrex 0.9.4.1 fails to compile this extension correctly
298
297
    else:
299
298
        add_pyrex_extension('bzrlib._dirstate_helpers_pyx')
300
299
    add_pyrex_extension('bzrlib._readdir_pyx')
301
 
    z_lib = 'z'
302
 
add_pyrex_extension('bzrlib._chk_map_pyx', libraries=[z_lib])
 
300
add_pyrex_extension('bzrlib._chk_map_pyx')
303
301
ext_modules.append(Extension('bzrlib._patiencediff_c',
304
302
                             ['bzrlib/_patiencediff_c.c']))
305
303
if have_pyrex and pyrex_version_info < (0, 9, 6, 3):
534
532
            install_data.run(self)
535
533
 
536
534
            py2exe = self.distribution.get_command_obj('py2exe', False)
537
 
            optimize = py2exe.optimize
 
535
            # GZ 2010-04-19: Setup has py2exe.optimize as 2, but give plugins
 
536
            #                time before living with docstring stripping
 
537
            optimize = 1
538
538
            compile_names = [f for f in self.outfiles if f.endswith('.py')]
539
539
            byte_compile(compile_names,
540
540
                         optimize=optimize,
541
541
                         force=self.force, prefix=self.install_dir,
542
542
                         dry_run=self.dry_run)
543
 
            if optimize:
544
 
                suffix = 'o'
545
 
            else:
546
 
                suffix = 'c'
547
 
            self.outfiles.extend([f + suffix for f in compile_names])
 
543
            self.outfiles.extend([f + 'o' for f in compile_names])
548
544
    # end of class install_data_with_bytecompile
549
545
 
550
546
    target = py2exe.build_exe.Target(script = "bzr",
692
688
                               "excludes": excludes,
693
689
                               "dll_excludes": dll_excludes,
694
690
                               "dist_dir": "win32_bzr.exe",
695
 
                               "optimize": 1,
 
691
                               "optimize": 2,
696
692
                              },
697
693
                   }
698
694