mirror of
https://github.com/servo/servo.git
synced 2025-06-11 01:50:10 +00:00
adding check for windows then using Scripts instead of bin
This commit is contained in:
parent
095658e098
commit
13d98f153a
6 changed files with 61 additions and 41 deletions
|
@ -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:
|
||||
|
|
|
@ -28,7 +28,7 @@ from mach.decorators import (
|
|||
Command,
|
||||
)
|
||||
|
||||
from servo.command_base import CommandBase, cd, host_triple, use_nightly_rust, check_call, BIN_SUFFIX
|
||||
from servo.command_base import CommandBase, cd, host_triple, check_call, BIN_SUFFIX
|
||||
|
||||
|
||||
def download(desc, src, writer):
|
||||
|
|
|
@ -16,9 +16,7 @@ import toml
|
|||
|
||||
from mach.registrar import Registrar
|
||||
|
||||
BIN_SUFFIX = ""
|
||||
if sys.platform == "win32":
|
||||
BIN_SUFFIX = ".exe"
|
||||
BIN_SUFFIX = ".exe" if sys.platform == "win32" else ""
|
||||
|
||||
|
||||
@contextlib.contextmanager
|
||||
|
@ -59,10 +57,8 @@ def host_triple():
|
|||
|
||||
|
||||
def use_nightly_rust():
|
||||
envvar = os.environ.get("SERVO_USE_NIGHTLY_RUST")
|
||||
if envvar:
|
||||
return envvar != "0"
|
||||
return False
|
||||
envvar = os.environ.get("SERVO_USE_NIGHTLY_RUST", "0")
|
||||
return envvar != "0"
|
||||
|
||||
|
||||
def call(*args, **kwargs):
|
||||
|
@ -70,11 +66,9 @@ def call(*args, **kwargs):
|
|||
verbose = kwargs.pop('verbose', False)
|
||||
if verbose:
|
||||
print(' '.join(args[0]))
|
||||
if sys.platform == "win32":
|
||||
# we have to use shell=True in order to get PATH handling
|
||||
# when looking for the binary on Windows
|
||||
return subprocess.call(*args, shell=True, **kwargs)
|
||||
return subprocess.call(*args, **kwargs)
|
||||
# we have to use shell=True in order to get PATH handling
|
||||
# when looking for the binary on Windows
|
||||
return subprocess.call(*args, shell=sys.platform == 'win32', **kwargs)
|
||||
|
||||
|
||||
def check_call(*args, **kwargs):
|
||||
|
@ -82,11 +76,9 @@ def check_call(*args, **kwargs):
|
|||
verbose = kwargs.pop('verbose', False)
|
||||
if verbose:
|
||||
print(' '.join(args[0]))
|
||||
if sys.platform == "win32":
|
||||
# we have to use shell=True in order to get PATH handling
|
||||
# when looking for the binary on Windows
|
||||
return subprocess.check_call(*args, shell=True, **kwargs)
|
||||
return subprocess.check_call(*args, **kwargs)
|
||||
# we have to use shell=True in order to get PATH handling
|
||||
# when looking for the binary on Windows
|
||||
return subprocess.check_call(*args, shell=sys.platform == 'win32', **kwargs)
|
||||
|
||||
|
||||
class CommandBase(object):
|
||||
|
|
|
@ -10,6 +10,7 @@
|
|||
from __future__ import print_function, unicode_literals
|
||||
from os import path, getcwd, listdir
|
||||
|
||||
import subprocess
|
||||
import sys
|
||||
|
||||
from mach.decorators import (
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue