From 17258381ee6f6a41f9eb4016c0e5b89557b71f39 Mon Sep 17 00:00:00 2001
From: naru-san <naru.aditya@gmail.com>
Date: Tue, 7 Apr 2015 12:43:40 -0400
Subject: [PATCH] Bug 1127801 - Capture path to milestone.txt from the OS
 automatically using MozbuildObject from mozbuild.base. r=ted CLOSED TREE

---
 configure.in                          | 6 +++---
 js/src/configure.in                   | 6 +++---
 python/mozbuild/mozbuild/milestone.py | 8 ++++++--
 toolkit/xre/Makefile.in               | 2 +-
 4 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/configure.in b/configure.in
index 6066e66dd1ae..be37c0c8376b 100644
--- a/configure.in
+++ b/configure.in
@@ -1920,9 +1920,9 @@ esac
 dnl ==============================================================
 dnl Get mozilla version from central milestone file
 dnl ==============================================================
-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`
+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`
 
 dnl Get version of various core apps from the version files.
 FIREFOX_VERSION=`cat $_topsrcdir/browser/config/version.txt`
diff --git a/js/src/configure.in b/js/src/configure.in
index 978d370faeff..60f673ea1879 100644
--- a/js/src/configure.in
+++ b/js/src/configure.in
@@ -696,9 +696,9 @@ fi # COMPILE_ENVIRONMENT
 dnl ==============================================================
 dnl Get mozilla version from central milestone file
 dnl ==============================================================
-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`
+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`
 
 AC_DEFINE_UNQUOTED(MOZILLA_VERSION,"$MOZILLA_VERSION")
 AC_DEFINE_UNQUOTED(MOZILLA_VERSION_U,$MOZILLA_VERSION)
diff --git a/python/mozbuild/mozbuild/milestone.py b/python/mozbuild/mozbuild/milestone.py
index b53da495ae0e..0e5a249b5271 100644
--- a/python/mozbuild/mozbuild/milestone.py
+++ b/python/mozbuild/mozbuild/milestone.py
@@ -3,6 +3,7 @@
 # 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
@@ -26,6 +27,9 @@ 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:
@@ -48,10 +52,10 @@ 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)
 
-    milestone_file = os.path.join(options.topsrcdir, 'config', 'milestone.txt')
+    build = MozbuildObject.from_environment()
+    milestone_file = os.path.join(build.topsrcdir, 'config', 'milestone.txt')
 
     milestone = get_official_milestone(milestone_file)
 
diff --git a/toolkit/xre/Makefile.in b/toolkit/xre/Makefile.in
index 5ace8901e587..e16c33dfdf50 100644
--- a/toolkit/xre/Makefile.in
+++ b/toolkit/xre/Makefile.in
@@ -13,7 +13,7 @@ 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 --topsrcdir=$(topsrcdir))
+TOOLKIT_EM_VERSION=$(shell $(PYTHON) $(topsrcdir)/python/mozbuild/mozbuild/milestone.py)
 $(call warnIfEmpty,TOOLKIT_EM_VERSION)
 
 # Valid if null: {warn,error}IfEmpty