diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-01-23 07:27:27 +0530 |
|---|---|---|
| committer | bors-servo <lbergstrom+bors@mozilla.com> | 2016-01-23 07:27:27 +0530 |
| commit | 525e77f64fc65ea2397b4ff3849f5b1f39386698 (patch) | |
| tree | d7978e3cb8cdb5635b35ad507521354b5ae36900 /python/mach_bootstrap.py | |
| parent | a9147275413a1a83ab737f0188a283b2a7dedb85 (diff) | |
| parent | e9d9d1d9e9813e43beaa08add7a33e9d3280dfa4 (diff) | |
| download | servo-525e77f64fc65ea2397b4ff3849f5b1f39386698.tar.gz servo-525e77f64fc65ea2397b4ff3849f5b1f39386698.zip | |
Auto merge of #9385 - larsbergstrom:win32, r=frewsxcv,pcwalton,jdm,ecoal95
Win32 support
r? @frewsxcv for python stuff
r? @pcwalton for the "remove usage of Gaol" stuff for Win32
r? anybody else for misc cargo.lock updates, etc.
This replaces #7878.
This works best with https://github.com/servo/mozjs/pull/71, too, to enable static linking, but can be run without (via some PATH hackery).
The instructions are here, and will be added to a .md file in the repo once the mozjs changes also land:
https://hackpad.com/Servo-on-Windows-C1LPcI2bP25
I'd like to get these changes landed because I've been rebasing them for months, they're otherwise quite stable, and don't affect our other platforms and targets.
<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/9385)
<!-- Reviewable:end -->
Diffstat (limited to 'python/mach_bootstrap.py')
| -rw-r--r-- | python/mach_bootstrap.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/python/mach_bootstrap.py b/python/mach_bootstrap.py index 9f1bfd5f485..e78132d21d2 100644 --- a/python/mach_bootstrap.py +++ b/python/mach_bootstrap.py @@ -92,7 +92,9 @@ def _activate_virtualenv(topdir): if python is None: sys.exit("Python is not installed. Please install it prior to running mach.") - activate_path = os.path.join(virtualenv_path, "bin", "activate_this.py") + # Virtualenv calls its scripts folder "bin" on linux/OSX but "Scripts" on Windows, detect which one then use that + script_dir = "Scripts" if os.name == "nt" else "bin" + activate_path = os.path.join(virtualenv_path, script_dir, "activate_this.py") if not (os.path.exists(virtualenv_path) and os.path.exists(activate_path)): virtualenv = _get_exec(*VIRTUALENV_NAMES) if virtualenv is None: |