diff options
Diffstat (limited to 'src/etc/installer')
| -rw-r--r-- | src/etc/installer/msi/rust.wxs | 14 | ||||
| -rw-r--r-- | src/etc/installer/pkg/Distribution.xml | 17 |
2 files changed, 0 insertions, 31 deletions
diff --git a/src/etc/installer/msi/rust.wxs b/src/etc/installer/msi/rust.wxs index a182bc406..0aa0784e5 100644 --- a/src/etc/installer/msi/rust.wxs +++ b/src/etc/installer/msi/rust.wxs @@ -170,10 +170,6 @@ <Directory Id="Docs" Name="." /> <Directory Id="Cargo" Name="." /> <Directory Id="Std" Name="." /> - <!-- tool-rls-start --> - <Directory Id="Rls" Name="." /> - <Directory Id="Analysis" Name="." /> - <!-- tool-rls-end --> </Directory> </Directory> @@ -277,16 +273,6 @@ <ComponentRef Id="PathEnvPerMachine" /> <ComponentRef Id="PathEnvPerUser" /> </Feature> - <!-- tool-rls-start --> - <Feature Id="RLS" - Title="RLS, the Rust Language Server" - Display="7" - Level="2" - AllowAdvertise="no"> - <ComponentGroupRef Id="RlsGroup" /> - <ComponentGroupRef Id="AnalysisGroup" /> - </Feature> - <!-- tool-rls-end --> <UIRef Id="RustUI" /> </Product> diff --git a/src/etc/installer/pkg/Distribution.xml b/src/etc/installer/pkg/Distribution.xml index 077ee1751..64f6bab9b 100644 --- a/src/etc/installer/pkg/Distribution.xml +++ b/src/etc/installer/pkg/Distribution.xml @@ -16,9 +16,6 @@ <line choice="rust-std"/> <line choice="cargo"/> <line choice="rust-docs"/> - <!-- tool-rls-start --> - <line choice="rls"/> - <!-- tool-rls-end --> </line> <line choice="uninstall" /> </choices-outline> @@ -64,24 +61,10 @@ > <pkg-ref id="org.rust-lang.rust-docs"/> </choice> - <!-- tool-rls-start --> - <choice id="rls" visible="true" - title="RLS" description="RLS, the Rust Language Server" - selected="(!choices.uninstall.selected && choices['rls'].selected) || (choices.uninstall.selected && choices.install.selected)" - start_selected="false" - > - <pkg-ref id="org.rust-lang.rls"/> - <pkg-ref id="org.rust-lang.rust-analysis"/> - </choice> - <!-- tool-rls-end --> <pkg-ref id="org.rust-lang.rustc" version="0" onConclusion="none">rustc.pkg</pkg-ref> <pkg-ref id="org.rust-lang.cargo" version="0" onConclusion="none">cargo.pkg</pkg-ref> <pkg-ref id="org.rust-lang.rust-docs" version="0" onConclusion="none">rust-docs.pkg</pkg-ref> <pkg-ref id="org.rust-lang.rust-std" version="0" onConclusion="none">rust-std.pkg</pkg-ref> - <!-- tool-rls-start --> - <pkg-ref id="org.rust-lang.rls" version="0" onConclusion="none">rls.pkg</pkg-ref> - <!-- tool-rls-end --> - <pkg-ref id="org.rust-lang.rust-analysis" version="0" onConclusion="none">rust-analysis.pkg</pkg-ref> <pkg-ref id="org.rust-lang.uninstall" version="0" onConclusion="none">uninstall.pkg</pkg-ref> <background file="rust-logo.png" mime-type="image/png" alignment="bottomleft"/> |