зеркало из https://github.com/mozilla/gecko-dev.git
Backed out 2 changesets (bug 1485224) for perma bc3 failures e.g.: Error getting fileid for Z:\task_1536750533ad] WARNING: NS_ENSURE_TRUE CLOSED TREE
Backed out changeset fe2c607f4af7 (bug 1485224) Backed out changeset f7a6e536532e (bug 1485224)
This commit is contained in:
Margareta Eliza Balazs
Родитель
ee20d3cd7c
Коммит
f79a9159ca
|
|
@ -6,11 +6,11 @@
|
|||
"filename": "mozmake.exe"
|
||||
},
|
||||
{
|
||||
"version": "Visual Studio 2017 15.8.1 / SDK 10.0.17134.0",
|
||||
"digest": "c28588327efd079c547e844c907d4e2fdd05877550dfcd576e55a504de046978d0263ddcb03b6add514c24c9f09a433c3509164f019a9fddebddcc047922a18c",
|
||||
"size": 349594612,
|
||||
"version": "Visual Studio 2017 15.6.6 / SDK 10.0.15063.0",
|
||||
"digest": "c2f0e618877da50f862e5b0ceb13a9affd86490d3779c2b1cb5ba75ea0156adad6df950d1ffbc053d725361fd04b2e57ab17ed5b7b57ffb7f7de2cd82d6edb72",
|
||||
"size": 309779013,
|
||||
"algorithm": "sha512",
|
||||
"filename": "vs2017_15.8.1.zip",
|
||||
"filename": "vs2017_15.6.6.zip",
|
||||
"unpack": true
|
||||
},
|
||||
{
|
||||
|
|
|
|||
|
|
@ -6,11 +6,11 @@
|
|||
"filename": "mozmake.exe"
|
||||
},
|
||||
{
|
||||
"version": "Visual Studio 2017 15.8.1 / SDK 10.0.17134.0",
|
||||
"digest": "c28588327efd079c547e844c907d4e2fdd05877550dfcd576e55a504de046978d0263ddcb03b6add514c24c9f09a433c3509164f019a9fddebddcc047922a18c",
|
||||
"size": 349594612,
|
||||
"version": "Visual Studio 2017 15.6.6 / SDK 10.0.15063.0",
|
||||
"digest": "c2f0e618877da50f862e5b0ceb13a9affd86490d3779c2b1cb5ba75ea0156adad6df950d1ffbc053d725361fd04b2e57ab17ed5b7b57ffb7f7de2cd82d6edb72",
|
||||
"size": 309779013,
|
||||
"algorithm": "sha512",
|
||||
"filename": "vs2017_15.8.1.zip",
|
||||
"filename": "vs2017_15.6.6.zip",
|
||||
"unpack": true
|
||||
},
|
||||
{
|
||||
|
|
|
|||
|
|
@ -51,7 +51,7 @@ Once Visual Studio 2017 Community has been installed, from a checkout
|
|||
of mozilla-central, run something like the following to produce a ZIP
|
||||
archive::
|
||||
|
||||
$ ./mach python build/windows_toolchain.py create-zip vs2017_15.8.1
|
||||
$ ./mach python build/windows_toolchain.py create-zip vs2017_15.6.0
|
||||
|
||||
The produced archive will be the argument to ``create-zip`` + ``.zip``.
|
||||
|
||||
|
|
|
|||
|
|
@ -518,8 +518,8 @@ def check_compiler(compiler, language, target):
|
|||
elif info.type == 'clang-cl' and info.language_version != cxx14_version:
|
||||
append_flag('-std=c++14')
|
||||
|
||||
# We force clang-cl to emulate Visual C++ 2017 version 15.8.1
|
||||
msvc_version = '19.15.26726'
|
||||
# We force clang-cl to emulate Visual C++ 2017 version 15.6.0
|
||||
msvc_version = '19.13.26128'
|
||||
if info.type == 'clang-cl' and info.version != msvc_version:
|
||||
# This flag is a direct clang-cl flag that doesn't need -Xclang,
|
||||
# add it directly.
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
if [ -z "${VSPATH}" ]; then
|
||||
TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir}
|
||||
VSPATH="$(cd ${TOOLTOOL_DIR} && pwd)/vs2017_15.8.1"
|
||||
VSPATH="$(cd ${TOOLTOOL_DIR} && pwd)/vs2017_15.6.6"
|
||||
fi
|
||||
|
||||
if [ -d "${VSPATH}" ]; then
|
||||
|
|
@ -11,14 +11,14 @@ if [ -d "${VSPATH}" ]; then
|
|||
export WIN_UCRT_REDIST_DIR="${VSPATH}/SDK/Redist/ucrt/DLLs/x86"
|
||||
export WIN_DIA_SDK_BIN_DIR="${VSPATH}/DIA SDK/bin"
|
||||
|
||||
export PATH="${VSPATH}/VC/bin/Hostx86/x86:${VSPATH}/VC/bin/Hostx64/x86:${VSPATH}/VC/bin/Hostx64/x64:${VSPATH}/SDK/bin/10.0.17134.0/x64:${WIN_DIA_SDK_BIN_DIR}:${PATH}"
|
||||
export PATH="${VSPATH}/VC/bin/Hostx86/x86:${VSPATH}/VC/bin/Hostx64/x86:${VSPATH}/VC/bin/Hostx64/x64:${VSPATH}/SDK/bin/10.0.15063.0/x64:${WIN_DIA_SDK_BIN_DIR}:${PATH}"
|
||||
export PATH="${VSPATH}/VC/redist/x86/Microsoft.VC141.CRT:${VSPATH}/SDK/Redist/ucrt/DLLs/x86:${PATH}"
|
||||
|
||||
export INCLUDE="${VSPATH}/VC/include:${VSPATH}/VC/atlmfc/include:${VSPATH}/SDK/Include/10.0.17134.0/ucrt:${VSPATH}/SDK/Include/10.0.17134.0/shared:${VSPATH}/SDK/Include/10.0.17134.0/um:${VSPATH}/SDK/Include/10.0.17134.0/winrt:${VSPATH}/DIA SDK/include"
|
||||
export LIB="${VSPATH}/VC/lib/x86:${VSPATH}/VC/atlmfc/lib/x86:${VSPATH}/SDK/Lib/10.0.17134.0/ucrt/x86:${VSPATH}/SDK/Lib/10.0.17134.0/um/x86:${VSPATH}/DIA SDK/lib"
|
||||
export 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"
|
||||
export LIB="${VSPATH}/VC/lib/x86:${VSPATH}/VC/atlmfc/lib/x86:${VSPATH}/SDK/Lib/10.0.15063.0/ucrt/x86:${VSPATH}/SDK/Lib/10.0.15063.0/um/x86:${VSPATH}/DIA SDK/lib"
|
||||
|
||||
export WIN64_LINK="${VSPATH}/VC/bin/Hostx64/x64/link.exe"
|
||||
export WIN64_LIB="${VSPATH}/VC/lib/x64:${VSPATH}/VC/atlmfc/lib/x64:${VSPATH}/SDK/Lib/10.0.17134.0/ucrt/x64:${VSPATH}/SDK/Lib/10.0.17134.0/um/x64:${VSPATH}/DIA SDK/lib/amd64"
|
||||
export WIN64_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"
|
||||
fi
|
||||
|
||||
. $topsrcdir/build/mozconfig.vs-common
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
if [ -z "${VSPATH}" ]; then
|
||||
TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir}
|
||||
VSPATH="$(cd ${TOOLTOOL_DIR} && pwd)/vs2017_15.8.1"
|
||||
VSPATH="$(cd ${TOOLTOOL_DIR} && pwd)/vs2017_15.6.6"
|
||||
fi
|
||||
|
||||
if [ -d "${VSPATH}" ]; then
|
||||
|
|
@ -11,10 +11,10 @@ if [ -d "${VSPATH}" ]; then
|
|||
export WIN_UCRT_REDIST_DIR="${VSPATH}/SDK/Redist/ucrt/DLLs/x64"
|
||||
export WIN_DIA_SDK_BIN_DIR="${VSPATH}/DIA SDK/bin/amd64"
|
||||
|
||||
export PATH="${VSPATH}/VC/bin/Hostx64/x64:${VSPATH}/SDK/bin/10.0.17134.0/x64:${VSPATH}/VC/redist/x64/Microsoft.VC141.CRT:${VSPATH}/SDK/Redist/ucrt/DLLs/x64:${WIN_DIA_SDK_BIN_DIR}:${PATH}"
|
||||
export PATH="${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:${WIN_DIA_SDK_BIN_DIR}:${PATH}"
|
||||
|
||||
export INCLUDE="${VSPATH}/VC/include:${VSPATH}/VC/atlmfc/include:${VSPATH}/SDK/Include/10.0.17134.0/ucrt:${VSPATH}/SDK/Include/10.0.17134.0/shared:${VSPATH}/SDK/Include/10.0.17134.0/um:${VSPATH}/SDK/Include/10.0.17134.0/winrt:${VSPATH}/DIA SDK/include"
|
||||
export LIB="${VSPATH}/VC/lib/x64:${VSPATH}/VC/atlmfc/lib/x64:${VSPATH}/SDK/Lib/10.0.17134.0/ucrt/x64:${VSPATH}/SDK/Lib/10.0.17134.0/um/x64:${VSPATH}/DIA SDK/lib/amd64"
|
||||
export 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"
|
||||
export 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"
|
||||
fi
|
||||
|
||||
. $topsrcdir/build/mozconfig.vs-common
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ from mozpack.mozjar import (
|
|||
)
|
||||
import mozpack.path as mozpath
|
||||
|
||||
SDK_RELEASE = '10.0.17134.0'
|
||||
SDK_RELEASE = '10.0.15063.0'
|
||||
|
||||
PATTERNS = [
|
||||
{
|
||||
|
|
@ -52,7 +52,7 @@ PATTERNS = [
|
|||
],
|
||||
},
|
||||
{
|
||||
'srcdir': '%(vs_path)s/VC/Tools/MSVC/14.15.26726',
|
||||
'srcdir': '%(vs_path)s/VC/Tools/MSVC/14.13.26128',
|
||||
'dstdir': 'VC',
|
||||
'files': [
|
||||
# ATL is needed by Breakpad.
|
||||
|
|
@ -86,7 +86,7 @@ PATTERNS = [
|
|||
],
|
||||
},
|
||||
{
|
||||
'srcdir': '%(vs_path)s/VC/Redist/MSVC/14.15.26706',
|
||||
'srcdir': '%(vs_path)s/VC/Redist/MSVC/14.13.26020',
|
||||
'dstdir': 'VC/redist',
|
||||
'files': [
|
||||
{
|
||||
|
|
|
|||
|
|
@ -549,13 +549,6 @@ define EXPAND_CC_OR_CXX
|
|||
$(if $(PROG_IS_C_ONLY_$(1)),$(CC),$(CCC))
|
||||
endef
|
||||
|
||||
# Workaround a bug of MSVC 2017 Update 8 (see bug 1485224)
|
||||
ifeq ($(CC_TYPE)_$(HOST_OS_ARCH)_$(MOZ_PROFILE_GENERATE),msvc_WINNT_1)
|
||||
LINKER_OUT=$(subst /,\,$1)
|
||||
else
|
||||
LINKER_OUT=$1
|
||||
endif
|
||||
|
||||
#
|
||||
# PROGRAM = Foo
|
||||
# creates OBJS, links with LIBS to create Foo
|
||||
|
|
@ -564,7 +557,7 @@ $(PROGRAM): $(PROGOBJS) $(STATIC_LIBS) $(EXTRA_DEPS) $(RESFILE) $(GLOBAL_DEPS) $
|
|||
$(REPORT_BUILD)
|
||||
@$(RM) $@.manifest
|
||||
ifeq (_WINNT,$(GNU_CC)_$(OS_ARCH))
|
||||
$(LINKER) -NOLOGO -OUT:$(call LINKER_OUT,$@) -PDB:$(LINK_PDBFILE) -IMPLIB:$(basename $(@F)).lib $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(MOZ_PROGRAM_LDFLAGS) $($(notdir $@)_$(OBJS_VAR_SUFFIX)) $(RESFILE) $(STATIC_LIBS) $(SHARED_LIBS) $(OS_LIBS)
|
||||
$(LINKER) -NOLOGO -OUT:$@ -PDB:$(LINK_PDBFILE) -IMPLIB:$(basename $(@F)).lib $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(MOZ_PROGRAM_LDFLAGS) $($(notdir $@)_$(OBJS_VAR_SUFFIX)) $(RESFILE) $(STATIC_LIBS) $(SHARED_LIBS) $(OS_LIBS)
|
||||
ifdef MSMANIFEST_TOOL
|
||||
@if test -f $@.manifest; then \
|
||||
if test -f '$(srcdir)/$(notdir $@).manifest'; then \
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ topsrcdir="$SOURCE"
|
|||
# Tooltool installs in parent of topsrcdir for spidermonkey builds.
|
||||
# Resolve that path since the mozconfigs assume tooltool installs in
|
||||
# topsrcdir.
|
||||
export VSPATH="$(cd ${topsrcdir}/.. && pwd)/vs2017_15.8.1"
|
||||
export VSPATH="$(cd ${topsrcdir}/.. && pwd)/vs2017_15.6.6"
|
||||
|
||||
# When running on a developer machine, several variables will already
|
||||
# have the right settings and we will need to keep them since the
|
||||
|
|
|
|||
|
|
@ -242,7 +242,6 @@ VS_2015u2 = VS('19.00.23918')
|
|||
VS_2015u3 = VS('19.00.24213')
|
||||
VS_2017u4 = VS('19.11.25547')
|
||||
VS_2017u6 = VS('19.13.26128')
|
||||
VS_2017u8 = VS('19.15.26726')
|
||||
|
||||
VS_PLATFORM_X86 = {
|
||||
'_M_IX86': 600,
|
||||
|
|
@ -263,7 +262,7 @@ CLANG_CL_3_9 = (CLANG_BASE('3.9.0') + VS('18.00.00000') + DEFAULT_C11 +
|
|||
'__STDC_VERSION__': False,
|
||||
'__cplusplus': '201103L',
|
||||
},
|
||||
'-fms-compatibility-version=19.15.26726': VS('19.15.26726')[None],
|
||||
'-fms-compatibility-version=19.13.26128': VS('19.13.26128')[None],
|
||||
}
|
||||
|
||||
CLANG_CL_PLATFORM_X86 = FakeCompiler(VS_PLATFORM_X86, GCC_PLATFORM_X86[None])
|
||||
|
|
@ -870,8 +869,7 @@ class WindowsToolchainTest(BaseToolchainTest):
|
|||
'/opt/VS_2015u2/bin/cl': VS_2015u2 + VS_PLATFORM_X86,
|
||||
'/opt/VS_2015u3/bin/cl': VS_2015u3 + VS_PLATFORM_X86,
|
||||
'/opt/VS_2017u4/bin/cl': VS_2017u4 + VS_PLATFORM_X86,
|
||||
'/opt/VS_2017u6/bin/cl': VS_2017u6 + VS_PLATFORM_X86,
|
||||
'/usr/bin/cl': VS_2017u8 + VS_PLATFORM_X86,
|
||||
'/usr/bin/cl': VS_2017u6 + VS_PLATFORM_X86,
|
||||
'/usr/bin/clang-cl': CLANG_CL_3_9 + CLANG_CL_PLATFORM_X86,
|
||||
'/usr/bin/gcc': DEFAULT_GCC + GCC_PLATFORM_X86_WIN,
|
||||
'/usr/bin/g++': DEFAULT_GXX + GCC_PLATFORM_X86_WIN,
|
||||
|
|
@ -928,42 +926,28 @@ class WindowsToolchainTest(BaseToolchainTest):
|
|||
flags=[],
|
||||
version='19.13.26128',
|
||||
type='msvc',
|
||||
compiler='/opt/VS_2017u6/bin/cl',
|
||||
compiler='/usr/bin/cl',
|
||||
language='C',
|
||||
)
|
||||
VSXX_2017u6_RESULT = CompilerResult(
|
||||
flags=[],
|
||||
version='19.13.26128',
|
||||
type='msvc',
|
||||
compiler='/opt/VS_2017u6/bin/cl',
|
||||
language='C++',
|
||||
)
|
||||
VS_2017u8_RESULT = CompilerResult(
|
||||
flags=[],
|
||||
version='19.15.26726',
|
||||
type='msvc',
|
||||
compiler='/usr/bin/cl',
|
||||
language='C',
|
||||
)
|
||||
VSXX_2017u8_RESULT = CompilerResult(
|
||||
flags=[],
|
||||
version='19.15.26726',
|
||||
type='msvc',
|
||||
compiler='/usr/bin/cl',
|
||||
language='C++',
|
||||
)
|
||||
CLANG_CL_3_9_RESULT = CompilerResult(
|
||||
flags=['-Xclang', '-std=gnu99',
|
||||
'-fms-compatibility-version=19.15.26726'],
|
||||
version='19.15.26726',
|
||||
'-fms-compatibility-version=19.13.26128'],
|
||||
version='19.13.26128',
|
||||
type='clang-cl',
|
||||
compiler='/usr/bin/clang-cl',
|
||||
language='C',
|
||||
)
|
||||
CLANGXX_CL_3_9_RESULT = CompilerResult(
|
||||
flags=['-Xclang', '-std=c++14',
|
||||
'-fms-compatibility-version=19.15.26726'],
|
||||
version='19.15.26726',
|
||||
'-fms-compatibility-version=19.13.26128'],
|
||||
version='19.13.26128',
|
||||
type='clang-cl',
|
||||
compiler='/usr/bin/clang-cl',
|
||||
language='C++',
|
||||
|
|
@ -989,16 +973,8 @@ class WindowsToolchainTest(BaseToolchainTest):
|
|||
if os.path.basename(k) != 'clang-cl'
|
||||
}
|
||||
self.do_toolchain_test(paths, {
|
||||
'c_compiler': self.VS_2017u8_RESULT,
|
||||
'cxx_compiler': self.VSXX_2017u8_RESULT,
|
||||
})
|
||||
|
||||
self.do_toolchain_test(self.PATHS, {
|
||||
'c_compiler': self.VS_2017u6_RESULT,
|
||||
'cxx_compiler': self.VSXX_2017u6_RESULT,
|
||||
}, environ={
|
||||
'CC': '/opt/VS_2017u6/bin/cl',
|
||||
'CXX': '/opt/VS_2017u6/bin/cl',
|
||||
})
|
||||
|
||||
def test_unsupported_msvc(self):
|
||||
|
|
@ -1092,7 +1068,7 @@ class WindowsToolchainTest(BaseToolchainTest):
|
|||
|
||||
def test_cannot_cross(self):
|
||||
paths = {
|
||||
'/usr/bin/cl': VS_2017u8 + VS_PLATFORM_X86_64,
|
||||
'/usr/bin/cl': VS_2017u6 + VS_PLATFORM_X86_64,
|
||||
}
|
||||
self.do_toolchain_test(paths, {
|
||||
'c_compiler': ('Target C compiler target CPU (x86_64) '
|
||||
|
|
@ -1113,8 +1089,7 @@ class Windows64ToolchainTest(WindowsToolchainTest):
|
|||
'/opt/VS_2015u2/bin/cl': VS_2015u2 + VS_PLATFORM_X86_64,
|
||||
'/opt/VS_2015u3/bin/cl': VS_2015u3 + VS_PLATFORM_X86_64,
|
||||
'/opt/VS_2017u4/bin/cl': VS_2017u4 + VS_PLATFORM_X86_64,
|
||||
'/opt/VS_2017u6/bin/cl': VS_2017u6 + VS_PLATFORM_X86_64,
|
||||
'/usr/bin/cl': VS_2017u8 + VS_PLATFORM_X86_64,
|
||||
'/usr/bin/cl': VS_2017u6 + VS_PLATFORM_X86_64,
|
||||
'/usr/bin/clang-cl': CLANG_CL_3_9 + CLANG_CL_PLATFORM_X86_64,
|
||||
'/usr/bin/gcc': DEFAULT_GCC + GCC_PLATFORM_X86_64_WIN,
|
||||
'/usr/bin/g++': DEFAULT_GXX + GCC_PLATFORM_X86_64_WIN,
|
||||
|
|
@ -1136,7 +1111,7 @@ class Windows64ToolchainTest(WindowsToolchainTest):
|
|||
|
||||
def test_cannot_cross(self):
|
||||
paths = {
|
||||
'/usr/bin/cl': VS_2017u8 + VS_PLATFORM_X86,
|
||||
'/usr/bin/cl': VS_2017u6 + VS_PLATFORM_X86,
|
||||
}
|
||||
self.do_toolchain_test(paths, {
|
||||
'c_compiler': ('Target C compiler target CPU (x86) '
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче