vlc | branch: master | Hugo Beauzée-Luyssen <[email protected]> | Tue May 29 16:41:49 2018 +0200| [876cc5b8e06a9e629c1531e6177d2aa57c0ff636] | 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 > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=876cc5b8e06a9e629c1531e6177d2aa57c0ff636 --- 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)'> _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
