Fix nightly updates on gum.
authorPanos Astithas <past@mozilla.com>
Sat, 01 Nov 2014 10:43:29 +0200
changeset 233702 ed70c889afe8c62151e1cbb6f8e1f103b2b6cc95
parent 233701 5c1f21521572c64e751e1791a041d82a06601eec
child 233703 f4938adf5962087879e91dea1404bf98518ebe5a
push id4187
push userbhearsum@mozilla.com
push dateFri, 28 Nov 2014 15:29:12 +0000
treeherdermozilla-beta@f23cc6a30c11 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone35.0a2
Fix nightly updates on gum.
build/mozconfig.common.override
configure.in
--- a/build/mozconfig.common.override
+++ b/build/mozconfig.common.override
@@ -5,10 +5,9 @@
 # Common mozconfig for all users
 #
 # Add options to this file that will be inherited by all in-tree mozconfigs.
 # This file is included at the *end* of the mozconfigs, and so may be used
 # to override anything done previously.
 #
 # The common expected usage is for try builds with nondefault options.
 
-# XXX: REMOVE THESE LINES BEFORE MERGING TO MOZILLA-CENTRAL
-ac_add_options --enable-update-channel=aurora
+ac_add_options --enable-update-channel=nightly-gum
--- a/configure.in
+++ b/configure.in
@@ -9001,17 +9001,18 @@ if test "$ACCESSIBILITY" -a "$MOZ_ENABLE
     ATK_MAJOR_VERSION=`echo ${ATK_FULL_VERSION} | $AWK -F\. '{ print $1 }'`
     ATK_MINOR_VERSION=`echo ${ATK_FULL_VERSION} | $AWK -F\. '{ print $2 }'`
     ATK_REV_VERSION=`echo ${ATK_FULL_VERSION} | $AWK -F\. '{ print $3 }'`
     AC_DEFINE_UNQUOTED(ATK_MAJOR_VERSION, $ATK_MAJOR_VERSION)
     AC_DEFINE_UNQUOTED(ATK_MINOR_VERSION, $ATK_MINOR_VERSION)
     AC_DEFINE_UNQUOTED(ATK_REV_VERSION, $ATK_REV_VERSION)
 fi
 
-if test "$MOZ_UPDATE_CHANNEL" = "aurora"; then
+if test "$MOZ_UPDATE_CHANNEL" = "aurora" ||
+   test "$MOZ_UPDATE_CHANNEL" = "nightly-gum"; then
     AC_DEFINE(MOZ_DEV_EDITION)
 fi
 
 if test "$MOZ_DEBUG"; then
     A11Y_LOG=1
 fi
 case "$MOZ_UPDATE_CHANNEL" in
 aurora|beta|release|esr)