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

win32: begin updating installer files

Changeset ab987be207ae…

Parent 3710483e21e7…

by Steve Borho

Changes to 3 files · Browse files at ab987be207ae Showing diff from parent 3710483e21e7 Diff from another changeset...

Change 1 of 3 Show Entire File contrib/​win32/​mercurial.iss Stacked
 
4
5
6
7
 
8
9
10
11
 
12
13
14
15
16
17
 
18
19
20
 
36
37
38
39
 
40
41
42
43
44
45
 
46
47
48
49
50
51
52
53
 
70
71
72
73
74
75
76
 
4
5
6
 
7
8
9
10
 
11
12
13
14
15
16
 
17
18
19
20
 
36
37
38
 
39
40
41
42
43
44
 
45
46
47
48
49
 
50
51
52
 
69
70
71
 
72
73
74
@@ -4,17 +4,17 @@
 [Setup]  AppCopyright=Copyright 2005-2009 Matt Mackall and others  AppName=TortoiseHg -AppVerName=TortoiseHg-0.7 +AppVerName=TortoiseHg-0.8  InfoAfterFile=contrib/win32/postinstall.txt  LicenseFile=COPYING.txt  ShowLanguageDialog=yes -AppPublisher=TK Soh and others +AppPublisher=Steve Borho and others  AppPublisherURL=http://bitbucket.org/tortoisehg/stable/  AppSupportURL=http://bitbucket.org/tortoisehg/stable/  AppUpdatesURL=http://bitbucket.org/tortoisehg/stable/  AppID=TortoiseHg  AppContact=teekaysoh@gmail.com -OutputBaseFilename=TortoiseHg-0.7 +OutputBaseFilename=TortoiseHg-0.8  DefaultDirName={pf}\TortoiseHg  SourceDir=..\..  VersionInfoDescription=Mercurial distributed SCM @@ -36,18 +36,17 @@
   [Files]  Source: contrib\mercurial.el; DestDir: {app}/contrib -Source: contrib\vim\*.*; DestDir: {app}/contrib/Vim +Source: contrib\vim\*.*; DestDir: {app}/contrib/vim  Source: contrib\zsh_completion; DestDir: {app}/contrib  Source: contrib\hgk; DestDir: {app}/contrib  Source: contrib\win32\ReadMe.html; DestDir: {app}; Flags: isreadme  Source: {app}\Mercurial.ini; DestDir: {app}\backup; Flags: external skipifsourcedoesntexist uninsneveruninstall  Source: contrib\win32\mercurial.ini; DestDir: {app}; DestName: Mercurial.ini; AfterInstall: FileExpandString('{app}\Mercurial.ini') -Source: ..\stable.snap; DestDir: {app}; DestName: ReleaseNotes.txt +Source: ReleaseNotes.txt; DestDir: {app}; DestName: ReleaseNotes.txt  Source: ..\contrib\*.exe; DestDir: {app}; Flags: ignoreversion restartreplace uninsrestartdelete  Source: ..\contrib\TortoiseOverlays\*.*; DestDir: {app}/TortoiseOverlays;  Source: dist\*.exe; DestDir: {app}; Flags: ignoreversion restartreplace uninsrestartdelete  Source: dist\*.dll; DestDir: {app}; Flags: ignoreversion restartreplace uninsrestartdelete -Source: dist\*.pyd; DestDir: {app}; Flags: ignoreversion restartreplace uninsrestartdelete  Source: dist\library.zip; DestDir: {app}  Source: doc\*.html; DestDir: {app}\docs  Source: icons\*; DestDir: {app}\icons; Flags: ignoreversion recursesubdirs createallsubdirs @@ -70,7 +69,6 @@
 Name: {group}\TortoiseHg Web Site; Filename: {app}\TortoiseHg.url  Name: {group}\Mercurial Web Site; Filename: {app}\Mercurial.url  Name: {group}\Mercurial Command Reference; Filename: {app}\docs\hg.1.html -Name: {group}\Python Trace Collector; Filename: {app}\tracelog.exe  Name: {group}\Uninstall TortoiseHg; Filename: {uninstallexe}    [Run]
Change 1 of 1 Show Entire File contrib/​win32/​setup.cfg Stacked
 
1
2
3
4
 
5
6
7
 
1
2
3
 
