Bug 1080074 - Switch Win64 builders to VS2013. r=glandium sr=bsmedberg
authorDavid Major <dmajor@mozilla.com>
Thu, 09 Oct 2014 11:08:55 +1300
changeset 209847 3989c98e664c4cef0f4ea367ca5e47144e2a618e
parent 209846 3389b00c83bc0d5f53737f4a20230c00d46afd92
child 209848 367b155c5b5e07683a4a4fd3208ab91401d162bb
push id9295
push userkwierso@gmail.com
push dateSat, 11 Oct 2014 02:02:21 +0000
treeherderfx-team@f74ad36bb97b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium, bsmedberg
bugs1080074
milestone35.0a1
Bug 1080074 - Switch Win64 builders to VS2013. r=glandium sr=bsmedberg Win32 will wait until after merge day.
CLOBBER
browser/config/mozconfigs/win64/beta
browser/config/mozconfigs/win64/debug
browser/config/mozconfigs/win64/nightly
browser/config/mozconfigs/win64/release
--- a/CLOBBER
+++ b/CLOBBER
@@ -17,9 +17,9 @@
 #
 # Modifying this file will now automatically clobber the buildbot machines \o/
 #
 
 # Are you updating CLOBBER because you think it's needed for your WebIDL
 # changes to stick? As of bug 928195, this shouldn't be necessary! Please
 # don't change CLOBBER for WebIDL changes any more.
 
-Bug 1069071: IPDL changes require CLOBBER (second time around)
+Bug 1080074: CLOBBER for Win64 compiler update. Other platforms can ignore.
--- a/browser/config/mozconfigs/win64/beta
+++ b/browser/config/mozconfigs/win64/beta
@@ -1,10 +1,10 @@
 . "$topsrcdir/build/mozconfig.win-common"
 . "$topsrcdir/browser/config/mozconfigs/win64/common-win64"
 . "$topsrcdir/browser/config/mozconfigs/win64/common-opt"
 
 mk_add_options MOZ_PGO=1
 
 ac_add_options --enable-official-branding
-. $topsrcdir/build/win64/mozconfig.vs2010
+. $topsrcdir/build/win64/mozconfig.vs2013
 
 . "$topsrcdir/build/mozconfig.common.override"
--- a/browser/config/mozconfigs/win64/debug
+++ b/browser/config/mozconfigs/win64/debug
@@ -12,11 +12,11 @@ ac_add_options --enable-profiling  # nee
 ac_add_options --enable-signmar
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # Package js shell.
 export MOZ_PACKAGE_JSSHELL=1
 
-. $topsrcdir/build/win64/mozconfig.vs2010
+. $topsrcdir/build/win64/mozconfig.vs2013
 
 . "$topsrcdir/build/mozconfig.common.override"
--- a/browser/config/mozconfigs/win64/nightly
+++ b/browser/config/mozconfigs/win64/nightly
@@ -3,11 +3,11 @@
 . "$topsrcdir/browser/config/mozconfigs/win64/common-opt"
 
 ac_add_options --enable-signmar
 ac_add_options --enable-profiling
 
 # Nightlies only since this has a cost in performance
 ac_add_options --enable-js-diagnostics
 
-. $topsrcdir/build/win64/mozconfig.vs2010
+. $topsrcdir/build/win64/mozconfig.vs2013
 
 . "$topsrcdir/build/mozconfig.common.override"
--- a/browser/config/mozconfigs/win64/release
+++ b/browser/config/mozconfigs/win64/release
@@ -6,11 +6,11 @@
 
 mk_add_options MOZ_PGO=1
 
 ac_add_options --enable-official-branding
 
 # safeguard against someone forgetting to re-set EARLY_BETA_OR_EARLIER in
 # defines.sh during the beta cycle
 export BUILDING_RELEASE=1
-. $topsrcdir/build/win64/mozconfig.vs2010
+. $topsrcdir/build/win64/mozconfig.vs2013
 
 . "$topsrcdir/build/mozconfig.common.override"