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 Entire File contrib/​win32/​setup.py Stacked
 
92
93
94
95
96
97
98
99
100
101
102
103
104
 
134
135
136
137
138
139
140
141
142
143
144
 
 
 
 
 
 
 
 
 
 
 
145
146
147
 
185
186
187
188
189
 
190
191
192
 
92
93
94
 
 
 
 
 
95
 
96
97
98
 
128
129
130
 
 
 
 
 
 
 
 
131
132
133
134
135
136
137
138
139
140
141
142
143
144
 
182
183
184
 
 
185
186
187
188
@@ -92,13 +92,7 @@
  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   @@ -134,14 +128,17 @@
  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)) @@ -185,8 +182,7 @@
  ]    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