diff options
| author | Tim Taubert <ttaubert@mozilla.com> | 2016-08-05 11:23:08 +0200 |
|---|---|---|
| committer | Tim Taubert <ttaubert@mozilla.com> | 2016-08-05 11:23:08 +0200 |
| commit | bcc48afc3a803d6c3443e6434a3257905a776645 (patch) | |
| tree | f9f8c53dfb4a3dbd63dc0514d07224178dd24c1e | |
| parent | 4aa1dfed9071bf178a7d75fbc79263aeb0900d09 (diff) | |
| download | nss-hg-bcc48afc3a803d6c3443e6434a3257905a776645.tar.gz | |
Bug 1290332 - Update MSVC for NSS automation r=glandium
| -rw-r--r-- | automation/taskcluster/windows/releng.manifest | 4 | ||||
| -rw-r--r-- | automation/taskcluster/windows/setup.sh | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/automation/taskcluster/windows/releng.manifest b/automation/taskcluster/windows/releng.manifest index 7d2ea633f..b3f449854 100644 --- a/automation/taskcluster/windows/releng.manifest +++ b/automation/taskcluster/windows/releng.manifest @@ -1,8 +1,8 @@ [ { "version": "Visual Studio 2015 Update 2 / SDK 10.0.10586.0/212", - "size": 332343834, - "digest": "55814aaabcd4aa51fe85918ec02a8c29bc067d41ee79ddcfd628daaba5a06d4241a73a51bf5a8bc69cc762b52551009f44b05e65682c45b4684c17fb2d017c2c", + "size": 332442800, + "digest": "995394a4a515c7cb0f8595f26f5395361a638870dd0bbfcc22193fe1d98a0c47126057d5999cc494f3f3eac5cb49160e79757c468f83ee5797298e286ef6252c", "algorithm": "sha512", "filename": "vs2015u2.zip", "unpack": true diff --git a/automation/taskcluster/windows/setup.sh b/automation/taskcluster/windows/setup.sh index 847a7c3bc..3d91b63c6 100644 --- a/automation/taskcluster/windows/setup.sh +++ b/automation/taskcluster/windows/setup.sh @@ -11,7 +11,7 @@ export WINDOWSSDKDIR="${VSPATH}/SDK" export WIN32_REDIST_DIR="${VSPATH}/VC/redist/x64/Microsoft.VC140.CRT" export WIN_UCRT_REDIST_DIR="${VSPATH}/SDK/Redist/ucrt/DLLs/x64" -export PATH="${VSPATH}/VC/bin/amd64:${VSPATH}/VC/bin:${VSPATH}/SDK/bin/x64:${VSPATH}/VC/redist/x64/Microsoft.VC140.CRT:${VSPATH}/SDK/Redist/ucrt/DLLs/x64:${VSPATH}/DIASDK/bin/amd64:${PATH}" +export PATH="${VSPATH}/VC/bin/amd64:${VSPATH}/VC/bin:${VSPATH}/SDK/bin/x64:${VSPATH}/VC/redist/x64/Microsoft.VC140.CRT:${VSPATH}/SDK/Redist/ucrt/DLLs/x64:${PATH}" -export INCLUDE="${VSPATH}/VC/include:${VSPATH}/VC/atlmfc/include:${VSPATH}/SDK/Include/ucrt:${VSPATH}/SDK/Include/shared:${VSPATH}/SDK/Include/um:${VSPATH}/SDK/Include/winrt:${VSPATH}/DIASDK/include" -export LIB="${VSPATH}/VC/lib/amd64:${VSPATH}/VC/atlmfc/lib/amd64:${VSPATH}/SDK/lib/ucrt/x64:${VSPATH}/SDK/lib/um/x64:${VSPATH}/DIASDK/lib/amd64" +export INCLUDE="${VSPATH}/VC/include:${VSPATH}/SDK/Include/10.0.10586.0/ucrt:${VSPATH}/SDK/Include/10.0.10586.0/shared:${VSPATH}/SDK/Include/10.0.10586.0/um" +export LIB="${VSPATH}/VC/lib/amd64:${VSPATH}/SDK/lib/10.0.10586.0/ucrt/x64:${VSPATH}/SDK/lib/10.0.10586.0/um/x64" |