Changeset 805f941ee0c1…
Parent 611db252477e…
by
Changes to 4 files · Browse files at 805f941ee0c1 Showing diff from parent 611db252477e Diff from another changeset...
|
|
|
|
@@ -67,10 +67,8 @@ <?define docdiffEXE.guid = {F4A6629F-85C1-406E-8262-C02E8DBDB4FA} ?>
<?define KDiff3EXE.guid = {075ECC11-1B44-48DB-B7FD-D3207BB801A4} ?>
- <?define TortoisePlinkEXE.guid = {7679909C-7390-4546-9FCA-A5A31520DA50} ?>
- <?define PageantEXE.guid = {228F24A3-FA1C-4439-BCB4-71DF790E61DC} ?>
- <?define thgcmd.guid = {7B660ED7-CAEA-4851-8ABD-751251842457} ?>
- <?define hgcmd.guid = {4A986763-BD4D-46DC-89CD-A36F037D847E} ?>
+ <?define TortoisePlinkEXE.guid = {E983CBBB-BD4E-4698-BE6F-CECB80D5BA76} ?>
+ <?define PageantEXE.guid = {91F28A55-874F-4957-A288-BB0F24E419A4} ?>
<?define chmFile.guid = {422C758A-6CB2-4531-BE6A-366B3CD1FD8D} ?>
<?define pdfFile.guid = {A0EC2473-996A-4DBC-9F44-76B63B57AE31} ?>
|
@@ -93,7 +93,7 @@ Source='dist\thg.exe'
/>
<Environment Id="Environment" Name="PATH" Part="last" System="yes"
- Permanent="no" Value="[INSTALLDIR]bin" Action="set"
+ Permanent="no" Value="[INSTALLDIR]" Action="set"
/>
</Component>
<Component Id='WinExecutable' Guid='$(var.ComponentWinExecutableGUID)' Win64='$(var.IsX64)'>
@@ -197,6 +197,17 @@ />
</Component>
+ <Component Id='TortoisePlinkEXE' Guid='$(var.TortoisePlinkEXE.guid)' Win64='$(var.IsX64)'>
+ <File Id='TortoisePlinkEXE' Name='TortoisePlink.exe' KeyPath='yes'
+ Source='..\contrib\TortoisePlink.exe'
+ />
+ </Component>
+ <Component Id='PageantEXE' Guid='$(var.PageantEXE.guid)' Win64='$(var.IsX64)'>
+ <File Id='PageantEXE' Name='Pageant.exe' KeyPath='yes'
+ Source='..\contrib\Pageant.exe'
+ />
+ </Component>
+
<?if $(var.Platform) = "x64" ?>
<Component Id='KDiff3EXE' Guid='$(var.KDiff3EXE.guid)' Win64='$(var.IsX64)'>
<File Id='KDiff3EXE' Name='kdiff3.exe' KeyPath='yes'
@@ -239,29 +250,6 @@ </Component>
</Directory>
- <Directory Id='binFolder' Name='bin'>
- <Component Id='TortoisePlinkEXE' Guid='$(var.TortoisePlinkEXE.guid)' Win64='$(var.IsX64)'>
- <File Id='TortoisePlinkEXE' Name='TortoisePlink.exe' KeyPath='yes'
- Source='..\contrib\TortoisePlink.exe'
- />
- </Component>
- <Component Id='PageantEXE' Guid='$(var.PageantEXE.guid)' Win64='$(var.IsX64)'>
- <File Id='PageantEXE' Name='Pageant.exe' KeyPath='yes'
- Source='..\contrib\Pageant.exe'
- />
- </Component>
- <Component Id='ThgCmd' Guid='$(var.thgcmd.guid)' Win64='$(var.IsX64)'>
- <File Id='Thg.Cmd' Name='thg.cmd' KeyPath='yes'
- Source='win32\thg.cmd'
- />
- </Component>
- <Component Id='HgCmd' Guid='$(var.hgcmd.guid)' Win64='$(var.IsX64)'>
- <File Id='Hg.Cmd' Name='hg.cmd' KeyPath='yes'
- Source='win32\hg.cmd'
- />
- </Component>
- </Directory>
-
<Directory Id='HGRCD' Name='hgrc.d'>
<Component Id='mercurial.rc' Guid='$(var.mercurial.rc.guid)' Win64='$(var.IsX64)'>
<File Id='mercurial.rc' Name='Mercurial.rc' ReadOnly='yes'
@@ -385,8 +373,6 @@ <ComponentRef Id='helpFolder' />
<ComponentRef Id='distOutput' />
<ComponentRef Id='imageFormats' />
- <ComponentRef Id='ThgCmd' />
- <ComponentRef Id='HgCmd' />
<ComponentGroupRef Id='templatesFolder' />
<ComponentRef Id='Icons' />
</Feature>
|
Loading...