1321292 - bootstrap on windows tells me to source .cargo/env even though that doesn't exist

Status: RESOLVED FIXED

(Firefox Build System :: General, defect)

Description

[Benjamin Smedberg]

STR:
* Windows 10 build machine
* run ./mach bootstrap, option 2 for full desktop build env
* bootstrap installs rust and then prints a message that I should add the following to my .bash_profile:
  source c:\Users\benja\.cargo\env

Expected:
* that instruction should work

Actual:
~/.cargo/env does not exist on Windows (it does on *nix)
~/.cargo/bin does have the binaries, so if I add that to my PATH directly everything is fine

Comment 1

[Ralph Giles (:rillian)]

I suspect ~/.cargo/env doesn't exist on Windows because the MozillaBuildBootstrapper installs rustup with `--no-modify-path` and then pokes it into msys/etc/profile.d manually. I thought that meant you didn't need to add it directly yourself though.

If so, the bug is printing the path advice unnecessarily.

Comment 2

[Benjamin Smedberg]

Won't that break if somebody reinstalls or upgrades mozillabuild?

Comment 3

[Ralph Giles (:rillian)]

Probably. `./mach bootstrap` tries to detect if rust is installed in `~/.cargo/bin` but not in path, and prints the same advice about updating the path.

Running the rustup installer manually on Windows doesn't seem to create `~/.cargo/env`. Perhaps it's considered unhelpful on Windows, where `sh` isn't necessarily present. I want to resolve this by checking if `~/.cargo/env` exists and just suggesting the user update PATH manually if it's not present.

See also bug 1320721.

Comment 4

[Ralph Giles (:rillian)]

Attachment: Bug 1321292 - mozboot: Don't suggest non-existent .cargo.env.

On Windows, the rustup installer doesn't create ~/.cargo/env
but instead pokes .cargo/bin into the path in the Windows
registry. This doesn't necessarily propagate to the msys
evironment however, so some PATH manipulation may still
be necessary.

Split our path advice to be clear in both the new install
and unconfigured path cases, and amend our path update
advice to not mention .cargo/env if it isn't present.

Review commit: https://reviewboard.mozilla.org/r/97882/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/97882/

Comment 5

[Ralph Giles (:rillian)]

Comment on attachment 8817665 [details]
Bug 1321292 - mozboot: Don't suggest non-existent .cargo.env.

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/97882/diff/1-2/

Comment 6

[Gregory Szorc [:gps]]

Comment on attachment 8817665 [details]
Bug 1321292 - mozboot: Don't suggest non-existent .cargo.env.

https://reviewboard.mozilla.org/r/97882/#review98234

Comment 7

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/2b1f8432c519
mozboot: Don't suggest non-existent .cargo.env. r=gps

Comment 8

[Phil Ringnalda (:philor)]

https://hg.mozilla.org/mozilla-central/rev/2b1f8432c519