4
5
6
7
@@ -1,7 +1,7 @@
 [py2exe]  excludes=pywin, pywin.dialogs, pywin.dialogs.list, PyQt, PyQt4.QtCode, PyQt4.QtGui  includes=cairo, pango, pangocairo, atk, gobject, dbhash -packages=email, hgext, hgext.convert, encodings, hggtk, hggtk.vis, hggtk.iniparse, tortoise +packages=email, hgext, hgext.convert, encodings, hggtk, thgutil    # Disabled for 0.7 release  #dll_excludes=iconv.dll, intl.dll, libatk-1.0-0.dll, libgdk_pixbuf-2.0-0.dll, libgdk-win32-2.0-0.dll, libglib-2.0-0.dll, libgmodule-2.0-0.dll, libgobject-2.0-0.dll, libgthread-2.0-0.dll, libgtk-win32-2.0-0.dll, libpango-1.0-0.dll, libpangowin32-1.0-0.dll, libcairo-2.dll, libglade-2.0-0.dll, libpangocairo-1.0-0.dll, libpangoft2-1.0-0.dll
Change 1 of 3 Show Changes Only contrib/​win32/​setup.py Stacked
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
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
43
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
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
 
 
 
 
 
 
 
 
 
 
 
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
 
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
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
43
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
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
 
 
 
 
 
