diff options
| author | UK992 <urbankrajnc92@gmail.com> | 2016-09-28 21:20:01 +0200 |
|---|---|---|
| committer | UK992 <urbankrajnc92@gmail.com> | 2016-09-28 22:58:38 +0200 |
| commit | b0fabec6c748877bb4f6c5caf181a4d6cdedc038 (patch) | |
| tree | b31b0597f50bdd17d5e9d5df4ec7457b529c132d | |
| parent | a082501173918d6a5808881f84556cb78391b9b2 (diff) | |
| download | servo-b0fabec6c748877bb4f6c5caf181a4d6cdedc038.tar.gz servo-b0fabec6c748877bb4f6c5caf181a4d6cdedc038.zip | |
Fix msvc packages download dir for custom `.servo` location
| -rw-r--r-- | python/servo/bootstrap_commands.py | 2 | ||||
| -rw-r--r-- | python/servo/bootstrapper/bootstrap.py | 3 | ||||
| -rw-r--r-- | python/servo/bootstrapper/windows_msvc.py | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/python/servo/bootstrap_commands.py b/python/servo/bootstrap_commands.py index 78d15160736..8df02304529 100644 --- a/python/servo/bootstrap_commands.py +++ b/python/servo/bootstrap_commands.py @@ -145,7 +145,7 @@ class MachCommands(CommandBase): def bootstrap(self, android=False, interactive=False, force=False): from servo.bootstrapper.bootstrap import Bootstrapper - bootstrapper = Bootstrapper() + bootstrapper = Bootstrapper(self.context) bootstrapper.bootstrap(android=android, interactive=interactive, force=force) @Command('bootstrap-rust', diff --git a/python/servo/bootstrapper/bootstrap.py b/python/servo/bootstrapper/bootstrap.py index c6ac9d196eb..d07dc12fc3c 100644 --- a/python/servo/bootstrapper/bootstrap.py +++ b/python/servo/bootstrapper/bootstrap.py @@ -13,7 +13,7 @@ from windows_msvc import WindowsMsvcBootstrapper class Bootstrapper(object): """Main class that performs system bootstrap.""" - def __init__(self): + def __init__(self, context): self.instance = None cls = None args = {} @@ -28,6 +28,7 @@ class Bootstrapper(object): sys.exit('Bootstrap support is not yet available for your OS.') self.instance = cls(**args) + self.instance.context = context def bootstrap(self, android=False, interactive=False, force=False): self.instance.interactive = interactive diff --git a/python/servo/bootstrapper/windows_msvc.py b/python/servo/bootstrapper/windows_msvc.py index f4926276549..11ff765c99d 100644 --- a/python/servo/bootstrapper/windows_msvc.py +++ b/python/servo/bootstrapper/windows_msvc.py @@ -23,7 +23,7 @@ class WindowsMsvcBootstrapper(BaseBootstrapper): def install_system_packages(self, packages=deps): from servo.bootstrap_commands import extract, download_file - deps_dir = os.path.join(".servo", "msvc-dependencies") + deps_dir = os.path.join(self.context.sharedir, "msvc-dependencies") deps_url = "https://servo-rust.s3.amazonaws.com/msvc-deps/" first_run = True |