Bug 1061335 - Part 3: Switch Win32 builders to VS2013. r=glandium sr=bsmedberg

2014-10-14 15:31:23 +13:00 · 2014-10-14 15:31:23 +13:00 · 3295ea5606
--- a/2
+++ b/2
@ -22,4 +22,4 @@
 # changes to stick? As of bug 928195, this shouldn't be necessary! Please
 # don't change CLOBBER for WebIDL changes any more.

-Merge day clobber
+Bug 1061335 - CLOBBER for Win32 compiler update.
--- a/b2g/config/mozconfigs/win32_gecko/debug
+++ b/b2g/config/mozconfigs/win32_gecko/debug
@ -15,7 +15,7 @@ export MOZILLA_OFFICIAL=1
 export MOZ_TELEMETRY_REPORTING=1

 if test "$PROCESSOR_ARCHITECTURE" = "AMD64" -o "$PROCESSOR_ARCHITEW6432" = "AMD64"; then
-  . $topsrcdir/build/win32/mozconfig.vs2010-win64
+  . $topsrcdir/build/win32/mozconfig.vs2013-win64
 else
  . $topsrcdir/build/win32/mozconfig.vs2010
 fi
--- a/b2g/config/mozconfigs/win32_gecko/nightly
+++ b/b2g/config/mozconfigs/win32_gecko/nightly
@ -14,7 +14,7 @@ export MOZILLA_OFFICIAL=1
 export MOZ_TELEMETRY_REPORTING=1

 if test "$PROCESSOR_ARCHITECTURE" = "AMD64" -o "$PROCESSOR_ARCHITEW6432" = "AMD64"; then
-  . $topsrcdir/build/win32/mozconfig.vs2010-win64
+  . $topsrcdir/build/win32/mozconfig.vs2013-win64
 else
  . $topsrcdir/build/win32/mozconfig.vs2010
 fi
--- a/browser/config/mozconfigs/win32/common-opt
+++ b/browser/config/mozconfigs/win32/common-opt
@ -27,7 +27,7 @@ export MOZILLA_OFFICIAL=1
 export MOZ_TELEMETRY_REPORTING=1

 if test "$PROCESSOR_ARCHITECTURE" = "AMD64" -o "$PROCESSOR_ARCHITEW6432" = "AMD64"; then
-  . $topsrcdir/build/win32/mozconfig.vs2010-win64
+  . $topsrcdir/build/win32/mozconfig.vs2013-win64
 else
  . $topsrcdir/build/win32/mozconfig.vs2010
 fi
--- a/browser/config/mozconfigs/win32/debug
+++ b/browser/config/mozconfigs/win32/debug
@ -20,7 +20,7 @@ ac_add_options --with-google-oauth-api-keyfile=${_google_oauth_api_keyfile}
 export MOZILLA_OFFICIAL=1

 if test "$PROCESSOR_ARCHITECTURE" = "AMD64" -o "$PROCESSOR_ARCHITEW6432" = "AMD64"; then
-  . $topsrcdir/build/win32/mozconfig.vs2010-win64
+  . $topsrcdir/build/win32/mozconfig.vs2013-win64
 else
  . $topsrcdir/build/win32/mozconfig.vs2010
 fi
--- a/browser/config/mozconfigs/win32/l10n-mozconfig
+++ b/browser/config/mozconfigs/win32/l10n-mozconfig
@ -8,7 +8,7 @@ ac_add_options --with-windows-version=601
 export MOZILLA_OFFICIAL=1

 if test "$PROCESSOR_ARCHITECTURE" = "AMD64" -o "$PROCESSOR_ARCHITEW6432" = "AMD64"; then
-  . $topsrcdir/build/win32/mozconfig.vs2010-win64
+  . $topsrcdir/build/win32/mozconfig.vs2013-win64
 else
  . $topsrcdir/build/win32/mozconfig.vs2010
 fi
--- a/xulrunner/config/mozconfigs/win32/xulrunner
+++ b/xulrunner/config/mozconfigs/win32/xulrunner
@ -8,7 +8,7 @@ ac_add_options --enable-jemalloc
 ac_add_options --disable-tests

 if test "$PROCESSOR_ARCHITECTURE" = "AMD64" -o "$PROCESSOR_ARCHITEW6432" = "AMD64"; then
-  . $topsrcdir/build/win32/mozconfig.vs2010-win64
+  . $topsrcdir/build/win32/mozconfig.vs2013-win64
 else
  . $topsrcdir/build/win32/mozconfig.vs2010
 fi