Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-06 06:53:38 +01:00
Code Issues Projects Releases Packages Wiki Activity

auto merge of #3902 : mbrubeck/servo/share_directory, r=jdm

Browse source 
This is @acmiyaguchi's already-reviewed patch from #3388, rebased and squashed onto servo master. Fixes #3353.
This commit is contained in:
bors-servo 2014-11-05 18:51:36 -07:00
commit 5dae1de2f5
4 changed files with 21 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
python/servo/bootstrap_commands.py
View file

@ -78,7 +78,7 @@ class MachCommands(CommandBase):
help='Force download even if a snapshot already exists')
def bootstrap_rustc(self, force=False):
rust_dir = path.join(
self.context.topdir, "rust", *self.rust_snapshot_path().split("/"))
self.context.sharedir, "rust", *self.rust_snapshot_path().split("/"))
if not force and path.exists(path.join(rust_dir, "bin", "rustc")):
print("Snapshot Rust compiler already downloaded.", end=" ")
print("Use |bootstrap_rust --force| to download again.")
@ -107,7 +107,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.topdir, "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.")
@ -115,11 +116,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)