mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-25 11:15:34 +00:00
9e795ff565
Previously, we were downloading tooltool.py from random servers. Considering tooltool.py is used to secure the download of future components, downloading tooltool.py from potentially 3rd party services was a major lapse in our end-to-end security, as a compromised tooltool.py wouldn't honor integrity checks. This commit copies the already vendored copy of tooltool.py into the mozharness directory. A copy needs to be in the mozharness directory because then a copy of mozharness without access to a source checkout will have access to it. We modify the code in mozharness that fetches tooltool to use the copy from mozharness (unless `mach artifact toolchain` is available). Since a copy of tooltool.py is always reliably available, we can remove all config entries related to tooltool.py. MozReview-Commit-ID: C7ls1xWrPMq --HG-- rename : python/mozbuild/mozbuild/action/tooltool.py => testing/mozharness/external_tools/tooltool.py extra : rebase_source : d7b48d837805f9312c97b6e21c6527cc5f5018dc
58 lines
2.0 KiB
Python
58 lines
2.0 KiB
Python
import sys
|
|
import os
|
|
|
|
import mozharness
|
|
|
|
external_tools_path = os.path.join(
|
|
os.path.abspath(os.path.dirname(os.path.dirname(mozharness.__file__))),
|
|
'external_tools',
|
|
)
|
|
|
|
VSPATH = '%(abs_work_dir)s/vs2017_15.4.2'
|
|
config = {
|
|
'tooltool_manifest_file': "win.manifest",
|
|
'exes': {
|
|
'gittool.py': [sys.executable, os.path.join(external_tools_path, 'gittool.py')],
|
|
'python2.7': 'c:\\mozilla-build\\python27\\python2.7.exe',
|
|
},
|
|
'dump_syms_binary': 'dump_syms.exe',
|
|
'arch': 'x64',
|
|
'use_yasm': True,
|
|
'operating_system': 'msvc',
|
|
'partial_env': {
|
|
'PATH': '%s;%s;%s' % (
|
|
(
|
|
'{_VSPATH}/VC/bin/Hostx64/x64;'
|
|
'{_VSPATH}/SDK/bin/10.0.15063.0/x64;'
|
|
'{_VSPATH}/VC/redist/x64/Microsoft.VC141.CRT;'
|
|
'{_VSPATH}/SDK/Redist/ucrt/DLLs/x64;'
|
|
# 32-bit redist here for our dump_syms.exe
|
|
'{_VSPATH}/VC/redist/x86/Microsoft.VC141.CRT;'
|
|
'{_VSPATH}/SDK/Redist/ucrt/DLLs/x86;'
|
|
'{_VSPATH}/DIA SDK/bin'
|
|
).format(_VSPATH=VSPATH),
|
|
os.environ['PATH'],
|
|
'C:\\mozilla-build\\Git\\bin',
|
|
),
|
|
'WIN32_REDIST_DIR': '{_VSPATH}/VC/redist/x64/Microsoft.VC141.CRT'.format(_VSPATH=VSPATH),
|
|
'WIN_UCRT_REDIST_DIR': '{_VSPATH}/SDK/Redist/ucrt/DLLs/x64'.format(_VSPATH=VSPATH),
|
|
'INCLUDE': (
|
|
'{_VSPATH}/VC/include;'
|
|
'{_VSPATH}/VC/atlmfc/include;'
|
|
'{_VSPATH}/SDK/Include/10.0.15063.0/ucrt;'
|
|
'{_VSPATH}/SDK/Include/10.0.15063.0/shared;'
|
|
'{_VSPATH}/SDK/Include/10.0.15063.0/um;'
|
|
'{_VSPATH}/SDK/Include/10.0.15063.0/winrt;'
|
|
'{_VSPATH}/DIA SDK/include'
|
|
).format(_VSPATH=VSPATH),
|
|
'LIB': (
|
|
'{_VSPATH}/VC/lib/x64;'
|
|
'{_VSPATH}/VC/atlmfc/lib/x64;'
|
|
'{_VSPATH}/SDK/lib/10.0.15063.0/ucrt/x64;'
|
|
'{_VSPATH}/SDK/lib/10.0.15063.0/um/x64;'
|
|
'{_VSPATH}/DIA SDK/lib/amd64'
|
|
).format(_VSPATH=VSPATH),
|
|
'WINDOWSSDKDIR': '{_VSPATH}/SDK'.format(_VSPATH=VSPATH),
|
|
},
|
|
}
|