Bug 1410203: Expose whether a build has comm-central as a topdir; r=gps,Fallen
authorTom Prince <mozilla@hocat.ca>
Thu, 19 Oct 2017 10:23:07 -0600
changeset 29225 981003e749b764f18439a07e6e9c16ae87148e23
parent 29224 8f0511d8f2fb8bb6a2f04e1f86833570ce12e3ec
child 29226 4f4b4c62ffd1de914c6fdd6b343eb61d90f3f7e3
push id2068
push userclokep@gmail.com
push dateMon, 13 Nov 2017 19:02:14 +0000
treeherdercomm-beta@9c7e7ce8672b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgps, Fallen
bugs1410203
Bug 1410203: Expose whether a build has comm-central as a topdir; r=gps,Fallen MozReview-Commit-ID: 1s4tUJ5IVl1
mail/moz.configure
--- a/mail/moz.configure
+++ b/mail/moz.configure
@@ -3,20 +3,21 @@
 # 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/.
 
 imply_option('MOZ_PLACES', True)
 
 
 @depends(application)
-def is_comm(app):
-    return app[0].startswith('comm/')
+def is_comm_topdir(app):
+    return not app[0].startswith('comm/')
 
+set_config('MOZ_IS_COMM_TOPDIR', is_comm_topdir)
 
-@depends(is_comm)
-def toolkit_configure(is_comm):
-    if is_comm:
+@depends(is_comm_topdir)
+def toolkit_configure(is_comm_topdir):
+    if is_comm_topdir:
+        return '../mozilla/toolkit/moz.configure'
+    else:
         return '../../toolkit/moz.configure'
-    else:
-        return '../mozilla/toolkit/moz.configure'
 
 include(toolkit_configure)