mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bootstrap.py: Create cache before download

Browse Source 
This make `_download_component_helper` "pure".
This commit is contained in:
Nilstrieb 2023-04-16 21:31:33 +02:00
parent e6e956dade
commit 488da69ce9
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/bootstrap/bootstrap.py
View File

@ -429,17 +429,24 @@ class RustBuild(object):
self.program_out_of_date(self.rustc_stamp(), key)): self.program_out_of_date(self.rustc_stamp(), key)):
if os.path.exists(bin_root): if os.path.exists(bin_root):
shutil.rmtree(bin_root) shutil.rmtree(bin_root)
key = self.stage0_compiler.date
cache_dst = os.path.join(self.build_dir, "cache")
rustc_cache = os.path.join(cache_dst, key)
if not os.path.exists(rustc_cache):
os.makedirs(rustc_cache)
tarball_suffix = '.tar.gz' if lzma is None else '.tar.xz' tarball_suffix = '.tar.gz' if lzma is None else '.tar.xz'
filename = "rust-std-{}-{}{}".format( filename = "rust-std-{}-{}{}".format(
rustc_channel, self.build, tarball_suffix) rustc_channel, self.build, tarball_suffix)
pattern = "rust-std-{}".format(self.build) pattern = "rust-std-{}".format(self.build)
self._download_component_helper(filename, pattern, tarball_suffix) self._download_component_helper(filename, pattern, tarball_suffix, rustc_cache)
filename = "rustc-{}-{}{}".format(rustc_channel, self.build, filename = "rustc-{}-{}{}".format(rustc_channel, self.build,
tarball_suffix) tarball_suffix)
self._download_component_helper(filename, "rustc", tarball_suffix) self._download_component_helper(filename, "rustc", tarball_suffix, rustc_cache)
filename = "cargo-{}-{}{}".format(rustc_channel, self.build, filename = "cargo-{}-{}{}".format(rustc_channel, self.build,
tarball_suffix) tarball_suffix)
self._download_component_helper(filename, "cargo", tarball_suffix) self._download_component_helper(filename, "cargo", tarball_suffix, rustc_cache)
if self.should_fix_bins_and_dylibs(): if self.should_fix_bins_and_dylibs():
self.fix_bin_or_dylib("{}/bin/cargo".format(bin_root)) self.fix_bin_or_dylib("{}/bin/cargo".format(bin_root))
@ -455,13 +462,9 @@ class RustBuild(object):
rust_stamp.write(key) rust_stamp.write(key)
def _download_component_helper( def _download_component_helper(
self, filename, pattern, tarball_suffix, self, filename, pattern, tarball_suffix, rustc_cache,
): ):
key = self.stage0_compiler.date key = self.stage0_compiler.date
cache_dst = os.path.join(self.build_dir, "cache")
rustc_cache = os.path.join(cache_dst, key)
if not os.path.exists(rustc_cache):
os.makedirs(rustc_cache)
tarball = os.path.join(rustc_cache, filename) tarball = os.path.join(rustc_cache, filename)
if not os.path.exists(tarball): if not os.path.exists(tarball):