Bug 1248461 - Enable rust for win32 official builds. r=mshal
☠☠ backed out by e1d3af107ad1 ☠ ☠
authorRalph Giles <giles@mozilla.com>
Mon, 15 Feb 2016 11:41:00 -0800
changeset 331729 5453534da7852186159dbff11c063559dc6bfebf
parent 331728 ff5e2efa2f31b396dce6d0a1ffe5a997fecc1da9
child 331730 a1af7acaba66e5242fbfd18209b8b1e77b7974c8
push id11066
push userbmo:jyavenard@mozilla.com
push dateThu, 18 Feb 2016 05:12:29 +0000
reviewersmshal
bugs1248461
milestone47.0a1
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
browser/config/mozconfigs/win32/debug
browser/config/mozconfigs/win32/nightly
browser/config/mozconfigs/win32/release
browser/config/tooltool-manifests/win32/releng.manifest
--- a/browser/config/mozconfigs/win32/beta
+++ b/browser/config/mozconfigs/win32/beta
@@ -8,9 +8,11 @@ fi
 . "$topsrcdir/build/mozconfig.win-common"
 . "$topsrcdir/browser/config/mozconfigs/win32/common-opt"
 
 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"
--- a/browser/config/mozconfigs/win32/debug
+++ b/browser/config/mozconfigs/win32/debug
@@ -23,10 +23,12 @@ export MOZILLA_OFFICIAL=1
 # Treat warnings as errors (modulo ALLOW_COMPILER_WARNINGS).
 ac_add_options --enable-warnings-as-errors
 
 # Package js shell.
 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"
--- a/browser/config/mozconfigs/win32/nightly
+++ b/browser/config/mozconfigs/win32/nightly
@@ -1,10 +1,12 @@
 . "$topsrcdir/build/mozconfig.win-common"
 . "$topsrcdir/browser/config/mozconfigs/win32/common-opt"
 
 ac_add_options --enable-profiling
 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"
--- a/browser/config/mozconfigs/win32/release
+++ b/browser/config/mozconfigs/win32/release
@@ -14,9 +14,11 @@ mk_add_options MOZ_PGO=1
 
 ac_add_options --enable-official-branding
 ac_add_options --enable-verify-mar
 
 # safeguard against someone forgetting to re-set EARLY_BETA_OR_EARLIER in
 # defines.sh during the beta cycle
 export BUILDING_RELEASE=1
 
+. "$topsrcdir/build/mozconfig.rust"
+
 . "$topsrcdir/build/mozconfig.common.override"
--- a/browser/config/tooltool-manifests/win32/releng.manifest
+++ b/browser/config/tooltool-manifests/win32/releng.manifest
@@ -1,15 +1,22 @@
 [
 {
 "size": 266240,
 "digest": "bb345b0e700ffab4d09436981f14b5de84da55a3f18a7f09ebc4364a4488acdeab8d46f447b12ac70f2da1444a68b8ce8b8675f0dae2ccf845e966d1df0f0869",
 "algorithm": "sha512",
 "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",
 "filename": "sccache.tar.bz2",
 "unpack": true
 }
 ]