95
 
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
 
 
 
 
 
 
 
 
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
 
 
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
 #!/usr/bin/env python  #  # This is the mercurial setup script.  #  # 'python setup.py install', or  # 'python setup.py --help' for more options    import sys  if not hasattr(sys, 'version_info') or sys.version_info < (2, 3, 0, 'final'):   raise SystemExit("Mercurial requires python 2.3 or later.")    # Solaris Python packaging brain damage  try:   import hashlib   sha = hashlib.sha1()  except:   try:   import sha   except:   raise SystemExit(   "Couldn't import standard hashlib (incomplete Python install).")    try:   import zlib  except:   raise SystemExit(   "Couldn't import standard zlib (incomplete Python install).")    import os, time  import shutil  import tempfile  from distutils.core import setup, Extension  from distutils.dist import Distribution  from distutils.command.install_data import install_data  from distutils.command.build import build  from distutils.command.build_py import build_py  from distutils.spawn import spawn, find_executable  from distutils.ccompiler import new_compiler    extra = {}  scripts = ['hg']  if os.name == 'nt':   scripts.append('contrib/win32/hg.bat')    # simplified version of distutils.ccompiler.CCompiler.has_function  # that actually removes its temporary files.  def has_function(cc, funcname):   tmpdir = tempfile.mkdtemp(prefix='hg-install-')   devnull = oldstderr = None   try:   try:   fname = os.path.join(tmpdir, 'funcname.c')   f = open(fname, 'w')   f.write('int main(void) {\n')   f.write(' %s();\n' % funcname)   f.write('}\n')   f.close()   # Redirect stderr to /dev/null to hide any error messages   # from the compiler.   # This will have to be changed if we ever have to check   # for a function on Windows.   devnull = open('/dev/null', 'w')   oldstderr = os.dup(sys.stderr.fileno())   os.dup2(devnull.fileno(), sys.stderr.fileno())   objects = cc.compile([fname])   cc.link_executable(objects, os.path.join(tmpdir, "a.out"))   except:   return False   return True   finally:   if oldstderr is not None:   os.dup2(oldstderr, sys.stderr.fileno())   if devnull is not None:   devnull.close()   shutil.rmtree(tmpdir)    # py2exe needs to be installed to work  try:   import py2exe     # Help py2exe to find win32com.shell   try:   import modulefinder   import win32com   for p in win32com.__path__[1:]: # Take the path to win32comext   modulefinder.AddPackagePath("win32com", p)   pn = "win32com.shell"   __import__(pn)   m = sys.modules[pn]   for p in m.__path__[1:]:   modulefinder.AddPackagePath(pn, p)   except ImportError:   pass   - extra['windows'] = [ - {'script':'contrib/tracelog.py', - 'icon_resources':[(1, 'icons/tortoise/python.ico')]} - ] - extra['com_server'] = ['tortoisehg']   extra['console'] = ['hg', 'hgtk'] -  except ImportError:   pass    try:   from mercurial.__version__ import version  except ImportError:   version = 'unknown'    class install_package_data(install_data):   def finalize_options(self):   self.set_undefined_options('install',   ('install_lib', 'install_dir'))   install_data.finalize_options(self)    class build_mo(build):     description = "build translations (.mo files)"     def run(self):   if not find_executable('msgfmt'):   self.warn("could not find msgfmt executable, no translations "   "will be built")   return     podir = 'i18n'   if not os.path.isdir(podir):   self.warn("could not find %s/ directory" % podir)   return     join = os.path.join   for po in os.listdir(podir):   if not po.endswith('.po'):   continue   pofile = join(podir, po)   modir = join('locale', po[:-3], 'LC_MESSAGES') - mofile = join(modir, 'hg.mo') - cmd = ['msgfmt', '-v', '-o', mofile, pofile] - if sys.platform != 'sunos5': - # msgfmt on Solaris does not know about -c - cmd.append('-c') - self.mkpath(modir) - self.make_file([pofile], mofile, spawn, (cmd,)) - self.distribution.data_files.append((join('mercurial', modir), + for mf in ('hg.mo', 'tortoisehg.mo'): + mofile = join(modir, mf) + if not os.path.exist(mofile): + continue + cmd = ['msgfmt', '-v', '-o', mofile, pofile] + if sys.platform != 'sunos5': + # msgfmt on Solaris does not know about -c + cmd.append('-c') + self.mkpath(modir) + self.make_file([pofile], mofile, spawn, (cmd,)) + self.distribution.data_files.append((join('mercurial', modir),   [mofile]))    build.sub_commands.append(('build_mo', None))    Distribution.pure = 0  Distribution.global_options.append(('pure', None, "use pure (slow) Python "   "code instead of C extensions"))    class hg_build_py(build_py):     def finalize_options(self):   build_py.finalize_options(self)     if self.distribution.pure:   if self.py_modules is None:   self.py_modules = []   for ext in self.distribution.ext_modules:   if ext.name.startswith("mercurial."):   self.py_modules.append("mercurial.pure.%s" % ext.name[10:])   self.distribution.ext_modules = []     def find_modules(self):   modules = build_py.find_modules(self)   for module in modules:   if module[0] == "mercurial.pure":   if module[1] != "__init__":   yield ("mercurial", module[1], module[2])   else:   yield module    cmdclass = {'install_data': install_package_data,   'build_mo': build_mo,   'build_py': hg_build_py}    ext_modules=[   Extension('mercurial.base85', ['mercurial/base85.c']),   Extension('mercurial.bdiff', ['mercurial/bdiff.c']),   Extension('mercurial.diffhelpers', ['mercurial/diffhelpers.c']),   Extension('mercurial.mpatch', ['mercurial/mpatch.c']),   Extension('mercurial.parsers', ['mercurial/parsers.c']),   ]    packages = ['mercurial', 'mercurial.hgweb', 'hgext', 'hgext.convert', - 'hgext.highlight', 'hgext.zeroconf', 'hggtk', 'hggtk.vis', - 'hggtk.iniparse', 'tortoise'] + 'hgext.highlight', 'hgext.zeroconf', 'hggtk', 'thgutil']    try:   import msvcrt   ext_modules.append(Extension('mercurial.osutil', ['mercurial/osutil.c']))  except ImportError:   pass    try:   import posix   ext_modules.append(Extension('mercurial.osutil', ['mercurial/osutil.c']))     if sys.platform == 'linux2' and os.uname()[2] > '2.6':   # The inotify extension is only usable with Linux 2.6 kernels.   # You also need a reasonably recent C library.   cc = new_compiler()   if has_function(cc, 'inotify_add_watch'):   ext_modules.append(Extension('hgext.inotify.linux._inotify',   ['hgext/inotify/linux/_inotify.c']))   packages.extend(['hgext.inotify', 'hgext.inotify.linux'])  except ImportError:   pass    datafiles = []  for root in ('templates', 'i18n'):   for dir, dirs, files in os.walk(root):   datafiles.append((os.path.join('mercurial', dir),   [os.path.join(dir, file_) for file_ in files]))    setup(name='mercurial',   version=version,   author='Matt Mackall',   author_email='mpm@selenic.com',   url='http://selenic.com/mercurial',   description='Scalable distributed SCM',   license='GNU GPL',   scripts=scripts,   packages=packages,   ext_modules=ext_modules,   data_files=datafiles,   cmdclass=cmdclass,   options=dict(bdist_mpkg=dict(zipdist=True,   license='COPYING',   readme='contrib/macosx/Readme.html',   welcome='contrib/macosx/Welcome.html')),   **extra)