/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: Robert Collins
  • Date: 2010-05-06 11:08:10 UTC
  • mto: This revision was merged to the branch mainline in revision 5223.
  • Revision ID: robertc@robertcollins.net-20100506110810-h3j07fh5gmw54s25
Cleaner matcher matching revised unlocking protocol.

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