Commits

Steve Borho  committed 6fe555a

wix: package 32 or 64 bit version of TortoisePlink appropriately

  • Participants
  • Parent commits ebfb6b4
  • Branches stable

Comments (0)

Files changed (2)

File win32/wix/guids.wxi

   <?define docdiffEXE.guid = {F4A6629F-85C1-406E-8262-C02E8DBDB4FA} ?>
   <?define KDiff3EXE.guid = {075ECC11-1B44-48DB-B7FD-D3207BB801A4} ?>
 
-  <?define TortoisePlinkEXE.guid = {E983CBBB-BD4E-4698-BE6F-CECB80D5BA76} ?>
+  <?define TortoisePlinkEXE.guid = {7C2AD6B6-B80B-429C-959F-1A52648E13C9} ?>
   <?define PageantEXE.guid = {91F28A55-874F-4957-A288-BB0F24E419A4} ?>
 
   <?define chmFile.guid = {422C758A-6CB2-4531-BE6A-366B3CD1FD8D} ?>

File win32/wix/tortoisehg.wxs

             />
           </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'
               <File Id='KDiff3EXE' Name='kdiff3.exe' KeyPath='yes'
                     Source='..\contrib\kdiff3x64.exe'/>
             </Component>
+            <Component Id='TortoisePlinkEXE' Guid='$(var.TortoisePlinkEXE.guid)' Win64='$(var.IsX64)'>
+              <File Id='TortoisePlinkEXE' Name='TortoisePlink.exe' KeyPath='yes'
+                    Source='..\contrib\TortoisePlink-x64.exe'
+              />
+          </Component>
           <?else?>
             <Component Id='KDiff3EXE' Guid='$(var.KDiff3EXE.guid)' Win64='$(var.IsX64)'>
               <File Id='KDiff3EXE' Name='kdiff3.exe' KeyPath='yes'
                     Source='..\contrib\kdiff3.exe'/>
             </Component>
+            <Component Id='TortoisePlinkEXE' Guid='$(var.TortoisePlinkEXE.guid)' Win64='$(var.IsX64)'>
+              <File Id='TortoisePlinkEXE' Name='TortoisePlink.exe' KeyPath='yes'
+                    Source='..\contrib\TortoisePlink-x86.exe'
+              />
           <?endif?>
 
           <Directory Id='docFolder' Name='doc'>