Bug 1515504 - Fix the path we check version.txt/version_display.txt under in non-browser projects. r=nalexander, a=RyanVM
authorMike Hommey <mh+mozilla@glandium.org>
Thu, 20 Dec 2018 03:52:29 +0000
changeset 509131 cbb0131d899465ec7f106455fd337ec5cf70b9cc
parent 509130 7af67b7f5f7959417bce93aeb0ab963c874dcd02
child 509132 93e2cfcc400df3879cc767a9c82453359ff6b35f
push id1905
push userffxbld-merge
push dateMon, 21 Jan 2019 12:33:13 +0000
treeherdermozilla-release@c2fca1944d8c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnalexander, RyanVM
bugs1515504
milestone65.0
Bug 1515504 - Fix the path we check version.txt/version_display.txt under in non-browser projects. r=nalexander, a=RyanVM Differential Revision: https://phabricator.services.mozilla.com/D15027
build/moz.configure/init.configure
--- a/build/moz.configure/init.configure
+++ b/build/moz.configure/init.configure
@@ -1081,17 +1081,17 @@ def milestone(build_env, build_project, 
     if build_project == 'js':
         paths = paths * 3
     else:
         paths += [
             'browser/config/version.txt',
             'browser/config/version_display.txt',
         ]
     for f in ('version.txt', 'version_display.txt'):
-        f = os.path.join(build_project, f)
+        f = os.path.join(build_project, 'config', f)
         if not os.path.exists(os.path.join(build_env.topsrcdir, f)):
             break
         paths.append(f)
 
     for p in paths:
         with open(os.path.join(build_env.topsrcdir, p), 'r') as fh:
             content = fh.read().splitlines()
             if not content: