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

Download extra std lib when cross-compiling #9557

Browse source 
Split ensure_bootstrap into two phases including a phase checking the
compiler, and a phase checking for target libraries.
This commit is contained in:
Daniel Robertson 2016-02-11 18:02:26 -05:00
parent 0b27807ad4
commit 0df4118db9
3 changed files with 61 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

54
python/servo/bootstrap_commands.py
View file

@ -108,21 +108,24 @@ class MachCommands(CommandBase):
@CommandArgument('--force', '-f', @CommandArgument('--force', '-f',
action='store_true', action='store_true',
help='Force download even if a copy already exists') help='Force download even if a copy already exists')
def bootstrap_rustc(self, force=False): @CommandArgument('--target',
action='append',
default=[],
help='Download rust stdlib for specified target')
def bootstrap_rustc(self, force=False, target=[]):
rust_dir = path.join( rust_dir = path.join(
self.context.sharedir, "rust", self.rust_path()) self.context.sharedir, "rust", self.rust_path())
date = self.rust_path().split("/")[0]
install_dir = path.join(self.context.sharedir, "rust", date)
if not force and path.exists(path.join(rust_dir, "rustc", "bin", "rustc" + BIN_SUFFIX)): if not force and path.exists(path.join(rust_dir, "rustc", "bin", "rustc" + BIN_SUFFIX)):
print("Rust compiler already downloaded.", end=" ") print("Rust compiler already downloaded.", end=" ")
print("Use |bootstrap-rust --force| to download again.") print("Use |bootstrap-rust --force| to download again.")
return else:
if path.isdir(rust_dir): if path.isdir(rust_dir):
shutil.rmtree(rust_dir) shutil.rmtree(rust_dir)
os.makedirs(rust_dir) os.makedirs(rust_dir)
date = self.rust_path().split("/")[0]
install_dir = path.join(self.context.sharedir, "rust", date)
# The Rust compiler is hosted on the nightly server under the date with a name # The Rust compiler is hosted on the nightly server under the date with a name
# rustc-nightly-HOST-TRIPLE.tar.gz. We just need to pull down and extract it, # rustc-nightly-HOST-TRIPLE.tar.gz. We just need to pull down and extract it,
# giving a directory name that will be the same as the tarball name (rustc is # giving a directory name that will be the same as the tarball name (rustc is
@ -135,29 +138,42 @@ class MachCommands(CommandBase):
print("Extracting Rust compiler...") print("Extracting Rust compiler...")
extract(tgz_file, install_dir) extract(tgz_file, install_dir)
print("Rust compiler ready.")
# Each Rust stdlib has a name of the form `rust-std-nightly-TRIPLE.tar.gz`, with # Each Rust stdlib has a name of the form `rust-std-nightly-TRIPLE.tar.gz`, with
# a directory of the name `rust-std-TRIPLE` inside and then a `lib` directory. # a directory of the name `rust-std-TRIPLE` inside and then a `lib` directory.
# This `lib` directory needs to be extracted and merged with the `rustc/lib` # This `lib` directory needs to be extracted and merged with the `rustc/lib`
# directory from the host compiler above. # directory from the host compiler above.
# TODO: make it possible to request an additional cross-target to add to this lib_dir = path.join(install_dir, "rustc-nightly-{}".format(host_triple()),
# list. "rustc", "lib", "rustlib")
stdlibs = [host_triple(), "arm-linux-androideabi"]
for target in stdlibs: # ensure that the libs for the host's target is downloaded
host_target = host_triple()
if host_target not in target:
target.append(host_target)
for target_triple in target:
target_lib_dir = path.join(lib_dir, target_triple)
if path.exists(target_lib_dir):
# No need to check for force. If --force the directory is already deleted
print("Rust lib for target {} already downloaded.".format(target_triple), end=" ")
print("Use |bootstrap-rust --force| to download again.")
continue
std_url = ("https://static-rust-lang-org.s3.amazonaws.com/dist/%s/rust-std-nightly-%s.tar.gz" std_url = ("https://static-rust-lang-org.s3.amazonaws.com/dist/%s/rust-std-nightly-%s.tar.gz"
% (date, target)) % (date, target_triple))
tgz_file = install_dir + ('rust-std-nightly-%s.tar.gz' % target) tgz_file = install_dir + ('rust-std-nightly-%s.tar.gz' % target_triple)
download_file("Host rust library for target %s" % target, std_url, tgz_file) download_file("Host rust library for target %s" % target_triple, std_url, tgz_file)
print("Extracting Rust stdlib for target %s..." % target) print("Extracting Rust stdlib for target %s..." % target_triple)
extract(tgz_file, install_dir) extract(tgz_file, install_dir)
shutil.copytree(path.join(install_dir, "rust-std-nightly-%s" % target, shutil.copytree(path.join(install_dir, "rust-std-nightly-%s" % target_triple,
"rust-std-%s" % target, "lib", "rustlib", target), "rust-std-%s" % target_triple, "lib", "rustlib", target_triple),
path.join(install_dir, "rustc-nightly-%s" % host_triple(), path.join(install_dir, "rustc-nightly-%s" % host_triple(),
"rustc", "lib", "rustlib", target)) "rustc", "lib", "rustlib", target_triple))
shutil.rmtree(path.join(install_dir, "rust-std-nightly-%s" % target)) shutil.rmtree(path.join(install_dir, "rust-std-nightly-%s" % target_triple))
print("Rust ready.") print("Rust {} libs ready.".format(target_triple))
@Command('bootstrap-rust-docs', @Command('bootstrap-rust-docs',
description='Download the Rust documentation', description='Download the Rust documentation',

7
python/servo/build_commands.py
View file

@ -193,18 +193,21 @@ class MachCommands(CommandBase):
print("Please specify either --dev or --release.") print("Please specify either --dev or --release.")
sys.exit(1) sys.exit(1)
self.ensure_bootstrapped() targets = []
if release: if release:
opts += ["--release"] opts += ["--release"]
if target: if target:
opts += ["--target", target] opts += ["--target", target]
targets.append(target)
if jobs is not None: if jobs is not None:
opts += ["-j", jobs] opts += ["-j", jobs]
if verbose: if verbose:
opts += ["-v"] opts += ["-v"]
if android: if android:
opts += ["--target", self.config["android"]["target"]] opts += ["--target", self.config["android"]["target"]]
targets.append("arm-linux-androideabi")
self.ensure_bootstrapped(targets=targets)
if debug_mozjs or self.config["build"]["debug-mozjs"]: if debug_mozjs or self.config["build"]["debug-mozjs"]:
features += ["script/debugmozjs"] features += ["script/debugmozjs"]

11
python/servo/command_base.py
View file

@ -394,18 +394,21 @@ class CommandBase(object):
def android_build_dir(self, dev): def android_build_dir(self, dev):
return path.join(self.get_target_dir(), "arm-linux-androideabi", "debug" if dev else "release") return path.join(self.get_target_dir(), "arm-linux-androideabi", "debug" if dev else "release")
def ensure_bootstrapped(self): def ensure_bootstrapped(self, targets=[]):
if self.context.bootstrapped: if self.context.bootstrapped:
return return
Registrar.dispatch("update-submodules", context=self.context) Registrar.dispatch("update-submodules", context=self.context)
if not self.config["tools"]["system-rust"] and \ if not self.config["tools"]["system-rust"] and \
not path.exists(path.join( (not path.exists(path.join(
self.config["tools"]["rust-root"], "rustc", "bin", "rustc" + BIN_SUFFIX)): self.config["tools"]["rust-root"], "rustc", "bin", "rustc" + BIN_SUFFIX)) or
not all([path.exists(path.join(
self.config["tools"]["rust-root"], "rustc", "lib", "rustlib", x
)) for x in targets])):
print("looking for rustc at %s" % path.join( print("looking for rustc at %s" % path.join(
self.config["tools"]["rust-root"], "rustc", "bin", "rustc" + BIN_SUFFIX)) self.config["tools"]["rust-root"], "rustc", "bin", "rustc" + BIN_SUFFIX))
Registrar.dispatch("bootstrap-rust", context=self.context) Registrar.dispatch("bootstrap-rust", context=self.context, target=targets)
if not self.config["tools"]["system-cargo"] and \ if not self.config["tools"]["system-cargo"] and \
not path.exists(path.join( not path.exists(path.join(
self.config["tools"]["cargo-root"], "cargo", "bin", "cargo" + BIN_SUFFIX)): self.config["tools"]["cargo-root"], "cargo", "bin", "cargo" + BIN_SUFFIX)):