Bug 1464381 - Fix check for NIGHTLY_BUILD. r=gps
authorNick Alexander <nalexander@mozilla.com>
Fri, 25 May 2018 15:37:19 -0700
changeset 801208 eaefe57724c7cdf82de3dd524094cf119de734e6
parent 801207 36333bc2fb034e12cfbdeb153ea08d6e15fb8606
child 801209 b2d0891dd19c037cb66d72f0736e3a902f44adbb
push id111603
push usermozilla@kaply.com
push dateTue, 29 May 2018 22:12:07 +0000
reviewersgps
bugs1464381, 1464128
milestone62.0a1
Bug 1464381 - Fix check for NIGHTLY_BUILD. r=gps This was simply an oversight in the implementation of Bug 1464128. What's happening is that `set_config` in `moz.configure` is not unconditional, and NIGHTLY_BUILD is set in local builds and in B and N builds in automation, so there was no test of the other case, which promptly fails. This re-uses a pattern successful in mobile/android for setting defines. MozReview-Commit-ID: 4zL4hVsqE3Q
browser/locales/generate_bookmarks.py
--- a/browser/locales/generate_bookmarks.py
+++ b/browser/locales/generate_bookmarks.py
@@ -24,19 +24,22 @@ def main(output, bookmarks_html_in, book
     # no localized input uses the preprocessor conditional #if (really,
     # anything but #define), so it's safe to restrict the set of defines to
     # what's used in mozilla-central directly.
     defines = {}
     defines['AB_CD'] = locale
     if defines['AB_CD'] == 'ja-JP-mac':
         defines['AB_CD'] = 'ja'
 
-    defines['NIGHTLY_BUILD'] = CONFIG['NIGHTLY_BUILD']
     defines['BOOKMARKS_INCLUDE_PATH'] = bookmarks_inc
 
+    for var in ('NIGHTLY_BUILD',):
+        if var in CONFIG:
+            defines[var] = CONFIG[var]
+
     includes = preprocessor.preprocess(includes=[bookmarks_html_in],
                                        defines=defines,
                                        output=output)
     return includes
 
 
 if __name__ == "__main__":
     main(sys.argv[1:])