From 349574a27125d1278e1467e7c11e728498ec91be Mon Sep 17 00:00:00 2001
From: Ralph Giles <giles@mozilla.com>
Date: Mon, 15 Feb 2016 11:41:00 -0800
Subject: [PATCH] Bug 1248461 - Enable rust for win32 official builds. r=mshal

This uses a repacked version of the upstream 1.8 nightly
builds. We need 1.8 for WinXP support, but it's safe to
use nightly until this stablises because other platforms
are using stable rust and will catch any nightly-only
feature use.

For these builds I used the channel-rustc-nightly manifest instead
of the older channel-rust-* manifest, to get the separate std packages.

tar xf rustc-nightly-i686-pc-windows-msvc.tar.gz
rustc-nightly-i686-pc-windows-msvc/install.sh --prefix=rustc/

tar xf rust-std-nightly-i686-pc-windows-msvc.tar.gz
rust-std-nightly-i686-pc-windows-msvc/install.sh --prefix=rustc/

tar cjf rustc.tar.bz2 rustc/*
---
 browser/config/mozconfigs/win32/beta                    | 2 ++
 browser/config/mozconfigs/win32/debug                   | 2 ++
 browser/config/mozconfigs/win32/nightly                 | 2 ++
 browser/config/mozconfigs/win32/release                 | 2 ++
 browser/config/tooltool-manifests/win32/releng.manifest | 7 +++++++
 5 files changed, 15 insertions(+)

diff --git a/browser/config/mozconfigs/win32/beta b/browser/config/mozconfigs/win32/beta
index c83335fbd123..cc14d6800ac5 100644
--- a/browser/config/mozconfigs/win32/beta
+++ b/browser/config/mozconfigs/win32/beta
@@ -13,4 +13,6 @@ mk_add_options MOZ_PGO=1
 ac_add_options --enable-official-branding
 ac_add_options --enable-verify-mar
 
+. "$topsrcdir/build/mozconfig.rust"
+
 . "$topsrcdir/build/mozconfig.common.override"
diff --git a/browser/config/mozconfigs/win32/debug b/browser/config/mozconfigs/win32/debug
index c1400f4f8c1e..eec0edf4f73f 100644
--- a/browser/config/mozconfigs/win32/debug
+++ b/browser/config/mozconfigs/win32/debug
@@ -28,5 +28,7 @@ export MOZ_PACKAGE_JSSHELL=1
 
 ac_add_options --with-branding=browser/branding/nightly
 
+. "$topsrcdir/build/mozconfig.rust"
+
 . "$topsrcdir/build/mozconfig.common.override"
 . "$topsrcdir/build/mozconfig.cache"
diff --git a/browser/config/mozconfigs/win32/nightly b/browser/config/mozconfigs/win32/nightly
index 7cd328b54772..54fbc93f174d 100644
--- a/browser/config/mozconfigs/win32/nightly
+++ b/browser/config/mozconfigs/win32/nightly
@@ -6,5 +6,7 @@ ac_add_options --enable-verify-mar
 
 ac_add_options --with-branding=browser/branding/nightly
 
+. "$topsrcdir/build/mozconfig.rust"
+
 . "$topsrcdir/build/mozconfig.common.override"
 . "$topsrcdir/build/mozconfig.cache"
diff --git a/browser/config/mozconfigs/win32/release b/browser/config/mozconfigs/win32/release
index ea1f242efbdd..daaa45f89823 100644
--- a/browser/config/mozconfigs/win32/release
+++ b/browser/config/mozconfigs/win32/release
@@ -19,4 +19,6 @@ ac_add_options --enable-verify-mar
 # defines.sh during the beta cycle
 export BUILDING_RELEASE=1
 
+. "$topsrcdir/build/mozconfig.rust"
+
 . "$topsrcdir/build/mozconfig.common.override"
diff --git a/browser/config/tooltool-manifests/win32/releng.manifest b/browser/config/tooltool-manifests/win32/releng.manifest
index 6343fb6d8163..a341cc9f4354 100644
--- a/browser/config/tooltool-manifests/win32/releng.manifest
+++ b/browser/config/tooltool-manifests/win32/releng.manifest
@@ -6,6 +6,13 @@
 "filename": "mozmake.exe"
 },
 {
+"size": 80513610,
+"digest": "a388df6ce743be521ba688132d06ba86d225673b53f71f9c7c0d3189adf16f553088d8d359f583f958e886583de9583df53873c85c34abf33b2d55ee7d807206",
+"algorithm": "sha512",
+"filename": "rustc-nightly-i686-pc-windows-msvc.tar.bz2",
+"unpack": true
+},
+{
 "size": 167175,
 "digest": "0b71a936edf5bd70cf274aaa5d7abc8f77fe8e7b5593a208f805cc9436fac646b9c4f0b43c2b10de63ff3da671497d35536077ecbc72dba7f8159a38b580f831",
 "algorithm": "sha512",