Bug 1049249 - Remove app_libxul_dirs on a CLOSED TREE. r=jcranmer
authorMike Hommey <mh+mozilla@glandium.org>
Thu, 07 Aug 2014 13:39:20 +0900
changeset 19812 1c0a95ffa495895fbfe341148658f1230e3f57da
parent 19811 b41ea6d553587468900fb07eac619e2e968f7438
child 19813 949e0465b1c39f629dc4e2ecb1d9cf607432d0c3
push idunknown
push userunknown
push dateunknown
reviewersjcranmer
bugs1049249
Bug 1049249 - Remove app_libxul_dirs on a CLOSED TREE. r=jcranmer
bridge/bridge.mozbuild
im/app.mozbuild
mail/app.mozbuild
suite/app.mozbuild
--- a/bridge/bridge.mozbuild
+++ b/bridge/bridge.mozbuild
@@ -1,16 +1,14 @@
 # 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/.
 
-mailnews_dirs = []
-
 if CONFIG['MOZ_LDAP_XPCOM']:
-    mailnews_dirs += ['../ldap']
-    mailnews_dirs += ['../ldap/xpcom']
+    add_tier_dir('app', '../ldap')
+    add_tier_dir('app', '../ldap/xpcom')
 
 if CONFIG['MOZ_MORK']:
-    mailnews_dirs += ['../db']
+    add_tier_dir('app', '../db')
 
-mailnews_dirs += ['../mailnews']
+add_tier_dir('app', '../mailnews')
 
--- a/im/app.mozbuild
+++ b/im/app.mozbuild
@@ -1,14 +1,12 @@
 # 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/.
 
-app_libxul_dirs = []
-
 if not CONFIG['LIBXUL_SDK']:
     include('/toolkit/toolkit.mozbuild')
 
 add_tier_dir('app', CONFIG['MOZ_BRANDING_DIRECTORY'])
 
 add_tier_dir('app', '../chat')
 
 # Ensure extensions are built after chat/ so purplexpcom can build.
--- a/mail/app.mozbuild
+++ b/mail/app.mozbuild
@@ -1,27 +1,20 @@
 # 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/.
 
-app_libxul_dirs = []
-
 include('../bridge/bridge.mozbuild')
 
-if not CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
-    app_libxul_dirs = mailnews_dirs
-    app_libxul_dirs += ['../mail/components']
+add_tier_dir('app', '../mail/components')
 
 if not CONFIG['LIBXUL_SDK']:
     include('/toolkit/toolkit.mozbuild')
 
-if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
-    add_tier_dir('app', mailnews_dirs)
-
 if CONFIG['MOZ_EXTENSIONS']:
     add_tier_dir('app', 'extensions')
 
 add_tier_dir('app', CONFIG['MOZ_BRANDING_DIRECTORY'])
 
 if CONFIG['MOZ_COMPOSER']:
     add_tier_dir('app', '../editor/ui')
 
--- a/suite/app.mozbuild
+++ b/suite/app.mozbuild
@@ -1,26 +1,18 @@
 # 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/.
 
-app_libxul_dirs = []
-
 include('../bridge/bridge.mozbuild')
 
-if not CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
-    app_libxul_dirs = mailnews_dirs
-
 if not CONFIG['LIBXUL_SDK']:
     include('/toolkit/toolkit.mozbuild')
 
-if CONFIG['MOZ_INCOMPLETE_EXTERNAL_LINKAGE']:
-    add_tier_dir('app', mailnews_dirs)
-
 if CONFIG['MOZ_EXTENSIONS']:
     add_tier_dir('app', 'extensions')
 
 if CONFIG['MOZ_COMPOSER']:
     add_tier_dir('app', '../editor/ui')
 
 add_tier_dir('app', CONFIG['MOZ_BRANDING_DIRECTORY'])