diff options
| author | Benjamin Jemlich <pcgod@users.sourceforge.net> | 2012-08-12 11:57:47 +0400 |
|---|---|---|
| committer | Benjamin Jemlich <pcgod@users.sourceforge.net> | 2012-08-12 11:57:47 +0400 |
| commit | a01155cab8a5c99c4ca7cf6f616a1ad68dd7e69b (patch) | |
| tree | 6aacf64ec5447749d569a685727a44649f920c5b /installer | |
| parent | c2655fc265a43e25322086726f3436224ce35a45 (diff) | |
Installer: Remove useless Feature element
Diffstat (limited to 'installer')
| -rw-r--r-- | installer/Files.wxs | 5 | ||||
| -rw-r--r-- | installer/Product.wxs | 41 | ||||
| -rw-r--r-- | installer/UI.wxs | 4 |
3 files changed, 20 insertions, 30 deletions
diff --git a/installer/Files.wxs b/installer/Files.wxs index 3fad68ab7..96eee9197 100644 --- a/installer/Files.wxs +++ b/installer/Files.wxs @@ -10,9 +10,6 @@ <Shortcut Id="MumbleShortcut" Directory="ApplicationProgramsFolder" Name="Mumble" WorkingDirectory="INSTALLDIR"> <ShortcutProperty Key="System.AppUserModel.ID" Value="net.sourceforge.mumble.Mumble" /> </Shortcut> - <Shortcut Id="MumbleDesktopShortcut" Directory="DesktopFolder" Name="Mumble" WorkingDirectory="INSTALLDIR"> - <ShortcutProperty Key="System.AppUserModel.ID" Value="net.sourceforge.mumble.Mumble" /> - </Shortcut> </File> <RegistryValue Root="HKCR" Key="mumble" Value="URL:Mumble" Type="string" /> @@ -323,4 +320,4 @@ </Directory> </DirectoryRef> </Fragment> -</Wix>
\ No newline at end of file +</Wix> diff --git a/installer/Product.wxs b/installer/Product.wxs index 38d453b8a..075914e88 100644 --- a/installer/Product.wxs +++ b/installer/Product.wxs @@ -126,36 +126,29 @@ <?endif ?> </ComponentGroup> - <ComponentGroup Id="ClientCommon"> + <Feature Id="Mumble" Title="!(loc.MUMBLE_SEC_MUMBLE)" Description="!(loc.DESC_SectionMumble)" Level="1" AllowAdvertise="no" ConfigurableDirectory="INSTALLDIR"> <?ifdef SndFileDir ?> <ComponentRef Id="libsndfile1.dll" /> <?endif ?> <ComponentRef Id="speex.dll" /> <ComponentRef Id="speex.txt" /> - </ComponentGroup> - - <Feature Id="Mumble" Title="$(var.ProductName)" Description="!(loc.DESC_SectionMumble)" Display="expand" Level="1" ConfigurableDirectory="INSTALLDIR"> - <Feature Id="MumbleClient" Title="!(loc.MUMBLE_SEC_MUMBLE)" Description="!(loc.DESC_SectionMumble)" Level="1" AllowAdvertise="no"> - <ComponentGroupRef Id="ClientCommon" /> - - <ComponentGroupRef Id="Plugins"/> - <ComponentRef Id="celt0.0.7.0.dll" /> - <ComponentRef Id="celt0.0.11.0.dll" /> - <ComponentRef Id="opus.dll" /> - <?ifdef SSE ?> - <ComponentRef Id="celt0.0.7.0.sse.dll" /> - <ComponentRef Id="celt0.0.11.0.sse.dll" /> - <?endif ?> - <?ifdef SSE2 ?> - <ComponentRef Id="celt0.0.7.0.sse2.dll" /> - <ComponentRef Id="celt0.0.11.0.sse2.dll" /> - <ComponentRef Id="opus.sse2.dll" /> - <?endif ?> - <ComponentRef Id="mumble.exe" /> - <ComponentRef Id="mumble_ol.dll" /> - <ComponentRef Id="mumble_g15_helper.exe" /> - </Feature> + <ComponentGroupRef Id="Plugins"/> + <ComponentRef Id="celt0.0.7.0.dll" /> + <ComponentRef Id="celt0.0.11.0.dll" /> + <ComponentRef Id="opus.dll" /> + <?ifdef SSE ?> + <ComponentRef Id="celt0.0.7.0.sse.dll" /> + <ComponentRef Id="celt0.0.11.0.sse.dll" /> + <?endif ?> + <?ifdef SSE2 ?> + <ComponentRef Id="celt0.0.7.0.sse2.dll" /> + <ComponentRef Id="celt0.0.11.0.sse2.dll" /> + <ComponentRef Id="opus.sse2.dll" /> + <?endif ?> + <ComponentRef Id="mumble.exe" /> + <ComponentRef Id="mumble_ol.dll" /> + <ComponentRef Id="mumble_g15_helper.exe" /> </Feature> <Feature Id="Murmur" Title="!(loc.MUMBLE_SEC_MURMUR)" Description="!(loc.DESC_SectionMurmur)" Level="1000" ConfigurableDirectory="INSTALLDIR"> diff --git a/installer/UI.wxs b/installer/UI.wxs index 7f5aeb1af..0280ba750 100644 --- a/installer/UI.wxs +++ b/installer/UI.wxs @@ -57,7 +57,7 @@ <Control Id="Description" Type="Text" X="135" Y="70" Width="220" Height="40" Transparent="yes" NoPrefix="yes" Text="!(loc.ExitDialogDescription)" /> <Control Id="Title" Type="Text" X="135" Y="20" Width="220" Height="60" Transparent="yes" NoPrefix="yes" Text="!(loc.ExitDialogTitle)" /> <Control Id="LaunchCheckBox" Type="CheckBox" X="10" Y="243" Width="170" Height="17" Property="LAUNCHAPPONEXIT" Hidden="yes" CheckBoxValue="1" Text="!(loc.MUMBLE_START)"> - <Condition Action="show">NOT Installed AND &MumbleClient = 3</Condition> + <Condition Action="show">NOT Installed AND &Mumble = 3</Condition> </Control> </Dialog> @@ -70,4 +70,4 @@ </AdminUISequence> </UI> </Fragment> -</Wix>
\ No newline at end of file +</Wix> |