Bug 1515504 - Fix the path we check version.txt/version_display.txt under in non-browser projects. r=nalexander
authorMike Hommey <mh+mozilla@glandium.org>
Thu, 20 Dec 2018 03:52:29 +0000
changeset 511574 06c4580d6f43
parent 511573 c42c1c038a39
child 511575 6944bc1c900b
push id1953
push userffxbld-merge
push dateMon, 11 Mar 2019 12:10:20 +0000
treeherdermozilla-release@9c35dcbaa899 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnalexander
bugs1515504
milestone66.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 1515504 - Fix the path we check version.txt/version_display.txt under in non-browser projects. r=nalexander 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: