Install missing pip/virtualenv before creating virtual environment

python/mach_bootstrap.py

@@ -106,6 +106,16 @@ def _activate_virtualenv(topdir):
     script_dir = _get_virtualenv_script_dir()
     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)):
+        # Install missing pip and/or virtualenv packages before creating virtual environment
+        if not _get_exec_path(PIP_NAMES) or not _get_exec_path(VIRTUALENV_NAMES):
+            try:
+                from servo.bootstrapper.bootstrap import Bootstrapper
+
+                bootstrapper = Bootstrapper()
+                bootstrapper.virtualenv()
+            except:
+                pass
+
         virtualenv = _get_exec_path(VIRTUALENV_NAMES)
         if not virtualenv:
             sys.exit("Python virtualenv is not installed. Please install it prior to running mach.")

python/servo/bootstrapper/base.py

@@ -79,3 +79,6 @@ def _update_package_manager(self):
 
         This should be defined in child classes.
         """
+
+    def install_virtualenv(self):
+        """Install virtualenv and pip packages"""

python/servo/bootstrapper/bootstrap.py

@@ -75,3 +75,8 @@ def bootstrap(self, android=False, interactive=False, force=False):
             self.instance.install_mobile_android_packages()
 
         print
+
+    def virtualenv(self):
+        self.instance.install_virtualenv()
+
+        print

python/servo/bootstrapper/centosfedora.py

@@ -32,6 +32,9 @@ def install_system_packages(self, packages=desktop_deps):
     def install_mobile_android_packages(self):
         raise NotImplementedError('Bootstrap support for Android not yet available.')
 
+    def install_virtualenv(self):
+        self.dnf_install(*["python-pip", "python-virtualenv"])
+
     def dnf_install(self, *packages):
         if self.which('dnf'):
             command = ['dnf', 'reinstall' if self.force else 'install']

python/servo/bootstrapper/debian.py

@@ -43,6 +43,9 @@ def install_system_packages(self, packages=desktop_deps):
     def install_mobile_android_packages(self):
         raise NotImplementedError('Bootstrap support for Android not yet available.')
 
+    def install_virtualenv(self):
+        self.apt_install(*["python-pip", self.virtualenv])
+
     def _update_package_manager(self):
         self.apt_update()
 

python/servo/bootstrapper/windows_msvc.py

@@ -8,12 +8,13 @@
 from distutils import spawn
 
 from base import BaseBootstrapper
-from packages import WINDOWS_MSVC as deps
 
 
 class WindowsMsvcBootstrapper(BaseBootstrapper):
     '''Bootstrapper for MSVC building on Windows.'''
 
+    from packages import WINDOWS_MSVC as deps
+
     def __init__(self, **kwargs):
         BaseBootstrapper.__init__(self, **kwargs)
 
@@ -84,3 +85,6 @@ def install_system_packages(self, packages=deps):
 
     def install_mobile_android_packages(self):
         sys.exit('We do not support building Android on Windows. Sorry!')
+
+    def install_virtualenv(self):
+        self.run(['pip', 'install', 'virtualenv'])