Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.9, 1.9.1, and 1.9.2

setup, wix: add thg script

Changeset 7dbb95d275d2…

Parent c57ef51b6ae7…

by Adrian Buehlmann

Changes to 3 files · Browse files at 7dbb95d275d2 Showing diff from parent c57ef51b6ae7 Diff from another changeset...

Change 1 of 1 Show Entire File contrib/​wix/​guids.wxi Stacked
 
45
46
47
48
 
49
50
51
 
45
46
47
 
48
49
50
51
@@ -45,7 +45,7 @@
  <!-- tortoisehg.wxs -->   <?define ProductUpgradeCode = {838657CF-C9EC-452D-800D-0E70FC021D0A} ?>   - <?define ComponentMainExecutableGUID = {5A98EB92-2C82-406E-81A5-1161CA87ED8E} ?> + <?define ComponentMainExecutableGUID = {CD691D8E-79AD-4e22-9234-89C62B5C2243} ?>     <?define thgshellx86dll.guid = {1126CF42-3994-428B-A746-464E1BC680F3} ?>   <?define thgshellx64dll.guid = {59FD2A49-BA62-40CC-B155-D11DB11EE611} ?>
Change 1 of 1 Show Entire File contrib/​wix/​tortoisehg.wxs Stacked
 
88
89
90
91
 
 
 
 
92
93
94
 
88
89
90
 
91
92
93
94
95
96
97
@@ -88,7 +88,10 @@
  <Directory Id='ProgramFilesFolder' Name='PFiles'>   <Directory Id='INSTALLDIR' Name='TortoiseHg'>   <Component Id='MainExecutable' Guid='$(var.ComponentMainExecutableGUID)'> - <File Id='hgtkEXE' Name='hgtk.exe' KeyPath='yes' + <File Id='thgEXE' Name='thg.exe' KeyPath='yes' + Source='dist\thg.exe' + /> + <File Id='hgtkEXE' Name='hgtk.exe'   Source='dist\hgtk.exe'   />   <File Id='hgEXE' Name='hg.exe'
Change 1 of 2 Show Entire File setup.py Stacked
 
125
126
127
 
 
 
 
 
128
129
130
 
144
145
146
147
 
148
149
150
 
125
126
127
128
129
130
131
132
133
134
135
 
149
150
151
 
152
153
154
155
@@ -125,6 +125,11 @@
  'description':'TortoiseHg GUI tools for Mercurial SCM',   'copyright':thgcopyright,   'product_version':version}, + {'script':'thg', + 'icon_resources':[(0,'icons/thg_logo.ico')], + 'description':'TortoiseHg GUI tools for Mercurial SCM', + 'copyright':thgcopyright, + 'product_version':version},   {'script':'contrib/docdiff.py',   'icon_resources':[(0,'icons/TortoiseMerge.ico')],   'copyright':thgcopyright, @@ -144,7 +149,7 @@
 def setup_posix():   # Specific definitios for Posix installations   _extra = {} - _scripts = ['hgtk'] + _scripts = ['thg', 'hgtk']   _packages = ['tortoisehg', 'tortoisehg.hgtk',   'tortoisehg.hgtk.logview', 'tortoisehg.util']   _data_files = [(os.path.join('share/pixmaps/tortoisehg', root),