/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-11 08:44:59 UTC
  • mfrom: (5221 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5223.
  • Revision ID: robertc@robertcollins.net-20100511084459-pb0uinna9zs3wu59
Merge trunk - resolve conflicts.

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
 
            # GZ 2010-04-19: Setup has py2exe.optimize as 2, but give plugins
536
 
            #                time before living with docstring stripping
537
 
            optimize = 1
 
535
            optimize = py2exe.optimize
538
536
            compile_names = [f for f in self.outfiles if f.endswith('.py')]
539
537
            byte_compile(compile_names,
540
538
                         optimize=optimize,
541
539
                         force=self.force, prefix=self.install_dir,
542
540
                         dry_run=self.dry_run)
543
 
            self.outfiles.extend([f + 'o' for f in compile_names])
 
541
            if optimize:
 
542
                suffix = 'o'
 
543
            else:
 
544
                suffix = 'c'
 
545
            self.outfiles.extend([f + suffix for f in compile_names])
544
546
    # end of class install_data_with_bytecompile
545
547
 
546
548
    target = py2exe.build_exe.Target(script = "bzr",
688
690
                               "excludes": excludes,
689
691
                               "dll_excludes": dll_excludes,
690
692
                               "dist_dir": "win32_bzr.exe",
691
 
                               "optimize": 2,
 
693
                               "optimize": 1,
692
694
                              },
693
695
                   }
694
696