Bug 1366607: Include toolkit moz.configure in m-c topdir build; r=Fallen
authorTom Prince <mozilla@hocat.ca>
Tue, 17 Oct 2017 13:33:35 -0600
changeset 27904 32a18ec6f4de61ece6d3103ce735b4917cbeaa2d
parent 27903 8cd587465eab8d99bbd718431f37dd1acd1f44a1
child 27905 faa8015c6ae3fd293ceb9fb94508ef268f870ef3
push idunknown
push userunknown
push dateunknown
reviewersFallen
bugs1366607
Bug 1366607: Include toolkit moz.configure in m-c topdir build; r=Fallen MozReview-Commit-ID: 4WoJZTvzy1P
im/moz.configure
mail/moz.configure
suite/moz.configure
--- a/im/moz.configure
+++ b/im/moz.configure
@@ -1,9 +1,22 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # 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)
 
-include('../mozilla/toolkit/moz.configure')
+
+@depends(application)
+def is_comm(app):
+    return app[0].startswith('comm/')
+
+
+@depends(is_comm)
+def toolkit_configure(is_comm):
+    if is_comm:
+        return '../../toolkit/moz.configure'
+    else:
+        return '../mozilla/toolkit/moz.configure'
+
+include(toolkit_configure)
--- a/mail/moz.configure
+++ b/mail/moz.configure
@@ -1,9 +1,22 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # 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)
 
-include('../mozilla/toolkit/moz.configure')
+
+@depends(application)
+def is_comm(app):
+    return app[0].startswith('comm/')
+
+
+@depends(is_comm)
+def toolkit_configure(is_comm):
+    if is_comm:
+        return '../../toolkit/moz.configure'
+    else:
+        return '../mozilla/toolkit/moz.configure'
+
+include(toolkit_configure)
--- a/suite/moz.configure
+++ b/suite/moz.configure
@@ -3,9 +3,22 @@
 # 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)
 imply_option('MOZ_SERVICES_SYNC', True)
 imply_option('MOZ_SOCIAL', False)
 
-include('../mozilla/toolkit/moz.configure')
+
+@depends(application)
+def is_comm(app):
+    return app[0].startswith('comm/')
+
+
+@depends(is_comm)
+def toolkit_configure(is_comm):
+    if is_comm:
+        return '../../toolkit/moz.configure'
+    else:
+        return '../mozilla/toolkit/moz.configure'
+
+include(toolkit_configure)