Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-01-13 07:24:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1408789 - Temporarily keep clang-cl builds using VS2015 binaries. r=gps

Browse Source 
--HG--
rename : browser/config/tooltool-manifests/win32/releng.manifest => browser/config/tooltool-manifests/win32/vs2015.manifest
rename : browser/config/tooltool-manifests/win64/releng.manifest => browser/config/tooltool-manifests/win64/vs2015.manifest
This commit is contained in:
David Major 2017-10-27 11:15:16 -04:00
parent 4d5d42a5b6
commit 9ed1b43eb9
11 changed files with 63 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
browser/config/mozconfigs/win32/clang
View File

@ -9,7 +9,7 @@ ac_add_options --enable-optimize
ac_add_options --enable-clang-plugin
. $topsrcdir/build/win32/mozconfig.vs-latest
. $topsrcdir/build/win32/mozconfig.vs2015-win64
. "$topsrcdir/build/mozconfig.common.override"
. "$topsrcdir/build/mozconfig.clang-cl"

2
browser/config/mozconfigs/win32/clang-debug
View File

@ -10,7 +10,7 @@ ac_add_options --enable-debug
ac_add_options --enable-clang-plugin
. $topsrcdir/build/win32/mozconfig.vs-latest
. $topsrcdir/build/win32/mozconfig.vs2015-win64
. "$topsrcdir/build/mozconfig.common.override"
. "$topsrcdir/build/mozconfig.clang-cl"

2
browser/config/mozconfigs/win32/debug-static-analysis
View File

@ -10,7 +10,7 @@ ac_add_options --enable-dmd
ac_add_options --enable-clang-plugin
. $topsrcdir/build/win32/mozconfig.vs-latest
. $topsrcdir/build/win32/mozconfig.vs2015-win64
. "$topsrcdir/build/mozconfig.common.override"
. "$topsrcdir/build/mozconfig.clang-cl"

2
browser/config/mozconfigs/win64/clang
View File

@ -11,7 +11,7 @@ ac_add_options --enable-optimize
ac_add_options --enable-clang-plugin
. $topsrcdir/build/win64/mozconfig.vs-latest
. $topsrcdir/build/win64/mozconfig.vs2015
. "$topsrcdir/build/mozconfig.common.override"
. "$topsrcdir/build/mozconfig.clang-cl"

2
browser/config/mozconfigs/win64/clang-debug
View File

@ -12,7 +12,7 @@ ac_add_options --enable-debug
ac_add_options --enable-clang-plugin
. $topsrcdir/build/win64/mozconfig.vs-latest
. $topsrcdir/build/win64/mozconfig.vs2015
. "$topsrcdir/build/mozconfig.common.override"
. "$topsrcdir/build/mozconfig.clang-cl"

2
browser/config/mozconfigs/win64/debug-asan
View File

@ -6,7 +6,7 @@ MOZ_AUTOMATION_L10N_CHECK=0
ac_add_options --enable-debug
ac_add_options --enable-optimize="-O1"
. "$topsrcdir/build/win64/mozconfig.vs-latest"
. "$topsrcdir/build/win64/mozconfig.vs2015"
. "$topsrcdir/build/win64/mozconfig.asan"

2
browser/config/mozconfigs/win64/nightly-asan
View File

@ -6,7 +6,7 @@ MOZ_AUTOMATION_L10N_CHECK=0
ac_add_options --disable-debug
ac_add_options --enable-optimize="-O2 -gline-tables-only"
. "$topsrcdir/build/win64/mozconfig.vs-latest"
. "$topsrcdir/build/win64/mozconfig.vs2015"
. "$topsrcdir/build/win64/mozconfig.asan"

25
browser/config/tooltool-manifests/win32/vs2015.manifest Normal file
View File

