Bug 1382571 - Change install_tooltool_clang_package to use `mach artifact toolchain --from-build`. r=gps
authorMike Hommey <mh+mozilla@glandium.org>
Wed, 26 Jul 2017 14:36:07 +0900
changeset 419764 f441f40fb1b51c5128151970ad7bb1f37322a3ae
parent 419763 953c82d8136063c13f554a5ace23de69da942e72
child 419765 6061a480a9b194150791f9bf0708da9ac94c3a7b
push id7566
push usermtabara@mozilla.com
push dateWed, 02 Aug 2017 08:25:16 +0000
treeherdermozilla-beta@86913f512c3c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgps
bugs1382571
milestone56.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1382571 - Change install_tooltool_clang_package to use `mach artifact toolchain --from-build`. r=gps
python/mozboot/mozboot/base.py
python/mozboot/mozboot/stylo.py
--- a/python/mozboot/mozboot/base.py
+++ b/python/mozboot/mozboot/base.py
@@ -254,32 +254,29 @@ class BaseBootstrapper(object):
     def ensure_stylo_packages(self, state_dir, checkout_root):
         '''
         Install any necessary packages needed for Stylo development.
         '''
         raise NotImplementedError(
             '%s does not yet implement ensure_stylo_packages()'
             % __name__)
 
-    def install_tooltool_clang_package(self, state_dir, checkout_root, manifest_file):
-        abs_manifest_file = os.path.join(checkout_root, manifest_file)
-
+    def install_tooltool_clang_package(self, state_dir, checkout_root, toolchain_job):
         mach_binary = os.path.join(checkout_root, 'mach')
         if not os.path.exists(mach_binary):
             raise ValueError("mach not found at %s" % mach_binary)
 
         # If Python can't figure out what its own executable is, there's little
         # chance we're going to be able to execute mach on its own, particularly
         # on Windows.
         if not sys.executable:
             raise ValueError("cannot determine path to Python executable")
 
         cmd = [sys.executable, mach_binary, 'artifact', 'toolchain',
-               '--tooltool-manifest', abs_manifest_file,
-               'clang']
+               '--from-build', toolchain_job]
 
         subprocess.check_call(cmd, cwd=state_dir)
 
     def which(self, name):
         """Python implementation of which.
 
         It returns the path of an executable or None if it couldn't be found.
         """
--- a/python/mozboot/mozboot/stylo.py
+++ b/python/mozboot/mozboot/stylo.py
@@ -1,8 +1,8 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 from __future__ import print_function, unicode_literals
 
-WINDOWS = 'browser/config/tooltool-manifests/win64/clang.manifest'
-LINUX = 'browser/config/tooltool-manifests/linux64/clang.manifest'
+WINDOWS = 'win64-clang-cl'
+LINUX = 'linux64-clang'