Skip to content

Commit 039c9b2

Browse files
ehussehuss
committed
Remove RLS from macOS pkg and Windows msi installers.
These generally aren't used too much, and I feel like aren't really helpful for installing the RLS stub.
1 parent 4a7e2fb commit 039c9b2

File tree

3 files changed

+3
-64
lines changed

3 files changed

+3
-64
lines changed

‎src/bootstrap/dist.rs

+3-33
Original file line numberDiff line numberDiff line change
@@ -1409,7 +1409,7 @@ impl Step for Extended {
14091409

14101410
let xform = |p: &Path| {
14111411
let mut contents = t!(fs::read_to_string(p));
1412-
for tool in &["rust-demangler", "rls", "rust-analyzer", "miri", "rustfmt"] {
1412+
for tool in &["rust-demangler", "rust-analyzer", "miri", "rustfmt"] {
14131413
if !built_tools.contains(tool) {
14141414
contents = filter(&contents, tool);
14151415
}
@@ -1449,7 +1449,7 @@ impl Step for Extended {
14491449
prepare("rust-std");
14501450
prepare("rust-analysis");
14511451
prepare("clippy");
1452-
for tool in &["rust-docs", "rust-demangler", "rls", "rust-analyzer", "miri"] {
1452+
for tool in &["rust-docs", "rust-demangler", "rust-analyzer", "miri"] {
14531453
if built_tools.contains(tool) {
14541454
prepare(tool);
14551455
}
@@ -1485,8 +1485,6 @@ impl Step for Extended {
14851485
builder.create_dir(&exe.join(name));
14861486
let dir = if name == "rust-std" || name == "rust-analysis" {
14871487
format!("{}-{}", name, target.triple)
1488-
} else if name == "rls" {
1489-
"rls-preview".to_string()
14901488
} else if name == "rust-analyzer" {
14911489
"rust-analyzer-preview".to_string()
14921490
} else if name == "clippy" {
@@ -1510,7 +1508,7 @@ impl Step for Extended {
15101508
prepare("rust-docs");
15111509
prepare("rust-std");
15121510
prepare("clippy");
1513-
for tool in &["rust-demangler", "rls", "rust-analyzer", "miri"] {
1511+
for tool in &["rust-demangler", "rust-analyzer", "miri"] {
15141512
if built_tools.contains(tool) {
15151513
prepare(tool);
15161514
}
@@ -1594,25 +1592,6 @@ impl Step for Extended {
15941592
.arg("-out")
15951593
.arg(exe.join("StdGroup.wxs")),
15961594
);
1597-
if built_tools.contains("rls") {
1598-
builder.run(
1599-
Command::new(&heat)
1600-
.current_dir(&exe)
1601-
.arg("dir")
1602-
.arg("rls")
1603-
.args(&heat_flags)
1604-
.arg("-cg")
1605-
.arg("RlsGroup")
1606-
.arg("-dr")
1607-
.arg("Rls")
1608-
.arg("-var")
1609-
.arg("var.RlsDir")
1610-
.arg("-out")
1611-
.arg(exe.join("RlsGroup.wxs"))
1612-
.arg("-t")
1613-
.arg(etc.join("msi/remove-duplicates.xsl")),
1614-
);
1615-
}
16161595
if built_tools.contains("rust-analyzer") {
16171596
builder.run(
16181597
Command::new(&heat)
@@ -1744,9 +1723,6 @@ impl Step for Extended {
17441723
if built_tools.contains("rust-demangler") {
17451724
cmd.arg("-dRustDemanglerDir=rust-demangler");
17461725
}
1747-
if built_tools.contains("rls") {
1748-
cmd.arg("-dRlsDir=rls");
1749-
}
17501726
if built_tools.contains("rust-analyzer") {
17511727
cmd.arg("-dRustAnalyzerDir=rust-analyzer");
17521728
}
@@ -1769,9 +1745,6 @@ impl Step for Extended {
17691745
if built_tools.contains("rust-demangler") {
17701746
candle("RustDemanglerGroup.wxs".as_ref());
17711747
}
1772-
if built_tools.contains("rls") {
1773-
candle("RlsGroup.wxs".as_ref());
1774-
}
17751748
if built_tools.contains("rust-analyzer") {
17761749
candle("RustAnalyzerGroup.wxs".as_ref());
17771750
}
@@ -1809,9 +1782,6 @@ impl Step for Extended {
18091782
.arg("ClippyGroup.wixobj")
18101783
.current_dir(&exe);
18111784

1812-
if built_tools.contains("rls") {
1813-
cmd.arg("RlsGroup.wixobj");
1814-
}
18151785
if built_tools.contains("rust-analyzer") {
18161786
cmd.arg("RustAnalyzerGroup.wixobj");
18171787
}

‎src/etc/installer/msi/rust.wxs

-14
Original file line numberDiff line numberDiff line change
@@ -170,10 +170,6 @@
170170
<Directory Id="Docs" Name="." />
171171
<Directory Id="Cargo" Name="." />
172172
<Directory Id="Std" Name="." />
173-
<!-- tool-rls-start -->
174-
<Directory Id="Rls" Name="." />
175-
<Directory Id="Analysis" Name="." />
176-
<!-- tool-rls-end -->
177173
</Directory>
178174
</Directory>
179175

@@ -277,16 +273,6 @@
277273
<ComponentRef Id="PathEnvPerMachine" />
278274
<ComponentRef Id="PathEnvPerUser" />
279275
</Feature>
280-
<!-- tool-rls-start -->
281-
<Feature Id="RLS"
282-
Title="RLS, the Rust Language Server"
283-
Display="7"
284-
Level="2"
285-
AllowAdvertise="no">
286-
<ComponentGroupRef Id="RlsGroup" />
287-
<ComponentGroupRef Id="AnalysisGroup" />
288-
</Feature>
289-
<!-- tool-rls-end -->
290276

291277
<UIRef Id="RustUI" />
292278
</Product>

‎src/etc/installer/pkg/Distribution.xml

-17
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@
1616
<line choice="rust-std"/>
1717
<line choice="cargo"/>
1818
<line choice="rust-docs"/>
19-
<!-- tool-rls-start -->
20-
<line choice="rls"/>
21-
<!-- tool-rls-end -->
2219
</line>
2320
<line choice="uninstall" />
2421
</choices-outline>
@@ -64,24 +61,10 @@
6461
>
6562
<pkg-ref id="org.rust-lang.rust-docs"/>
6663
</choice>
67-
<!-- tool-rls-start -->
68-
<choice id="rls" visible="true"
69-
title="RLS" description="RLS, the Rust Language Server"
70-
selected="(!choices.uninstall.selected &amp;&amp; choices['rls'].selected) || (choices.uninstall.selected &amp;&amp; choices.install.selected)"
71-
start_selected="false"
72-
>
73-
<pkg-ref id="org.rust-lang.rls"/>
74-
<pkg-ref id="org.rust-lang.rust-analysis"/>
75-
</choice>
76-
<!-- tool-rls-end -->
7764
<pkg-ref id="org.rust-lang.rustc" version="0" onConclusion="none">rustc.pkg</pkg-ref>
7865
<pkg-ref id="org.rust-lang.cargo" version="0" onConclusion="none">cargo.pkg</pkg-ref>
7966
<pkg-ref id="org.rust-lang.rust-docs" version="0" onConclusion="none">rust-docs.pkg</pkg-ref>
8067
<pkg-ref id="org.rust-lang.rust-std" version="0" onConclusion="none">rust-std.pkg</pkg-ref>
81-
<!-- tool-rls-start -->
82-
<pkg-ref id="org.rust-lang.rls" version="0" onConclusion="none">rls.pkg</pkg-ref>
83-
<!-- tool-rls-end -->
84-
<pkg-ref id="org.rust-lang.rust-analysis" version="0" onConclusion="none">rust-analysis.pkg</pkg-ref>
8568
<pkg-ref id="org.rust-lang.uninstall" version="0" onConclusion="none">uninstall.pkg</pkg-ref>
8669
<background file="rust-logo.png" mime-type="image/png"
8770
alignment="bottomleft"/>

0 commit comments

Comments
 (0)