Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.7, 0.7.1, and 0.7.2

setup: avoid warnings from distutils

Just add options to extras dictionary when necessary.

Changeset 6dbe8a1c395c…

Parent 67928cf7e673…

by Steve Borho

Changes to one file · Browse files at 6dbe8a1c395c Showing diff from parent 67928cf7e673 Diff from another changeset...

Change 1 of 5 Show Entire File setup.py Stacked
 
19
20
21
22
23
24
25
 
63
64
65
66
 
67
68
69
 
79
80
81
82
 
83
84
85
86
87
88
89
90
 
94
95
96
97
 
98
99
100
101
 
102
103
 
104
105
106
 
132
133
134
135
136
137
 
19
20
21
 
22
23
24
 
62
63
64
 
65
66
67
68
 
78
79
80
 
81
82
83
84
85
 
86
87
88
 
92
93
94
 
95
96
97
98
 
99
100
 
101
102
103
104
 
130
131
132
 
133
134
@@ -19,7 +19,6 @@
  _scripts = []   _data_files = []   _packages = ['hggtk', 'hggtk.vis', 'hggtk.iniparse', 'tortoise'] - opts = {}   extra = {}   hgextmods = []   @@ -63,7 +62,7 @@
  extra['com_server'] = ["tortoisehg"]   extra['console'] = ["contrib/hg", "contrib/hgtk"]   - opts = { + extra['options'] = {   "py2exe" : {   # Don't pull in all this MFC stuff used by the makepy UI.   "excludes" : "pywin,pywin.dialogs,pywin.dialogs.list", @@ -79,12 +78,11 @@
  }   }   - return _scripts, _packages, _data_files, opts, extra + return _scripts, _packages, _data_files, extra      def setup_posix():   # Specific definitios for Posix installations - _opts = {}   _extra = {}   _scripts = ['contrib/hgtk', 'hgproc.py']   _packages = ['hggtk', 'hggtk.vis', 'hggtk.iniparse', 'tortoise'] @@ -94,13 +92,13 @@
  _data_files += [('lib/nautilus/extensions-2.0/python',   ['contrib/nautilus-thg.py'])]   - return _scripts, _packages, _data_files, _opts, _extra + return _scripts, _packages, _data_files, _extra      if os.name == "nt": - (scripts, packages, data_files, opts, extra) = setup_windows() + (scripts, packages, data_files, extra) = setup_windows()  else: - (scripts, packages, data_files, opts, extra) = setup_posix() + (scripts, packages, data_files, extra) = setup_posix()      # specify version string, otherwise 'hg identify' will be used: @@ -132,6 +130,5 @@
  scripts=scripts,   packages=packages,   data_files=data_files, - options=opts, # in Linux an empty 'options' gives a warning.   **extra   )