Bug 1275437 - Moved installing of Python into an install_python method in the windows bootstrapper; r?gps
The correct version of Python will get installed from the install_python method instead of with the system packages.
This is more in-line with how a bootstrapper *should* extend from the base bootstrapper.
MozReview-Commit-ID: JIMGF7XKL02
--- a/python/mozboot/mozboot/windows.py
+++ b/python/mozboot/mozboot/windows.py
@@ -8,17 +8,16 @@ import subprocess
from mozboot.base import BaseBootstrapper
class WindowsBootstrapper(BaseBootstrapper):
'''Bootstrapper for msys2 based environments for building in Windows.'''
SYSTEM_PACKAGES = [
'mingw-w64-x86_64-make',
- 'mingw-w64-x86_64-python2',
'mingw-w64-x86_64-python2-pip',
'mingw-w64-x86_64-perl',
'patch',
'patchutils',
'diffutils',
'autoconf2.13',
'tar',
'zip',
@@ -51,16 +50,19 @@ class WindowsBootstrapper(BaseBootstrapp
return BaseBootstrapper.which(self, name + '.exe')
def install_system_packages(self):
self.pacman_install(*self.SYSTEM_PACKAGES)
def upgrade_mercurial(self, current):
self.pip_install('mercurial')
+ def upgrade_python(self, current):
+ self.pacman_install('mingw-w64-x86_64-python2')
+
def install_browser_packages(self):
self.pacman_install(*self.BROWSER_PACKAGES)
def install_mobile_android_packages(self):
raise NotImplementedError('We do not support building Android on Windows. Sorry!')
def install_mobile_android_artifact_mode_packages(self):
raise NotImplementedError('We do not support building Android on Windows. Sorry!')