← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to setup.py

Merge cleanup into first-try

Show diffs side-by-side

added added

removed removed

Lines of Context:
setup.py
532
532
            install_data.run(self)
533
533
 
534
534
            py2exe = self.distribution.get_command_obj('py2exe', False)
535
 
            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
536
538
            compile_names = [f for f in self.outfiles if f.endswith('.py')]
537
539
            byte_compile(compile_names,
538
540
                         optimize=optimize,
539
541
                         force=self.force, prefix=self.install_dir,
540
542
                         dry_run=self.dry_run)
541
 
            if optimize:
542
 
                suffix = 'o'
543
 
            else:
544
 
                suffix = 'c'
545
 
            self.outfiles.extend([f + suffix for f in compile_names])
 
543
            self.outfiles.extend([f + 'o' for f in compile_names])
546
544
    # end of class install_data_with_bytecompile
547
545
 
548
546
    target = py2exe.build_exe.Target(script = "bzr",
690
688
                               "excludes": excludes,
691
689
                               "dll_excludes": dll_excludes,
692
690
                               "dist_dir": "win32_bzr.exe",
693
 
                               "optimize": 1,
 
691
                               "optimize": 2,
694
692
                              },
695
693
                   }
696
694