Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.8, 0.8.1, and 0.8.2

setup: new packages, drop bundling of extensions

Changeset d8df8d66586b…

Parent b8ca22ed14cc…

by Steve Borho

Changes to one file · Browse files at d8df8d66586b Showing diff from parent b8ca22ed14cc Diff from another changeset...

Change 1 of 5 Show Entire File setup.py Stacked
 
16
17
18
19
 
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
 
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
 
83
84
85
86
 
87
88
89
 
95
96
97
98
 
99
100
101
 
122
123
124
125
 
126
127
128
129
130
131
132
133
 
 
134
135
136
 
16
17
18
 
19
20
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
21
22
23
 
25
26
27
 
 
 
 
 
28
29
 
 
 
 
 
 
30
31
32
33
 
 
 
 
 
 
 
34
35
36
 
46
47
48
 
49
50
51
52
 
58
59
60
 
61
62
63
64
 
85
86
87
 
88
89
90
91
92
93
94
 
 
95
96
97
98
99
@@ -16,27 +16,8 @@
  # Specific definitios for Windows NT-alike installations   _scripts = []   _data_files = [] - _packages = ['hggtk', 'hggtk.vis', 'hggtk.iniparse', 'tortoise'] + _packages = ['hggtk', 'thgutil']   extra = {} - hgextmods = [] - - # ModuleFinder can't handle runtime changes to __path__, - # but win32com uses them - - try: - # if this doesn't work, try import modulefinder - import py2exe.mf as modulefinder - import win32com - for p in win32com.__path__[1:]: - modulefinder.AddPackagePath("win32com", p) - for e in ["win32com.shell"]: #,"win32com.mapi" - __import__(e) - m = sys.modules[e] - for p in m.__path__[1:]: - modulefinder.AddPackagePath(e, p) - except ImportError: - # no build path setup, no worries. - pass     try: import py2exe   except ImportError: @@ -44,30 +25,12 @@
  raise     if 'py2exe' in sys.argv: - # FIXME: quick hack to include installed hg extensions in py2exe binary - import hgext - hgextdir = os.path.dirname(hgext.__file__) - hgextmods = set(["hgext." + os.path.splitext(f)[0] - for f in os.listdir(hgextdir)])   _data_files = [(root, [os.path.join(root, file_) for file_ in files])   for root, dirs, files in os.walk('icons')] - extra['windows'] = [ - {"script":"contrib/tracelog.py", - "icon_resources": [(1, "icons/tortoise/python.ico")]} - ] - extra['com_server'] = ["tortoisehg"] - extra['console'] = ["contrib/hg", "hgtk"]     # add library files to support PyGtk-based dialogs/windows   includes = ['dbhash', 'pango', 'atk', 'pangocairo', 'cairo', 'gobject']   - # Manually include other modules py2exe can't find by itself. - if 'hgext.highlight' in hgextmods: - includes += ['pygments.*', 'pygments.lexers.*', 'pygments.formatters.*', - 'pygments.filters.*', 'pygments.styles.*'] - if 'hgext.patchbomb' in hgextmods: - includes += ['email.*', 'email.mime.*'] -   extra['options'] = {   "py2exe" : {   # This is one way to ensure that hgtk can find its icons when @@ -83,7 +46,7 @@
  # the dist directory created by py2exe.   # also needed is the GTK's share/themes (as dist/share/themes),   # for dialogs to display in MS-Windows XP theme. - "includes" : includes + list(hgextmods), + "includes" : includes   "optimize" : 1,   }   } @@ -95,7 +58,7 @@
  # Specific definitios for Posix installations   _extra = {}   _scripts = ['hgtk'] - _packages = ['hggtk', 'hggtk.vis', 'hggtk.iniparse', 'tortoise'] + _packages = ['hggtk', 'thgutil']   _data_files = [(os.path.join('share/pixmaps/tortoisehg', root),   [os.path.join(root, file_) for file_ in files])   for root, dirs, files in os.walk('icons')] @@ -122,15 +85,15 @@
 except OSError:   version = "unknown"   -verfile = os.path.join("hggtk", "__version__.py") +verfile = os.path.join("thgutil", "__version__.py")  if version != 'unknown' or not os.path.exists(verfile):   f = file(verfile, "w")   f.write('# this file is autogenerated by setup.py\n')   f.write('version = "%s"\n' % version)   f.close()  else: - import hggtk.__version__ - version = hggtk.__version__.version + import thgutil.__version__ + version = thgutil.__version__.version    setup(name="tortoisehg",   version=version,