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.
This commit is contained in:
Eric Huss
parent
4a7e2fbb7b
commit
039c9b267a
|
|
@ -1409,7 +1409,7 @@ impl Step for Extended {
|
|||
|
||||
let xform = |p: &Path| {
|
||||
let mut contents = t!(fs::read_to_string(p));
|
||||
for tool in &["rust-demangler", "rls", "rust-analyzer", "miri", "rustfmt"] {
|
||||
for tool in &["rust-demangler", "rust-analyzer", "miri", "rustfmt"] {
|
||||
if !built_tools.contains(tool) {
|
||||
contents = filter(&contents, tool);
|
||||
}
|
||||
|
|
@ -1449,7 +1449,7 @@ impl Step for Extended {
|
|||
prepare("rust-std");
|
||||
prepare("rust-analysis");
|
||||
prepare("clippy");
|
||||
for tool in &["rust-docs", "rust-demangler", "rls", "rust-analyzer", "miri"] {
|
||||
for tool in &["rust-docs", "rust-demangler", "rust-analyzer", "miri"] {
|
||||
if built_tools.contains(tool) {
|
||||
prepare(tool);
|
||||
}
|
||||
|
|
@ -1485,8 +1485,6 @@ impl Step for Extended {
|
|||
builder.create_dir(&exe.join(name));
|
||||
let dir = if name == "rust-std" || name == "rust-analysis" {
|
||||
format!("{}-{}", name, target.triple)
|
||||
} else if name == "rls" {
|
||||
"rls-preview".to_string()
|
||||
} else if name == "rust-analyzer" {
|
||||
"rust-analyzer-preview".to_string()
|
||||
} else if name == "clippy" {
|
||||
|
|
@ -1510,7 +1508,7 @@ impl Step for Extended {
|
|||
prepare("rust-docs");
|
||||
prepare("rust-std");
|
||||
prepare("clippy");
|
||||
for tool in &["rust-demangler", "rls", "rust-analyzer", "miri"] {
|
||||
for tool in &["rust-demangler", "rust-analyzer", "miri"] {
|
||||
if built_tools.contains(tool) {
|
||||
prepare(tool);
|
||||
}
|
||||
|
|
@ -1594,25 +1592,6 @@ impl Step for Extended {
|
|||
.arg("-out")
|
||||
.arg(exe.join("StdGroup.wxs")),
|
||||
);
|
||||
if built_tools.contains("rls") {
|
||||
builder.run(
|
||||
Command::new(&heat)
|
||||
.current_dir(&exe)
|
||||
.arg("dir")
|
||||
.arg("rls")
|
||||
.args(&heat_flags)
|
||||
.arg("-cg")
|
||||
.arg("RlsGroup")
|
||||
.arg("-dr")
|
||||
.arg("Rls")
|
||||
.arg("-var")
|
||||
.arg("var.RlsDir")
|
||||
.arg("-out")
|
||||
.arg(exe.join("RlsGroup.wxs"))
|
||||
.arg("-t")
|
||||
.arg(etc.join("msi/remove-duplicates.xsl")),
|
||||
);
|
||||
}
|
||||
if built_tools.contains("rust-analyzer") {
|
||||
builder.run(
|
||||
Command::new(&heat)
|
||||
|
|
@ -1744,9 +1723,6 @@ impl Step for Extended {
|
|||
if built_tools.contains("rust-demangler") {
|
||||
cmd.arg("-dRustDemanglerDir=rust-demangler");
|
||||
}
|
||||
if built_tools.contains("rls") {
|
||||
cmd.arg("-dRlsDir=rls");
|
||||
}
|
||||
if built_tools.contains("rust-analyzer") {
|
||||
cmd.arg("-dRustAnalyzerDir=rust-analyzer");
|
||||
}
|
||||
|
|
@ -1769,9 +1745,6 @@ impl Step for Extended {
|
|||
if built_tools.contains("rust-demangler") {
|
||||
candle("RustDemanglerGroup.wxs".as_ref());
|
||||
}
|
||||
if built_tools.contains("rls") {
|
||||
candle("RlsGroup.wxs".as_ref());
|
||||
}
|
||||
if built_tools.contains("rust-analyzer") {
|
||||
candle("RustAnalyzerGroup.wxs".as_ref());
|
||||
}
|
||||
|
|
@ -1809,9 +1782,6 @@ impl Step for Extended {
|
|||
.arg("ClippyGroup.wixobj")
|
||||
.current_dir(&exe);
|
||||
|
||||
if built_tools.contains("rls") {
|
||||
cmd.arg("RlsGroup.wixobj");
|
||||
}
|
||||
if built_tools.contains("rust-analyzer") {
|
||||
cmd.arg("RustAnalyzerGroup.wixobj");
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -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"/>
|
||||
|
|
|
|||
Loading…
Reference in a new issue