Skip to content

Commit a879841

Browse files
borsbors
committed
Auto merge of #42472 - alexcrichton:beta-next, r=alexcrichton
[beta] Prepare the 1.19.0 beta release * ~~Update the cargo submodule~~ * Update the stage0 bootstrap to 1.18.0 release * Update release channel to beta * Disable the RLS (this'll happen next beta hopefully) Closes #42357
2 parents ae79201 + 1dbacb3 commit a879841

File tree

7 files changed

+39
-109
lines changed

7 files changed

+39
-109
lines changed

‎src/bootstrap/dist.rs

-46
Original file line numberDiff line numberDiff line change
@@ -914,8 +914,6 @@ pub fn extended(build: &Build, stage: u32, target: &str) {
914914
t!(fs::create_dir_all(pkg.join("cargo")));
915915
t!(fs::create_dir_all(pkg.join("rust-docs")));
916916
t!(fs::create_dir_all(pkg.join("rust-std")));
917-
t!(fs::create_dir_all(pkg.join("rls")));
918-
t!(fs::create_dir_all(pkg.join("rust-analysis")));
919917

920918
cp_r(&work.join(&format!("{}-{}", pkgname(build, "rustc"), target)),
921919
&pkg.join("rustc"));
@@ -925,17 +923,11 @@ pub fn extended(build: &Build, stage: u32, target: &str) {
925923
&pkg.join("rust-docs"));
926924
cp_r(&work.join(&format!("{}-{}", pkgname(build, "rust-std"), target)),
927925
&pkg.join("rust-std"));
928-
cp_r(&work.join(&format!("{}-{}", pkgname(build, "rls"), target)),
929-
&pkg.join("rls"));
930-
cp_r(&work.join(&format!("{}-{}", pkgname(build, "rust-analysis"), target)),
931-
&pkg.join("rust-analysis"));
932926

933927
install(&etc.join("pkg/postinstall"), &pkg.join("rustc"), 0o755);
934928
install(&etc.join("pkg/postinstall"), &pkg.join("cargo"), 0o755);
935929
install(&etc.join("pkg/postinstall"), &pkg.join("rust-docs"), 0o755);
936930
install(&etc.join("pkg/postinstall"), &pkg.join("rust-std"), 0o755);
937-
install(&etc.join("pkg/postinstall"), &pkg.join("rls"), 0o755);
938-
install(&etc.join("pkg/postinstall"), &pkg.join("rust-analysis"), 0o755);
939931

940932
let pkgbuild = |component: &str| {
941933
let mut cmd = Command::new("pkgbuild");
@@ -949,8 +941,6 @@ pub fn extended(build: &Build, stage: u32, target: &str) {
949941
pkgbuild("cargo");
950942
pkgbuild("rust-docs");
951943
pkgbuild("rust-std");
952-
pkgbuild("rls");
953-
pkgbuild("rust-analysis");
954944

955945
// create an 'uninstall' package
956946
install(&etc.join("pkg/postinstall"), &pkg.join("uninstall"), 0o755);
@@ -974,8 +964,6 @@ pub fn extended(build: &Build, stage: u32, target: &str) {
974964
let _ = fs::remove_dir_all(&exe);
975965
t!(fs::create_dir_all(exe.join("rustc")));
976966
t!(fs::create_dir_all(exe.join("cargo")));
977-
t!(fs::create_dir_all(exe.join("rls")));
978-
t!(fs::create_dir_all(exe.join("rust-analysis")));
979967
t!(fs::create_dir_all(exe.join("rust-docs")));
980968
t!(fs::create_dir_all(exe.join("rust-std")));
981969
cp_r(&work.join(&format!("{}-{}", pkgname(build, "rustc"), target))
@@ -990,19 +978,11 @@ pub fn extended(build: &Build, stage: u32, target: &str) {
990978
cp_r(&work.join(&format!("{}-{}", pkgname(build, "rust-std"), target))
991979
.join(format!("rust-std-{}", target)),
992980
&exe.join("rust-std"));
993-
cp_r(&work.join(&format!("{}-{}", pkgname(build, "rls"), target))
994-
.join("rls"),
995-
&exe.join("rls"));
996-
cp_r(&work.join(&format!("{}-{}", pkgname(build, "rust-analysis"), target))
997-
.join(format!("rust-analysis-{}", target)),
998-
&exe.join("rust-analysis"));
999981

1000982
t!(fs::remove_file(exe.join("rustc/manifest.in")));
1001983
t!(fs::remove_file(exe.join("cargo/manifest.in")));
1002984
t!(fs::remove_file(exe.join("rust-docs/manifest.in")));
1003985
t!(fs::remove_file(exe.join("rust-std/manifest.in")));
1004-
t!(fs::remove_file(exe.join("rls/manifest.in")));
1005-
t!(fs::remove_file(exe.join("rust-analysis/manifest.in")));
1006986

1007987
if target.contains("windows-gnu") {
1008988
t!(fs::create_dir_all(exe.join("rust-mingw")));
@@ -1076,26 +1056,6 @@ pub fn extended(build: &Build, stage: u32, target: &str) {
10761056
.arg("-dr").arg("Std")
10771057
.arg("-var").arg("var.StdDir")
10781058
.arg("-out").arg(exe.join("StdGroup.wxs")));
1079-
build.run(Command::new(&heat)
1080-
.current_dir(&exe)
1081-
.arg("dir")
1082-
.arg("rls")
1083-
.args(&heat_flags)
1084-
.arg("-cg").arg("RlsGroup")
1085-
.arg("-dr").arg("Rls")
1086-
.arg("-var").arg("var.RlsDir")
1087-
.arg("-out").arg(exe.join("RlsGroup.wxs"))
1088-
.arg("-t").arg(etc.join("msi/remove-duplicates.xsl")));
1089-
build.run(Command::new(&heat)
1090-
.current_dir(&exe)
1091-
.arg("dir")
1092-
.arg("rust-analysis")
1093-
.args(&heat_flags)
1094-
.arg("-cg").arg("AnalysisGroup")
1095-
.arg("-dr").arg("Analysis")
1096-
.arg("-var").arg("var.AnalysisDir")
1097-
.arg("-out").arg(exe.join("AnalysisGroup.wxs"))
1098-
.arg("-t").arg(etc.join("msi/remove-duplicates.xsl")));
10991059
if target.contains("windows-gnu") {
11001060
build.run(Command::new(&heat)
11011061
.current_dir(&exe)
@@ -1119,8 +1079,6 @@ pub fn extended(build: &Build, stage: u32, target: &str) {
11191079
.arg("-dDocsDir=rust-docs")
11201080
.arg("-dCargoDir=cargo")
11211081
.arg("-dStdDir=rust-std")
1122-
.arg("-dRlsDir=rls")
1123-
.arg("-dAnalysisDir=rust-analysis")
11241082
.arg("-arch").arg(&arch)
11251083
.arg("-out").arg(&output)
11261084
.arg(&input);
@@ -1138,8 +1096,6 @@ pub fn extended(build: &Build, stage: u32, target: &str) {
11381096
candle("DocsGroup.wxs".as_ref());
11391097
candle("CargoGroup.wxs".as_ref());
11401098
candle("StdGroup.wxs".as_ref());
1141-
candle("RlsGroup.wxs".as_ref());
1142-
candle("AnalysisGroup.wxs".as_ref());
11431099

11441100
if target.contains("windows-gnu") {
11451101
candle("GccGroup.wxs".as_ref());
@@ -1162,8 +1118,6 @@ pub fn extended(build: &Build, stage: u32, target: &str) {
11621118
.arg("DocsGroup.wixobj")
11631119
.arg("CargoGroup.wixobj")
11641120
.arg("StdGroup.wixobj")
1165-
.arg("RlsGroup.wixobj")
1166-
.arg("AnalysisGroup.wixobj")
11671121
.current_dir(&exe);
11681122

11691123
if target.contains("windows-gnu") {

‎src/ci/run.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ fi
4444
# FIXME: need a scheme for changing this `nightly` value to `beta` and `stable`
4545
# either automatically or manually.
4646
if [ "$DEPLOY$DEPLOY_ALT" != "" ]; then
47-
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --release-channel=nightly"
47+
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --release-channel=beta"
4848
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --enable-llvm-static-stdcpp"
4949

5050
if [ "$NO_LLVM_ASSERTIONS" = "1" ]; then

‎src/etc/installer/exe/rust.iss

-3
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ Name: gcc; Description: "Linker and platform libraries"; Types: full
4646
Name: docs; Description: "HTML documentation"; Types: full
4747
Name: cargo; Description: "Cargo, the Rust package manager"; Types: full
4848
Name: std; Description: "The Rust Standard Library"; Types: full
49-
Name: rls; Description: "RLS, the Rust Language Server"
5049

5150
[Files]
5251
Source: "rustc/*.*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs; Components: rust
@@ -56,8 +55,6 @@ Source: "rust-mingw/*.*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs;
5655
Source: "rust-docs/*.*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs; Components: docs
5756
Source: "cargo/*.*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs; Components: cargo
5857
Source: "rust-std/*.*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs; Components: std
59-
Source: "rls/*.*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs; Components: rls
60-
Source: "rust-analysis/*.*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs; Components: rls
6158

6259
[Code]
6360
const

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

-10
Original file line numberDiff line numberDiff line change
@@ -170,8 +170,6 @@
170170
<Directory Id="Docs" Name="." />
171171
<Directory Id="Cargo" Name="." />
172172
<Directory Id="Std" Name="." />
173-
<Directory Id="Rls" Name="." />
174-
<Directory Id="Analysis" Name="." />
175173
</Directory>
176174
</Directory>
177175

@@ -275,14 +273,6 @@
275273
<ComponentRef Id="PathEnvPerMachine" />
276274
<ComponentRef Id="PathEnvPerUser" />
277275
</Feature>
278-
<Feature Id="RLS"
279-
Title="RLS, the Rust Language Server"
280-
Display="7"
281-
Level="2"
282-
AllowAdvertise="no">
283-
<ComponentGroupRef Id="RlsGroup" />
284-
<ComponentGroupRef Id="AnalysisGroup" />
285-
</Feature>
286276

287277
<UIRef Id="RustUI" />
288278
</Product>

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

+29-40
Original file line numberDiff line numberDiff line change
@@ -12,70 +12,59 @@
1212
</volume-check>
1313
<choices-outline>
1414
<line choice="install">
15-
<line choice="rustc"/>
16-
<line choice="rust-std"/>
17-
<line choice="cargo"/>
18-
<line choice="rust-docs"/>
19-
<line choice="rls"/>
15+
<line choice="rustc"/>
16+
<line choice="rust-std"/>
17+
<line choice="cargo"/>
18+
<line choice="rust-docs"/>
2019
</line>
2120
<line choice="uninstall" />
2221
</choices-outline>
2322
<!--
24-
These 'selected' scripts ensure that install and uninstall can never be selected at
25-
the same time. Exectly how they work is pretty mysterious, tied to the unspecified algorithm
26-
the installer uses to traverse the options after one is toggled.
23+
These 'selected' scripts ensure that install and uninstall can never be selected at
24+
the same time. Exectly how they work is pretty mysterious, tied to the unspecified algorithm
25+
the installer uses to traverse the options after one is toggled.
2726
-->
2827
<choice id="install" visible="true"
29-
title="Install Rust" description="Install the Rust compiler, package manager and documentation."
30-
customLocation="/usr/local"
31-
selected="!choices.uninstall.selected"
32-
/>
28+
title="Install Rust" description="Install the Rust compiler, package manager and documentation."
29+
customLocation="/usr/local"
30+
selected="!choices.uninstall.selected"
31+
/>
3332
<choice id="uninstall" visible="true"
34-
title="Uninstall Rust" description="Select this option to uninstall an existing Rust installation."
35-
customLocation="/usr/local"
36-
selected="!(choices.install.selected || choices.rustc.selected || choices.cargo.selected || choices['rust-docs'].selected)"
37-
start_selected="false"
38-
>
39-
<pkg-ref id="org.rust-lang.uninstall"/>
33+
title="Uninstall Rust" description="Select this option to uninstall an existing Rust installation."
34+
customLocation="/usr/local"
35+
selected="!(choices.install.selected || choices.rustc.selected || choices.cargo.selected || choices['rust-docs'].selected)"
36+
start_selected="false"
37+
>
38+
<pkg-ref id="org.rust-lang.uninstall" />
4039
</choice>
4140
<choice id="rustc" visible="true"
42-
title="Compiler" description="rustc, the Rust compiler, and rustdoc, the API documentation tool."
43-
selected="(!choices.uninstall.selected &amp;&amp; choices.rustc.selected) || (choices.uninstall.selected &amp;&amp; choices.install.selected)"
44-
>
41+
title="Compiler" description="rustc, the Rust compiler, and rustdoc, the API documentation tool."
42+
selected="(!choices.uninstall.selected &amp;&amp; choices.rustc.selected) || (choices.uninstall.selected &amp;&amp; choices.install.selected)"
43+
>
4544
<pkg-ref id="org.rust-lang.rustc"/>
4645
</choice>
4746
<choice id="cargo" visible="true"
48-
title="Cargo" description="cargo, the Rust package manager."
49-
selected="(!choices.uninstall.selected &amp;&amp; choices.cargo.selected) || (choices.uninstall.selected &amp;&amp; choices.install.selected)"
50-
>
47+
title="Cargo" description="cargo, the Rust package manager."
48+
selected="(!choices.uninstall.selected &amp;&amp; choices.cargo.selected) || (choices.uninstall.selected &amp;&amp; choices.install.selected)"
49+
>
5150
<pkg-ref id="org.rust-lang.cargo"/>
5251
</choice>
5352
<choice id="rust-std" visible="true"
54-
title="Standard Library" description="The Rust standard library."
55-
selected="(!choices.uninstall.selected &amp;&amp; choices['rust-std'].selected) || (choices.uninstall.selected &amp;&amp; choices.install.selected)"
56-
>
53+
title="Standard Library" description="The Rust standard library."
54+
selected="(!choices.uninstall.selected &amp;&amp; choices['rust-std'].selected) || (choices.uninstall.selected &amp;&amp; choices.install.selected)"
55+
>
5756
<pkg-ref id="org.rust-lang.rust-std"/>
5857
</choice>
5958
<choice id="rust-docs" visible="true"
60-
title="Documentation" description="HTML documentation."
61-
selected="(!choices.uninstall.selected &amp;&amp; choices['rust-docs'].selected) || (choices.uninstall.selected &amp;&amp; choices.install.selected)"
62-
>
59+
title="Documentation" description="HTML documentation."
60+
selected="(!choices.uninstall.selected &amp;&amp; choices['rust-docs'].selected) || (choices.uninstall.selected &amp;&amp; choices.install.selected)"
61+
>
6362
<pkg-ref id="org.rust-lang.rust-docs"/>
6463
</choice>
65-
<choice id="rls" visible="true"
66-
title="RLS" description="RLS, the Rust Language Server"
67-
selected="(!choices.uninstall.selected &amp;&amp; choices['rls'].selected) || (choices.uninstall.selected &amp;&amp; choices.install.selected)"
68-
start_selected="false"
69-
>
70-
<pkg-ref id="org.rust-lang.rls"/>
71-
<pkg-ref id="org.rust-lang.rust-analysis"/>
72-
</choice>
7364
<pkg-ref id="org.rust-lang.rustc" version="0" onConclusion="none">rustc.pkg</pkg-ref>
7465
<pkg-ref id="org.rust-lang.cargo" version="0" onConclusion="none">cargo.pkg</pkg-ref>
7566
<pkg-ref id="org.rust-lang.rust-docs" version="0" onConclusion="none">rust-docs.pkg</pkg-ref>
7667
<pkg-ref id="org.rust-lang.rust-std" version="0" onConclusion="none">rust-std.pkg</pkg-ref>
77-
<pkg-ref id="org.rust-lang.rls" version="0" onConclusion="none">rls.pkg</pkg-ref>
78-
<pkg-ref id="org.rust-lang.rust-analysis" version="0" onConclusion="none">rust-analysis.pkg</pkg-ref>
7968
<pkg-ref id="org.rust-lang.uninstall" version="0" onConclusion="none">uninstall.pkg</pkg-ref>
8069
<background file="rust-logo.png" mime-type="image/png"
8170
alignment="bottomleft"/>

‎src/stage0.txt

+4-4
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
# source tarball for a stable release you'll likely see `1.x.0` for rustc and
1313
# `0.x.0` for Cargo where they were released on `date`.
1414

15-
date: 2017-04-25
16-
rustc: beta
17-
cargo: beta
15+
date: 2017-06-06
16+
rustc: 1.18.0
17+
cargo: 0.19.0
1818

1919
# When making a stable release the process currently looks like:
2020
#
@@ -34,4 +34,4 @@ cargo: beta
3434
# looking at a beta source tarball and it's uncommented we'll shortly comment it
3535
# out.
3636

37-
#dev: 1
37+
dev: 1

‎src/tools/build-manifest/src/main.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ impl Builder {
246246
self.package("rust-std", &mut manifest.pkg, TARGETS);
247247
self.package("rust-docs", &mut manifest.pkg, TARGETS);
248248
self.package("rust-src", &mut manifest.pkg, &["*"]);
249-
self.package("rls", &mut manifest.pkg, HOSTS);
249+
// self.package("rls", &mut manifest.pkg, HOSTS);
250250
self.package("rust-analysis", &mut manifest.pkg, TARGETS);
251251

252252
let mut pkg = Package {
@@ -282,10 +282,10 @@ impl Builder {
282282
});
283283
}
284284

285-
extensions.push(Component {
286-
pkg: "rls".to_string(),
287-
target: host.to_string(),
288-
});
285+
// extensions.push(Component {
286+
// pkg: "rls".to_string(),
287+
// target: host.to_string(),
288+
// });
289289
extensions.push(Component {
290290
pkg: "rust-analysis".to_string(),
291291
target: host.to_string(),

0 commit comments

Comments
 (0)