Commits

Steve Borho committed c4b87ec

wix: package x64 Pageant for 64bit Windows (fixes #2415)

  • Participants
  • Parent commits 21ec314
  • Branches stable

Comments (0)

Files changed (2)

win32/wix/guids.wxi

   <?define KDiff3EXE.guid = {075ECC11-1B44-48DB-B7FD-D3207BB801A4} ?>
 
   <?define TortoisePlinkEXE.guid = {7C2AD6B6-B80B-429C-959F-1A52648E13C9} ?>
-  <?define PageantEXE.guid = {91F28A55-874F-4957-A288-BB0F24E419A4} ?>
+  <?define PageantEXE.guid = {7149C722-FA3F-4E6A-87A7-AA192D977728} ?>
 
   <?define chmFile.guid = {422C758A-6CB2-4531-BE6A-366B3CD1FD8D} ?>
   <?define pdfFile.guid = {A0EC2473-996A-4DBC-9F44-76B63B57AE31} ?>

win32/wix/tortoisehg.wxs

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