[vlc-commits] msi: cleaning and cosmetics

[Ludovic Fauvet]

vlc | branch: master | Ludovic Fauvet <etix at videolan.org> | Wed Apr 10 11:35:02 2013 +0200| [9dceead71485878a8edce04af253b74cf0763087] | committer: Ludovic Fauvet

msi: cleaning and cosmetics

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=9dceead71485878a8edce04af253b74cf0763087
---

 extras/package/win32/msi/product.wxs |   17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/extras/package/win32/msi/product.wxs b/extras/package/win32/msi/product.wxs
index 04d4edb..34e7710 100644
--- a/extras/package/win32/msi/product.wxs
+++ b/extras/package/win32/msi/product.wxs
@@ -102,13 +102,9 @@
                             <!-- Open With... contextual menu -->
                             <RegistryValue Root="HKCR" Key="Applications\vlc.exe\shell\open" Name="$(var.ShortProductName)" Value="$(var.ProductName)" Type="string" />
 
-                            <!-- File association -->
-                            <!-- <?include extensions.wxi?> -->
-
                             <!-- App Paths to support Start, Run -->
                             <RegistryValue Root="HKLM" Key="SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\vlc.exe" Value="[#vlc.exe]" Type="string" />
                             <RegistryValue Root="HKLM" Key="SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\vlc.exe" Name="Path" Value="[APPLICATIONFOLDER]" Type="string" />
-
                         </Component>
 
                         <Component Id='CompTXT' Guid='7fbd228c-87d8-4e91-85b3-aa65e03c9f1e' Win64="$(var.Win64)">
@@ -241,9 +237,7 @@
                             <RegistryValue Root="HKCR" Key="VLC.OPENFolder\shell" Value="Open" Type="string" />
                             <RegistryValue Root="HKCR" Key="VLC.OPENFolder\shell\open\command" Value=""[#vlc.exe]" %1" Type="string" />
                             <RegistryValue Root="HKCR" Key="VLC.OPENFolder\DefaultIcon" Value="[#vlc.exe],0" Type="string" />
-
                         </Component>
-
                     </Directory>
                 </Directory>
             </Directory>
@@ -276,7 +270,7 @@
                 <Shortcut Id="NEWSShortcut" Name="Release Notes" Target="[APPLICATIONFOLDER]NEWS.txt" />
                 <util:InternetShortcut Id="WebsiteShortcut" Name="VideoLAN website" Target="http://www.videolan.org/"/>
                 <util:InternetShortcut Id="DocumentationShortcut" Name="Documentation" Target="http://www.videolan.org/doc/"/>
-                <!-- RegistryValue whichs serves as KeyPath -->
+                <!-- RegistryValue which serves as KeyPath -->
                 <RegistryValue Root="HKCU"
                                Key="Software\VideoLAN\VLC"
                                Name="StartMenuShortcuts"
@@ -301,7 +295,6 @@
             <ComponentGroupRef Id='CompPluginsGroup' />
             <ComponentGroupRef Id='CompLocaleGroup' />
             <ComponentGroupRef Id='CompLuaGroup' />
-            <!-- <ComponentGroupRef Id='CompOsdmenuGroup' /> -->
             <ComponentGroupRef Id='CompSkinsGroup' />
 
             <Feature Id='ACTIVEX' Title='ActiveX plugin' Level='1' AllowAdvertise="no">
@@ -317,12 +310,8 @@
             <Feature Id='FILEASSOCIATION' Title='Extensions' Level='1' AllowAdvertise="no">
                 <ComponentRef Id='CompFileAssociation' />
             </Feature>
-            <Feature Id='EXPLORERINTEGRATION' Title='Explorer integration' Level='1' AllowAdvertise="no">
-            </Feature>
         </Feature>
 
-
-
         <UIRef Id="WixUI_Advanced" />
 
         <InstallExecuteSequence>
@@ -331,7 +320,6 @@
             <Custom Action="SetExecVLCCacheGen" Before="ExecVLCCacheGen">REINSTALL OR NOT Installed</Custom>
         </InstallExecuteSequence>
 
-
         <!-- Launch silently vlc-cache-gen.exe during install -->
         <CustomAction Id            = "SetExecVLCCacheGen"
                       Property      = "ExecVLCCacheGen"
@@ -364,13 +352,12 @@
             </Publish>
             <ProgressText Action="ExecVLCCacheGen">Generating modules cache...</ProgressText>
        </UI>
-
    </Product>
 </Wix>
 
 <!--
     BACKUP: MANUAL REGISTRATION OF AXVLC.DLL
-     **** THIS IS METHOD IS DEPRECATED ****
+     **** THIS METHOD IS DEPRECATED ****
 
     Within the <InstallExecuteSequence> node:
     <Custom Action="RegisterAxvlc" After="InstallFinalize">NOT Installed</Custom>