|
@@ -2,19 +2,19 @@
|
|
|
# User Masatoshi Kimura <VYV03354@nifty.ne.jp>
|
|
|
# Date 1536272119 -32400
|
|
|
# Node ID b2a536ba5d4bbf0be909652caee1d2d4d63ddcb4
|
|
|
-# Parent 49f6ff9787d3fe9441c5bd7c5d1a3a0956ff1d9a
|
|
|
+# Parent 8b53d0af4dfeaf957cecbc5180f1d1a8f0fb2128
|
|
|
Bug 1485224 - Update Windows builders to VS 2017 15.8.4 and Windows SDK 17134. r=glandium
|
|
|
|
|
|
diff --git a/browser/config/tooltool-manifests/win32/releng.manifest b/browser/config/tooltool-manifests/win32/releng.manifest
|
|
|
--- a/browser/config/tooltool-manifests/win32/releng.manifest
|
|
|
+++ b/browser/config/tooltool-manifests/win32/releng.manifest
|
|
|
-@@ -9,21 +9,21 @@
|
|
|
- "version": "rustc 1.19.0 (0ade33941 2017-07-17) repack",
|
|
|
- "size": 97017057,
|
|
|
- "digest": "b726645f9d26c5a3048720b3839166021c1cf91a02d2ff2f10c49adced7455c7352e18b5052084d80bf9d1c40ec1bf72d0397921b8cd23262f89fdbd10def58f",
|
|
|
+@@ -1,21 +1,21 @@
|
|
|
+ [
|
|
|
+ {
|
|
|
+ "size": 266240,
|
|
|
+ "digest": "bb345b0e700ffab4d09436981f14b5de84da55a3f18a7f09ebc4364a4488acdeab8d46f447b12ac70f2da1444a68b8ce8b8675f0dae2ccf845e966d1df0f0869",
|
|
|
"algorithm": "sha512",
|
|
|
- "filename": "rustc.tar.bz2",
|
|
|
- "unpack": true
|
|
|
+ "filename": "mozmake.exe"
|
|
|
},
|
|
|
{
|
|
|
- "version": "Visual Studio 2017 15.6.6 / SDK 10.0.15063.0",
|
|
@@ -37,13 +37,13 @@ diff --git a/browser/config/tooltool-manifests/win32/releng.manifest b/browser/c
|
|
|
diff --git a/browser/config/tooltool-manifests/win64/releng.manifest b/browser/config/tooltool-manifests/win64/releng.manifest
|
|
|
--- a/browser/config/tooltool-manifests/win64/releng.manifest
|
|
|
+++ b/browser/config/tooltool-manifests/win64/releng.manifest
|
|
|
-@@ -10,21 +10,21 @@
|
|
|
- "size": 103602526,
|
|
|
- "digest": "558d2d18991ad8b250a5d6b46a55e1ffdffc50d6bdd9cb4b3a945dd3d1143836b32e47f1df612bfea97ca2c02333ed43055b6c3030ecb1632385fb6940c1d246",
|
|
|
+@@ -1,21 +1,21 @@
|
|
|
+ [
|
|
|
+ {
|
|
|
+ "size": 266240,
|
|
|
+ "digest": "bb345b0e700ffab4d09436981f14b5de84da55a3f18a7f09ebc4364a4488acdeab8d46f447b12ac70f2da1444a68b8ce8b8675f0dae2ccf845e966d1df0f0869",
|
|
|
"algorithm": "sha512",
|
|
|
- "visibility": "public",
|
|
|
- "filename": "rustc.tar.bz2",
|
|
|
- "unpack": true
|
|
|
+ "filename": "mozmake.exe"
|
|
|
},
|
|
|
{
|
|
|
- "version": "Visual Studio 2017 15.6.6 / SDK 10.0.15063.0",
|
|
@@ -88,7 +88,7 @@ diff --git a/build/docs/toolchains.rst b/build/docs/toolchains.rst
|
|
|
diff --git a/build/moz.configure/toolchain.configure b/build/moz.configure/toolchain.configure
|
|
|
--- a/build/moz.configure/toolchain.configure
|
|
|
+++ b/build/moz.configure/toolchain.configure
|
|
|
-@@ -495,18 +495,18 @@ def check_compiler(compiler, language, t
|
|
|
+@@ -513,18 +513,18 @@ def check_compiler(compiler, language, t
|
|
|
if info.language == 'C++':
|
|
|
if info.type == 'clang' and info.language_version != cxx14_version:
|
|
|
append_flag('-std=gnu++14')
|
|
@@ -146,7 +146,7 @@ diff --git a/build/win32/mozconfig.vs2017 b/build/win32/mozconfig.vs2017
|
|
|
mk_export_correct_style WINDOWSSDKDIR
|
|
|
mk_export_correct_style WIN32_REDIST_DIR
|
|
|
mk_export_correct_style WIN_UCRT_REDIST_DIR
|
|
|
- mk_export_correct_style PATH
|
|
|
+ mk_export_correct_style WIN_DIA_SDK_BIN_DIR
|
|
|
diff --git a/build/win64/mozconfig.vs2017 b/build/win64/mozconfig.vs2017
|
|
|
--- a/build/win64/mozconfig.vs2017
|
|
|
+++ b/build/win64/mozconfig.vs2017
|
|
@@ -302,7 +302,7 @@ diff --git a/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py
|
|
|
LIBRARY_NAME_INFOS = {
|
|
|
'linux-gnu': {
|
|
|
'DLL_PREFIX': 'lib',
|
|
|
-@@ -862,17 +863,18 @@ class WindowsToolchainTest(BaseToolchain
|
|
|
+@@ -864,17 +865,18 @@ class WindowsToolchainTest(BaseToolchain
|
|
|
PATHS = {
|
|
|
'/opt/VS_2013u2/bin/cl': VS_2013u2 + VS_PLATFORM_X86,
|
|
|
'/opt/VS_2013u3/bin/cl': VS_2013u3 + VS_PLATFORM_X86,
|
|
@@ -322,7 +322,7 @@ diff --git a/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py
|
|
|
'/usr/bin/gcc-5': GCC_5 + GCC_PLATFORM_X86_WIN,
|
|
|
'/usr/bin/g++-5': GXX_5 + GCC_PLATFORM_X86_WIN,
|
|
|
'/usr/bin/gcc-6': GCC_6 + GCC_PLATFORM_X86_WIN,
|
|
|
-@@ -919,38 +921,52 @@ class WindowsToolchainTest(BaseToolchain
|
|
|
+@@ -921,38 +923,52 @@ class WindowsToolchainTest(BaseToolchain
|
|
|
'This version (19.11.25547) of the MSVC compiler is not supported.\n'
|
|
|
'You must install Visual C++ 2017 Update 6 or Update 8 or later'
|
|
|
' in order to build.\n'
|
|
@@ -380,21 +380,20 @@ diff --git a/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py
|
|
|
CLANGXX_3_3_RESULT = LinuxToolchainTest.CLANGXX_3_3_RESULT
|
|
|
DEFAULT_CLANG_RESULT = LinuxToolchainTest.DEFAULT_CLANG_RESULT
|
|
|
DEFAULT_CLANGXX_RESULT = LinuxToolchainTest.DEFAULT_CLANGXX_RESULT
|
|
|
-@@ -960,19 +976,27 @@ class WindowsToolchainTest(BaseToolchain
|
|
|
- GXX_5_RESULT = LinuxToolchainTest.GXX_5_RESULT
|
|
|
- GCC_6_RESULT = LinuxToolchainTest.GCC_6_RESULT
|
|
|
- GXX_6_RESULT = LinuxToolchainTest.GXX_6_RESULT
|
|
|
- DEFAULT_GCC_RESULT = LinuxToolchainTest.DEFAULT_GCC_RESULT
|
|
|
- DEFAULT_GXX_RESULT = LinuxToolchainTest.DEFAULT_GXX_RESULT
|
|
|
-
|
|
|
+@@ -968,18 +984,26 @@ class WindowsToolchainTest(BaseToolchain
|
|
|
# VS2017u6 or greater is required.
|
|
|
def test_msvc(self):
|
|
|
-+ self.do_toolchain_test(paths, {
|
|
|
+ # We'll pick msvc if clang-cl can't be found.
|
|
|
+ paths = {
|
|
|
+ k: v for k, v in self.PATHS.iteritems()
|
|
|
+ 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, {
|
|
|
++ self.do_toolchain_test(self.PATHS, {
|
|
|
'c_compiler': self.VS_2017u6_RESULT,
|
|
|
'cxx_compiler': self.VSXX_2017u6_RESULT,
|
|
|
+ }, environ={
|
|
@@ -408,7 +407,7 @@ diff --git a/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py
|
|
|
}, environ={
|
|
|
'CC': '/opt/VS_2017u4/bin/cl',
|
|
|
})
|
|
|
-@@ -1061,17 +1085,17 @@ class WindowsToolchainTest(BaseToolchain
|
|
|
+@@ -1063,17 +1087,17 @@ class WindowsToolchainTest(BaseToolchain
|
|
|
'cxx_compiler': self.CLANGXX_3_3_RESULT,
|
|
|
}, environ={
|
|
|
'CC': 'clang-3.3',
|
|
@@ -427,7 +426,7 @@ diff --git a/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py
|
|
|
|
|
|
|
|
|
class Windows64ToolchainTest(WindowsToolchainTest):
|
|
|
-@@ -1082,17 +1106,18 @@ class Windows64ToolchainTest(WindowsTool
|
|
|
+@@ -1084,17 +1108,18 @@ class Windows64ToolchainTest(WindowsTool
|
|
|
PATHS = {
|
|
|
'/opt/VS_2013u2/bin/cl': VS_2013u2 + VS_PLATFORM_X86_64,
|
|
|
'/opt/VS_2013u3/bin/cl': VS_2013u3 + VS_PLATFORM_X86_64,
|
|
@@ -447,7 +446,7 @@ diff --git a/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py
|
|
|
'/usr/bin/gcc-5': GCC_5 + GCC_PLATFORM_X86_64_WIN,
|
|
|
'/usr/bin/g++-5': GXX_5 + GCC_PLATFORM_X86_64_WIN,
|
|
|
'/usr/bin/gcc-6': GCC_6 + GCC_PLATFORM_X86_64_WIN,
|
|
|
-@@ -1104,17 +1129,17 @@ class Windows64ToolchainTest(WindowsTool
|
|
|
+@@ -1106,17 +1131,17 @@ class Windows64ToolchainTest(WindowsTool
|
|
|
'/usr/bin/clang-3.6': CLANG_3_6 + CLANG_PLATFORM_X86_64_WIN,
|
|
|
'/usr/bin/clang++-3.6': CLANGXX_3_6 + CLANG_PLATFORM_X86_64_WIN,
|
|
|
'/usr/bin/clang-3.3': CLANG_3_3 + CLANG_PLATFORM_X86_64_WIN,
|