mirror of
https://github.com/servo/servo.git
synced 2025-07-06 15:03:40 +01:00
Automatically update cargo when necessary
This commit is contained in:
parent
75b340a243
commit
2ee516fa7c
3 changed files with 14 additions and 4 deletions
|
@ -96,7 +96,8 @@ class MachCommands(CommandBase):
|
|||
action='store_true',
|
||||
help='Force download even if cargo already exists')
|
||||
def bootstrap_cargo(self, force=False):
|
||||
cargo_dir = path.join(self.context.sharedir, "cargo")
|
||||
cargo_dir = path.join(self.context.sharedir, "cargo",
|
||||
self.cargo_build_id())
|
||||
if not force and path.exists(path.join(cargo_dir, "bin", "cargo")):
|
||||
print("Cargo already downloaded.", end=" ")
|
||||
print("Use |bootstrap_cargo --force| to download again.")
|
||||
|
@ -104,11 +105,12 @@ class MachCommands(CommandBase):
|
|||
|
||||
if path.isdir(cargo_dir):
|
||||
shutil.rmtree(cargo_dir)
|
||||
os.mkdir(cargo_dir)
|
||||
os.makedirs(cargo_dir)
|
||||
|
||||
tgz_file = "cargo-nightly-%s.tar.gz" % host_triple()
|
||||
# FIXME(#3582): use https.
|
||||
nightly_url = "http://static.rust-lang.org/cargo-dist/2014-10-21/%s" % tgz_file
|
||||
nightly_url = "http://static.rust-lang.org/cargo-dist/%s/%s" % \
|
||||
(self.cargo_build_id(), tgz_file)
|
||||
|
||||
download("Cargo nightly", nightly_url, tgz_file)
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue