Bug 905846 - Create Beta/Release/Common-opt mozconfigs for Win64; r=catlee
authorEhsan Akhgari <ehsan@mozilla.com>
Fri, 23 Aug 2013 18:18:19 -0400
changeset 144155 e4ccc0fa88937fd50a8632200473dd4f513e30bf
parent 144154 f8542e9a0986e29fe3eabe8dce00af8018af045f
child 144156 0b02658e1f7c1ec38f0f78ee020e60446ef65254
push id32886
push usereakhgari@mozilla.com
push dateFri, 23 Aug 2013 22:25:51 +0000
treeherdermozilla-inbound@0b02658e1f7c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerscatlee
bugs905846
milestone26.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 905846 - Create Beta/Release/Common-opt mozconfigs for Win64; r=catlee
browser/config/mozconfigs/win64/beta
browser/config/mozconfigs/win64/common-opt
browser/config/mozconfigs/win64/common-win64
browser/config/mozconfigs/win64/nightly
browser/config/mozconfigs/win64/release
new file mode 100644
--- /dev/null
+++ b/browser/config/mozconfigs/win64/beta
@@ -0,0 +1,7 @@
+. "$topsrcdir/browser/config/mozconfigs/win64/common-opt"
+
+mk_add_options MOZ_PGO=1
+
+ac_add_options --enable-official-branding
+
+. "$topsrcdir/build/mozconfig.common.override"
copy from browser/config/mozconfigs/win64/nightly
copy to browser/config/mozconfigs/win64/common-opt
--- a/browser/config/mozconfigs/win64/nightly
+++ b/browser/config/mozconfigs/win64/common-opt
@@ -1,30 +1,20 @@
-. "$topsrcdir/browser/config/mozconfigs/common"
+# This file is sourced by the nightly, beta, and release mozconfigs.
 
-ac_add_options --target=x86_64-pc-mingw32
-ac_add_options --host=x86_64-pc-mingw32
+. "$topsrcdir/browser/config/mozconfigs/common"
 
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-update-packaging
 ac_add_options --enable-jemalloc
-ac_add_options --enable-signmar
-ac_add_options --enable-profiling
-ac_add_options --enable-metro
-
-# Nightlies only since this has a cost in performance
-ac_add_options --enable-js-diagnostics
+ac_add_options --with-google-api-keyfile=/e/builds/gapi.data
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 export MOZ_TELEMETRY_REPORTING=1
 
 if test -z "${_PYMAKE}"; then
   mk_add_options MOZ_MAKE_FLAGS=-j1
 fi
 
 # Package js shell.
 export MOZ_PACKAGE_JSSHELL=1
-
-. $topsrcdir/build/win64/mozconfig.vs2010
-
-. "$topsrcdir/build/mozconfig.common.override"
new file mode 100644
--- /dev/null
+++ b/browser/config/mozconfigs/win64/common-win64
@@ -0,0 +1,5 @@
+# This file is used by all Win64 builds
+
+ac_add_options --target=x86_64-pc-mingw32
+ac_add_options --host=x86_64-pc-mingw32
+
--- a/browser/config/mozconfigs/win64/nightly
+++ b/browser/config/mozconfigs/win64/nightly
@@ -1,30 +1,13 @@
-. "$topsrcdir/browser/config/mozconfigs/common"
+. "$topsrcdir/browser/config/mozconfigs/win64/common-win64"
+. "$topsrcdir/browser/config/mozconfigs/win64/common-opt"
 
-ac_add_options --target=x86_64-pc-mingw32
-ac_add_options --host=x86_64-pc-mingw32
-
-ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
-ac_add_options --enable-update-packaging
-ac_add_options --enable-jemalloc
 ac_add_options --enable-signmar
 ac_add_options --enable-profiling
 ac_add_options --enable-metro
 
 # Nightlies only since this has a cost in performance
 ac_add_options --enable-js-diagnostics
 
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-export MOZ_TELEMETRY_REPORTING=1
-
-if test -z "${_PYMAKE}"; then
-  mk_add_options MOZ_MAKE_FLAGS=-j1
-fi
-
-# Package js shell.
-export MOZ_PACKAGE_JSSHELL=1
-
 . $topsrcdir/build/win64/mozconfig.vs2010
 
 . "$topsrcdir/build/mozconfig.common.override"
new file mode 100644
--- /dev/null
+++ b/browser/config/mozconfigs/win64/release
@@ -0,0 +1,13 @@
+# This make file should be identical to the beta mozconfig, apart from the
+# safeguard below
+. "$topsrcdir/browser/config/mozconfigs/win64/common-opt"
+
+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/mozconfig.common.override"