[vlc-commits] msi: group web plugins under a common feature

Ludovic Fauvet git at videolan.org
Wed Apr 10 16:56:09 CEST 2013


vlc | branch: master | Ludovic Fauvet <etix at videolan.org> | Wed Apr 10 16:16:27 2013 +0200| [05a7cd889816ab920eeb7ce5d2990eb74002402d] | committer: Ludovic Fauvet

msi: group web plugins under a common feature

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

 extras/package/win32/msi/product.wxs |   14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/extras/package/win32/msi/product.wxs b/extras/package/win32/msi/product.wxs
index 8d29913..3d120fc 100644
--- a/extras/package/win32/msi/product.wxs
+++ b/extras/package/win32/msi/product.wxs
@@ -297,12 +297,14 @@
             <ComponentGroupRef Id='CompLuaGroup' />
             <ComponentGroupRef Id='CompSkinsGroup' />
 
-            <Feature Id='ACTIVEX' Title='ActiveX plugin' Level='1' AllowAdvertise="no">
-                <ComponentRef Id='CompAxvlc' />
-                <ComponentGroupRef Id='CompAxvlcGroup' />
-            </Feature>
-            <Feature Id='MOZILLA' Title='Mozilla plugin' Level='1000' AllowAdvertise="no">
-                <ComponentRef Id='CompNpvlc' />
+            <Feature Id='WEBPLUGINS' Title='Web plugins' Level='1' AllowAdvertise="no">
+                <Feature Id='ACTIVEX' Title='ActiveX plugin' Level='1' AllowAdvertise="no">
+                    <ComponentRef Id='CompAxvlc' />
+                    <ComponentGroupRef Id='CompAxvlcGroup' />
+                </Feature>
+                <Feature Id='MOZILLA' Title='Mozilla plugin' Level='1000' AllowAdvertise="no">
+                    <ComponentRef Id='CompNpvlc' />
+                </Feature>
             </Feature>
             <Feature Id='DISCSPLAYBACK' Title='Discs Playback' Level='1' AllowAdvertise="no">
                 <ComponentRef Id='CompPlayDiscs' />



More information about the vlc-commits mailing list