Expose whether a build has comm-central as a topdir. draft
authorTom Prince <mozilla@hocat.ca>
Thu, 19 Oct 2017 10:23:07 -0600
changeset 55585 a56c59a9e121a5f7e22f2fc2802bdac24db5bc88
parent 55582 d812c2f17a3875aace4781d144801b91e7a825f6
child 55586 dbfd352d93872e251a6e8b88f933f78ec68fd110
child 55587 85608595e6267db936fdb66ac3ac53ff2047b6bb
push id5109
push usermozilla@hocat.ca
push dateThu, 19 Oct 2017 16:38:51 +0000
treeherdertry-comm-central@dbfd352d9387 [default view] [failures only]
Expose whether a build has comm-central as a topdir.
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)