← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to setup.py

  • Committer: John Arbash Meinel
  • Date: 2010-08-06 19:54:45 UTC
  • mfrom: (5050.3.21 2.2-final)
  • mto: This revision was merged to the branch mainline in revision 5371.
  • Revision ID: john@arbash-meinel.com-20100806195445-7vsjls3uf8o6t7kt
Merge the 2.2-final branch into trunk, in preparation for release.

Had to fix up one NEWS entry that accidentally got merged into the 2.2 section.

Show diffs side-by-side

added added

removed removed

Lines of Context:
setup.py
9
9
import os
10
10
import os.path
11
11
import sys
 
12
import copy
12
13
 
13
14
if sys.version_info < (2, 4):
14
15
    sys.stderr.write("[ERROR] Not a supported Python version. Need 2.4+\n")
557
558
                                     company_name = "Canonical Ltd.",
558
559
                                     comments = META_INFO['description'],
559
560
                                    )
 
561
    gui_target = copy.copy(target)
 
562
    gui_target.dest_base = "bzrw"
560
563
 
561
564
    packages = BZRLIB['packages']
562
565
    packages.remove('bzrlib')
647
650
    console_targets = [target,
648
651
                       'tools/win32/bzr_postinstall.py',
649
652
                       ]
650
 
    gui_targets = []
 
653
    gui_targets = [gui_target]
651
654
    data_files = topics_files + plugins_files
652
655
 
653
656
    if 'qbzr' in plugins:
692
695
                               "dll_excludes": dll_excludes,
693
696
                               "dist_dir": "win32_bzr.exe",
694
697
                               "optimize": 2,
 
698
                               "custom_boot_script":
 
699
                                        "tools/win32/py2exe_boot_common.py",
695
700
                              },
696
701
                   }
697
702