Backed out changeset 6bbe2e6958a9 (bug 1127801) for intermittent (?!?!) Mulet mochitest bustage.
authorRyan VanderMeulen <ryanvm@gmail.com>
Tue, 07 Apr 2015 13:47:54 -0400
changeset 237933 6288bbcd0ab2a8bee3092327d2bd5158f076ff9d
parent 237932 fe9b0e818059f4bf64d5189ed349a658acb081f3
child 237934 e9d5b79e51a84435f7a1e199a8d9f0690b41ad79
push id58073
push userryanvm@gmail.com
push dateTue, 07 Apr 2015 17:52:30 +0000
treeherdermozilla-inbound@6288bbcd0ab2 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1127801
milestone40.0a1
backs out6bbe2e6958a98718451e5fa4ecd0d2aab44e3846
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
Backed out changeset 6bbe2e6958a9 (bug 1127801) for intermittent (?!?!) Mulet mochitest bustage. CLOSED TREE
configure.in
js/src/configure.in
python/mozbuild/mozbuild/milestone.py
toolkit/xre/Makefile.in
--- a/configure.in
+++ b/configure.in
@@ -1915,19 +1915,19 @@ case "$host" in
     HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX"
     HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O2}"
     ;;
 esac
 
 dnl ==============================================================
 dnl Get mozilla version from central milestone file
 dnl ==============================================================
-MOZILLA_VERSION=`$PYTHON $srcdir/python/mozbuild/mozbuild/milestone.py`
-MOZILLA_UAVERSION=`$PYTHON $srcdir/python/mozbuild/mozbuild/milestone.py --uaversion`
-MOZILLA_SYMBOLVERSION=`$PYTHON $srcdir/python/mozbuild/mozbuild/milestone.py --symbolversion`
+MOZILLA_VERSION=`$PYTHON $srcdir/python/mozbuild/mozbuild/milestone.py --topsrcdir $srcdir`
+MOZILLA_UAVERSION=`$PYTHON $srcdir/python/mozbuild/mozbuild/milestone.py --topsrcdir $srcdir --uaversion`
+MOZILLA_SYMBOLVERSION=`$PYTHON $srcdir/python/mozbuild/mozbuild/milestone.py --topsrcdir $srcdir --symbolversion`
 
 dnl Get version of various core apps from the version files.
 FIREFOX_VERSION=`cat $_topsrcdir/browser/config/version.txt`
 
 if test -z "$FIREFOX_VERSION"; then
     AC_MSG_ERROR([FIREFOX_VERSION is unexpectedly blank.])
 fi
 
--- a/js/src/configure.in
+++ b/js/src/configure.in
@@ -691,19 +691,19 @@ AC_PATH_XTRA
 
 XCFLAGS="$X_CFLAGS"
 
 fi # COMPILE_ENVIRONMENT
 
 dnl ==============================================================
 dnl Get mozilla version from central milestone file
 dnl ==============================================================
-MOZILLA_VERSION=`$PYTHON $srcdir/python/mozbuild/mozbuild/milestone.py`
-MOZILLA_UAVERSION=`$PYTHON $srcdir/python/mozbuild/mozbuild/milestone.py --uaversion`
-MOZILLA_SYMBOLVERSION=`$PYTHON $srcdir/python/mozbuild/mozbuild/milestone.py --symbolversion`
+MOZILLA_VERSION=`$PYTHON $srcdir/python/mozbuild/mozbuild/milestone.py --topsrcdir $srcdir`
+MOZILLA_UAVERSION=`$PYTHON $srcdir/python/mozbuild/mozbuild/milestone.py --topsrcdir $srcdir --uaversion`
+MOZILLA_SYMBOLVERSION=`$PYTHON $srcdir/python/mozbuild/mozbuild/milestone.py --topsrcdir $srcdir --symbolversion`
 
 AC_DEFINE_UNQUOTED(MOZILLA_VERSION,"$MOZILLA_VERSION")
 AC_DEFINE_UNQUOTED(MOZILLA_VERSION_U,$MOZILLA_VERSION)
 AC_DEFINE_UNQUOTED(MOZILLA_UAVERSION,"$MOZILLA_UAVERSION")
 AC_SUBST(MOZILLA_SYMBOLVERSION)
 
 # Separate version into components for use in shared object naming etc
 changequote(,)
--- a/python/mozbuild/mozbuild/milestone.py
+++ b/python/mozbuild/mozbuild/milestone.py
@@ -1,14 +1,13 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 from __future__ import print_function, unicode_literals
-from mozbuild.base import MozbuildObject
 
 import argparse
 import os
 import re
 import sys
 
 
 def get_milestone_ab_with_num(milestone):
@@ -22,19 +21,16 @@ def get_milestone_ab_with_num(milestone)
 
     return ""
 
 
 def get_official_milestone(path):
     """
     Returns the contents of the first line in `path` that starts with a digit.
     """
-    if path is None:
-        build = MozbuildObject.from_environment()
-        path = os.path.join(build.topsrcdir,'config','milestone.txt')
 
     with open(path) as fp:
         for line in fp:
             line = line.strip()
             if line[:1].isdigit():
                 return line
 
     raise Exception("Didn't find a line that starts with a digit.")
@@ -47,20 +43,20 @@ def get_milestone_major(milestone):
 
     return milestone.split('.')[0]
 
 
 def main(args):
     parser = argparse.ArgumentParser()
     parser.add_argument('--uaversion', default=False, action='store_true')
     parser.add_argument('--symbolversion', default=False, action='store_true')
+    parser.add_argument('--topsrcdir', metavar='TOPSRCDIR', required=True)
     options = parser.parse_args(args)
 
-    build = MozbuildObject.from_environment()
-    milestone_file = os.path.join(build.topsrcdir, 'config', 'milestone.txt')
+    milestone_file = os.path.join(options.topsrcdir, 'config', 'milestone.txt')
 
     milestone = get_official_milestone(milestone_file)
 
     if options.uaversion:
         # Only expose the major milestone in the UA string, hide the patch
         # level (bugs 572659 and 870868).
         uaversion = "%s.0" % (get_milestone_major(milestone),)
         print(uaversion)
--- a/toolkit/xre/Makefile.in
+++ b/toolkit/xre/Makefile.in
@@ -8,17 +8,17 @@
 USE_RCS_MK=1
 include $(topsrcdir)/config/makefiles/makeutils.mk
 
 milestone_txt = $(topsrcdir)/config/milestone.txt
 
 include $(topsrcdir)/config/rules.mk
 
 # Should version be optional or required ?
-TOOLKIT_EM_VERSION=$(shell $(PYTHON) $(topsrcdir)/python/mozbuild/mozbuild/milestone.py)
+TOOLKIT_EM_VERSION=$(shell $(PYTHON) $(topsrcdir)/python/mozbuild/mozbuild/milestone.py --topsrcdir=$(topsrcdir))
 $(call warnIfEmpty,TOOLKIT_EM_VERSION)
 
 # Valid if null: {warn,error}IfEmpty
 DEFINES += -DTOOLKIT_EM_VERSION='"$(TOOLKIT_EM_VERSION)"'
 
 MOZ_SOURCE_STAMP ?= $(firstword $(shell hg -R $(topsrcdir) parent --template='{node|short}\n' 2>/dev/null))
 ifdef MOZ_SOURCE_STAMP