Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-08 10:44:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1319860 - mozboot: Prompt to add rust to PATH after install. r=nalexander

Browse Source 
We were checking for success installing rust with the same code
we checked for upgrade success, but in the case of a clean install
this will likely fail because the binaries installed by rustup
won't be in path. Instead, print the help message about adding
them after installation completes.

MozReview-Commit-ID: xa5PKIDKzZ
This commit is contained in:
Ralph Giles 2016-11-24 17:40:35 -08:00
parent ecb49e6689
commit 02c6a95b45
1 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
python/mozboot/mozboot/base.py
View File

@ -75,8 +75,9 @@ We recommend the following tools for installing Python:
RUST_NOT_IN_PATH = '''
You have some rust files in %(cargo_bin)s, but they're not part of the
standard PATH.
standard PATH.'''
RUST_PATH_ADVICE = '''
To make these available, please add this directory to the PATH variable
in your shell initialization script, which may be called ~/.bashrc or
~/.bash_profile or ~/.profile. Edit this and add the following line:
@ -514,6 +515,12 @@ class BaseBootstrapper(object):
return our >= MODERN_RUST_VERSION, our
def cargo_home(self):
cargo_home = os.environ.get('CARGO_HOME',
os.path.expanduser(os.path.join('~', '.cargo')))
cargo_bin = os.path.join(cargo_home, 'bin')
return cargo_home, cargo_bin
def ensure_rust_modern(self):
modern, version = self.is_rust_modern()
@ -523,16 +530,14 @@ class BaseBootstrapper(object):
if not version:
# Rust wasn't in PATH. Try the standard path.
cargo_home = os.environ.get('CARGO_HOME',
os.path.expanduser(os.path.join('~', '.cargo')))
cargo_bin = os.path.join(cargo_home, 'bin')
cargo_home, cargo_bin = self.cargo_home()
try_rustc = os.path.join(cargo_bin, 'rustc' + rust.exe_suffix())
try_cargo = os.path.join(cargo_bin, 'cargo' + rust.exe_suffix())
have_rustc = os.path.exists(try_rustc)
have_cargo = os.path.exists(try_cargo)
if have_rustc or have_cargo:
print(RUST_NOT_IN_PATH % { 'cargo_bin': cargo_bin,
'cargo_home': cargo_home })
print(RUST_NOT_IN_PATH % { 'cargo_bin': cargo_bin })
print(RUST_PATH_ADVICE % { 'cargo_home': cargo_home })
sys.exit(1)
rustup = self.which('rustup')
@ -550,17 +555,16 @@ class BaseBootstrapper(object):
print('Your version of Rust (%s) is too old. Will try to upgrade.' %
version)
self.upgrade_rust(rustup)
modern, after = self.is_rust_modern()
if not modern:
print(RUST_UPGRADE_FAILED % (MODERN_RUST_VERSION, after))
sys.exit(1)
else:
# No rustc or rustup.
print('Will try to install Rust.')
self.install_rust()
modern, after = self.is_rust_modern()
if not modern:
print(RUST_UPGRADE_FAILED % (MODERN_RUST_VERSION, after))
sys.exit(1)
def upgrade_rust(self, rustup):
"""Upgrade Rust.
@ -591,7 +595,10 @@ class BaseBootstrapper(object):
'--default-toolchain', 'stable',
'--default-host', platform,
])
cargo_home, cargo_bin = self.cargo_home()
print('Rust installation complete.')
print('You should now have rustc and cargo in %s' % cargo_bin)
print(RUST_PATH_ADVICE % { 'cargo_home': cargo_home })
finally:
try:
os.remove(rustup_init)