[vlc-commits] package: msi: Install 64bits program in Program Files/

[Hugo Beauzée-Luyssen]

vlc/vlc-3.0 | branch: master | Hugo Beauzée-Luyssen <hugo at beauzee.fr> | Tue May 29 16:41:49 2018 +0200| [3eafd83ebf5b9b772b60f7d376509671b40b3889] | committer: Hugo Beauzée-Luyssen

package: msi: Install 64bits program in Program Files/

Instead of Program Files (x86). This works around a bug in WiX
https://github.com/wixtoolset/issues/issues/2165

(cherry picked from commit 876cc5b8e06a9e629c1531e6177d2aa57c0ff636)
Signed-off-by: Hugo Beauzée-Luyssen <hugo at beauzee.fr>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=3eafd83ebf5b9b772b60f7d376509671b40b3889
---

 extras/package/win32/msi/product.wxs | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/extras/package/win32/msi/product.wxs b/extras/package/win32/msi/product.wxs
index 461f6d0973..bc96a58c10 100644
--- a/extras/package/win32/msi/product.wxs
+++ b/extras/package/win32/msi/product.wxs
@@ -72,6 +72,17 @@
 
         <Media Id='1' Cabinet='product.cab' EmbedCab='yes' CompressionLevel="high" />
 
+        <CustomAction Id="Overwrite_WixSetDefaultPerMachineFolder" Property="WixPerMachineFolder"
+            Value="[$(var.PlatformProgramFilesFolder)][ApplicationFolderName]" Execute="immediate" />
+        <InstallUISequence>
+            <Custom Action="Overwrite_WixSetDefaultPerMachineFolder" After="WixSetDefaultPerMachineFolder" />
+        </InstallUISequence>
+        <InstallExecuteSequence>
+            <Custom Action="Overwrite_WixSetDefaultPerMachineFolder" After="WixSetDefaultPerMachineFolder" />
+        </InstallExecuteSequence>
+
+        <SetProperty Id="ARPINSTALLLOCATION" Value="[APPLICATIONFOLDER]" After="CostFinalize" />
+
         <Directory Id='TARGETDIR' Name='SourceDir'>
             <Directory Id='$(var.PlatformProgramFilesFolder)' Name='PFiles'>
                 <Directory Id='VideoLANFolder' Name='$(var.Manufacturer)'>