@ -0,0 +1,25 @@
[
{
"size": 266240,
"digest": "bb345b0e700ffab4d09436981f14b5de84da55a3f18a7f09ebc4364a4488acdeab8d46f447b12ac70f2da1444a68b8ce8b8675f0dae2ccf845e966d1df0f0869",
"algorithm": "sha512",
"filename": "mozmake.exe"
},
{
"version": "Visual Studio 2015 Update 3 14.0.25425.01 / SDK 10.0.14393.0",
"size": 326656969,
"digest": "babc414ffc0457d27f5a1ed24a8e4873afbe2f1c1a4075469a27c005e1babc3b2a788f643f825efedff95b79686664c67ec4340ed535487168a3482e68559bc7",
"algorithm": "sha512",
"filename": "vs2015u3.zip",
"unpack": true
},
{
"version": "makecab rev d2bc6797648b7a834782714a55d339d2fd4e58c8",
"algorithm": "sha512",
"visibility": "public",
"filename": "makecab.tar.bz2",
"unpack": true,
"digest": "196ac6a567c85559957dfe511c3d8654d23c94d5603259e19ccafe9d71e0e4ccee63ccc9a778f2699654b786cda54266108b7d4db543d01bb0b42545b4e6ec75",
"size": 297118
}
]

25
browser/config/tooltool-manifests/win64/vs2015.manifest Normal file
View File

@ -0,0 +1,25 @@
[
{
"size": 266240,
"digest": "bb345b0e700ffab4d09436981f14b5de84da55a3f18a7f09ebc4364a4488acdeab8d46f447b12ac70f2da1444a68b8ce8b8675f0dae2ccf845e966d1df0f0869",
"algorithm": "sha512",
"filename": "mozmake.exe"
},
{
"version": "Visual Studio 2015 Update 3 14.0.25425.01 / SDK 10.0.14393.0",
"size": 326656969,
"digest": "babc414ffc0457d27f5a1ed24a8e4873afbe2f1c1a4075469a27c005e1babc3b2a788f643f825efedff95b79686664c67ec4340ed535487168a3482e68559bc7",
"algorithm": "sha512",
"filename": "vs2015u3.zip",
"unpack": true
},
{
"version": "makecab rev d2bc6797648b7a834782714a55d339d2fd4e58c8",
"algorithm": "sha512",
"visibility": "public",
"filename": "makecab.tar.bz2",
"unpack": true,
"digest": "196ac6a567c85559957dfe511c3d8654d23c94d5603259e19ccafe9d71e0e4ccee63ccc9a778f2699654b786cda54266108b7d4db543d01bb0b42545b4e6ec75",
"size": 297118
}
]

4
taskcluster/ci/build/windows.yml
View File

@ -421,7 +421,7 @@ win64-asan/debug:
worker:
max-run-time: 7200
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/releng.manifest"
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/vs2015.manifest"
run:
using: mozharness
script: mozharness/scripts/fx_desktop_build.py
@ -446,7 +446,7 @@ win64-asan/opt:
worker:
max-run-time: 7200
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/releng.manifest"
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/vs2015.manifest"
run:
using: mozharness
script: mozharness/scripts/fx_desktop_build.py

8
taskcluster/ci/static-analysis/kind.yml
View File

@ -87,7 +87,7 @@ jobs:
worker:
max-run-time: 7200
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win32/releng.manifest"
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win32/vs2015.manifest"
run:
using: mozharness
script: mozharness/scripts/fx_desktop_build.py
@ -111,7 +111,7 @@ jobs:
worker:
max-run-time: 7200
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win32/releng.manifest"
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win32/vs2015.manifest"
run:
using: mozharness
script: mozharness/scripts/fx_desktop_build.py
@ -135,7 +135,7 @@ jobs:
worker:
max-run-time: 7200
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/releng.manifest"
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/vs2015.manifest"
run:
using: mozharness
script: mozharness/scripts/fx_desktop_build.py
@ -159,7 +159,7 @@ jobs:
worker:
max-run-time: 7200
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/releng.manifest"
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/vs2015.manifest"
run:
using: mozharness
script: mozharness/scripts/fx_desktop_build.py