Bug 1330250 - Port bug 1329320 to TB: Win tooltool-manifests and mozconfig.win-common. r=aleth
authorRichard Marti <richard.marti@gmail.com>
Wed, 11 Jan 2017 12:19:35 +0100
changeset 21001 4eeb3f3d3ec6
parent 21000 b0e38b2324c3
child 21002 433bc33a6ed3
push id12740
push userrichard.marti@gmail.com
push dateThu, 12 Jan 2017 09:34:50 +0000
treeherdercomm-central@4eeb3f3d3ec6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersaleth
bugs1330250, 1329320
Bug 1330250 - Port bug 1329320 to TB: Win tooltool-manifests and mozconfig.win-common. r=aleth
build/mozconfig.win-common
mail/config/tooltool-manifests/win32/releng.manifest
mail/config/tooltool-manifests/win64/releng.manifest
--- a/build/mozconfig.win-common
+++ b/build/mozconfig.win-common
@@ -9,8 +9,11 @@ if [ "x$IS_NIGHTLY" = "xyes" ]; then
   MOZ_AUTOMATION_SDK=${MOZ_AUTOMATION_SDK-1}
 fi
 
 # Some builds (eg: Mulet) don't want the installer, so only set this if it
 # hasn't already been set.
 MOZ_AUTOMATION_INSTALLER=${MOZ_AUTOMATION_INSTALLER-1}
 
 export SOCORRO_SYMBOL_UPLOAD_TOKEN_FILE=c:/builds/crash-stats-api.token
+
+TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir}
+export MAKECAB=$TOOLTOOL_DIR/makecab.exe
--- a/mail/config/tooltool-manifests/win32/releng.manifest
+++ b/mail/config/tooltool-manifests/win32/releng.manifest
@@ -24,10 +24,18 @@
 },
 {
 "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
+},
+{
+"algorithm": "sha512",
+"visibility": "public",
+"filename": "makecab.tar.bz2",
+"unpack": true,
+"digest": "da1f7685e5bc49a5ffbe5b4a3678ac7a58a0e125031726d30e2bacbbffa53d6efb9fd9f00d6dff5b54cff9412a103efa564c2af6f8fccc63082f6939181769f8",
+"size": 296777
 }
 ]
--- a/mail/config/tooltool-manifests/win64/releng.manifest
+++ b/mail/config/tooltool-manifests/win64/releng.manifest
@@ -25,10 +25,18 @@
 },
 {
 "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
+},
+{
+"algorithm": "sha512",
+"visibility": "public",
+"filename": "makecab.tar.bz2",
+"unpack": true,
+"digest": "da1f7685e5bc49a5ffbe5b4a3678ac7a58a0e125031726d30e2bacbbffa53d6efb9fd9f00d6dff5b54cff9412a103efa564c2af6f8fccc63082f6939181769f8",
+"size": 296777
 }
 ]