[Winmerge-svn] SF.net SVN: winmerge:[6697] trunk/Installer/WiX

[<ge...@us...>]

Revision: 6697
          http://winmerge.svn.sourceforge.net/winmerge/?rev=6697&view=rev
Author:   gerundt
Date:     2009-04-23 18:37:54 +0000 (Thu, 23 Apr 2009)

Log Message:
-----------
PATCH: [ 2690509 ] Installer: First MSI setup - Create real 64bit setup

Modified Paths:
--------------
    trunk/Installer/WiX/Config.wxi
    trunk/Installer/WiX/WinMerge.wxs

Modified: trunk/Installer/WiX/Config.wxi
===================================================================
--- trunk/Installer/WiX/Config.wxi	2009-04-23 17:53:12 UTC (rev 6696)
+++ trunk/Installer/WiX/Config.wxi	2009-04-23 18:37:54 UTC (rev 6697)
@@ -9,18 +9,20 @@
   <?define PackageComments = "WinMerge" ?>
   
   <?if $(var.Platform) = "x64" ?>
-    <?define Win64 = "no" ?>
+    <?define Win64 = "yes" ?>
     <?define PackagePlatform = "x64" ?>
     <?define UpgradeGuid = "79F16C51-8485-426E-BF23-F4D3D0D431D7" ?>
     
-    <?define MergeBuildDir = "..\..\Build\MergeUnicodeRelease" ?>
-    <?define ExpatBuildDir = "..\..\Build\expat" ?>
-    <?define PcreBuildDir = "..\..\Build\pcre" ?>
+    <?define ProgramFilesFolder = "ProgramFiles64Folder" ?>
+    <?define MergeBuildDir = "..\..\Build\x64\MergeRelease" ?>
+    <?define ExpatBuildDir = "..\..\Build\expat\lib\x64\Release" ?>
+    <?define PcreBuildDir = "..\..\Build\pcre\lib\x64\Release" ?>
   <?else ?>
     <?define Win64 = "no" ?>
     <?define PackagePlatform = "x86" ?>
     <?define UpgradeGuid = "3C974FF6-9076-46EB-A65F-A53931EAF942" ?>
     
+    <?define ProgramFilesFolder = "ProgramFilesFolder" ?>
     <?define MergeBuildDir = "..\..\Build\MergeUnicodeRelease" ?>
     <?define ExpatBuildDir = "..\..\Build\expat" ?>
     <?define PcreBuildDir = "..\..\Build\pcre" ?>

Modified: trunk/Installer/WiX/WinMerge.wxs
===================================================================
--- trunk/Installer/WiX/WinMerge.wxs	2009-04-23 17:53:12 UTC (rev 6696)
+++ trunk/Installer/WiX/WinMerge.wxs	2009-04-23 18:37:54 UTC (rev 6697)
@@ -8,7 +8,6 @@
   <!--
     TODO:
       * Install all files
-      * Make a different between 32bit and 64bit
       * Create start menu items
       * Mutli-language support
       * ...
@@ -37,7 +36,7 @@
       EmbedCab="yes" />
     
     <Directory Id="TARGETDIR" Name="SourceDir">
-      <Directory Id="ProgramFilesFolder">
+      <Directory Id="$(var.ProgramFilesFolder)">
         <Directory Id="INSTALLDIR" Name="WinMerge">
           <Directory Id="DOCSDIR" Name="Docs" />
           <Directory Id="FILTERSDIR" Name="Filters" />
@@ -45,11 +44,6 @@
           <Directory Id="PLUGINSDIR" Name="MergePlugins" />
         </Directory>
       </Directory>
-      <?if $(var.Platform) = "x64" ?>
-        <Directory Id="ProgramFiles64Folder">
-          <Directory Id="INSTALLDIR64" Name="WinMerge" />
-        </Directory>
-      <?endif ?>
     </Directory>
     
     <DirectoryRef Id="INSTALLDIR">
@@ -96,8 +90,8 @@
       </Component>
     </DirectoryRef>
     
-    <?if $(var.Platform) = "x64" ?>
-      <DirectoryRef Id="INSTALLDIR64">
+    <DirectoryRef Id="INSTALLDIR">
+      <?if $(var.Platform) = "x64" ?>
         <Component Id="ShellExtension" Guid="*" Win64="yes">
           <File Id="ShellExtensionX64DLL" 
             Name="ShellExtensionX64.dll" 
@@ -105,9 +99,7 @@
             Source="..\..\Build\ShellExtensionX64\ShellExtensionX64.dll" 
             Vital="yes" />
         </Component>
-      </DirectoryRef>
-    <?else ?>
-      <DirectoryRef Id="INSTALLDIR">
+      <?else ?>
         <Component Id="ShellExtension" Guid="*" Win64="$(var.Win64)">
           <File Id="ShellExtensionUDLL" 
             Name="ShellExtensionU.dll" 
@@ -115,8 +107,8 @@
             Source="$(var.MergeBuildDir)\ShellExtensionU.dll" 
             Vital="yes" />
         </Component>
-      </DirectoryRef>
-    <?endif ?>
+      <?endif ?>
+    </DirectoryRef>
     
     <DirectoryRef Id="DOCSDIR">
       <Component Id="ReadMe" Guid="*" Win64="$(var.Win64)">
@@ -439,6 +431,7 @@
       </Component>
     </DirectoryRef>
     
+    <?if not $(var.Platform) = "x64" ?>
     <DirectoryRef Id="PLUGINSDIR">
       <Component Id="editoraddin" Guid="*" Win64="no">
         <File Id="editoraddinSCT" 
@@ -524,6 +517,7 @@
           Vital="no" />
       </Component>
     </DirectoryRef>
+    <?endif ?>
     
     <!--
       * Level <= 3 is "Typical"
@@ -600,6 +594,7 @@
         <ComponentRef Id="Turkish" />
         <ComponentRef Id="Ukrainian" />
       </Feature>
+      <?if not $(var.Platform) = "x64" ?>
       <Feature Id="Plugins" AllowAdvertise="no" Level="4" Title="Plugins">
         <ComponentRef Id="editoraddin" />
         <ComponentRef Id="insertdatetime" />
@@ -614,6 +609,7 @@
         <ComponentRef Id="WatchBeginningOfLog" />
         <ComponentRef Id="WatchEndOfLog" />
       </Feature>
+      <?endif ?>
     </Feature>
     
     <!-- TODO: Works this really? -->


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.