Bug 1612190 - Improve the DIRS logic in calendar moz.build files. r=darktrojan a=rjl
authorPaul Morris <paul@thunderbird.net>
Fri, 14 Feb 2020 12:24:17 +0200
changeset 38168 d21a540ff744421e3acb19f2cf27d48534a8c0a6
parent 38167 498037e1ef0f9f987c98f879fc430c1ad42c1734
child 38169 a376c45565b713903b4984559a2f414736c6c920
push id398
push userclokep@gmail.com
push dateMon, 09 Mar 2020 19:10:28 +0000
reviewersdarktrojan, rjl
bugs1612190
Bug 1612190 - Improve the DIRS logic in calendar moz.build files. r=darktrojan a=rjl
calendar/lightning/moz.build
calendar/moz.build
mail/app.mozbuild
--- a/calendar/lightning/moz.build
+++ b/calendar/lightning/moz.build
@@ -1,40 +1,28 @@
 # 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/.
 
 DIRS += [
-    '../libical',
-    '../base',
-    '../providers',
-    '../import-export',
-    '../itip',
     'components',
-    '../locales',
     'modules',
 ]
 
-TEST_DIRS += ['../test']
-
 JAR_MANIFESTS += ['jar.mn']
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
     DEFINES['THEME'] = 'windows'
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
     DEFINES['THEME'] = 'osx'
 else:
     DEFINES['THEME'] = 'linux'
 
 JS_PREFERENCE_PP_FILES += [
     'content/lightning.js',
 ]
 
-FINAL_TARGET_FILES.res += [
-    '../timezones/zones.json',
-]
-
 with Files('**'):
     BUG_COMPONENT = ('Calendar', 'Lightning Only')
 
 with Files('content/suite-*'):
     BUG_COMPONENT = ('Calendar', 'Lightning: SeaMonkey Integration')
--- a/calendar/moz.build
+++ b/calendar/moz.build
@@ -1,21 +1,29 @@
 # 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/.
 
-CONFIGURE_SUBST_FILES += ['installer/Makefile']
-
 DIRS += [
+    'base',
+    'import-export',
+    'itip',
+    'libical',
     'lightning',
+    'locales',
+    'providers',
 ]
 
 TEST_DIRS += ['test']
 
+FINAL_TARGET_FILES.res += [
+    'timezones/zones.json',
+]
+
 with Files('**'):
     BUG_COMPONENT = ('Calendar', 'General')
 
 with Files('**/moz.build'):
     BUG_COMPONENT = ('Calendar', 'Build Config')
     FINAL = True
 
 with Files('**/*.mk'):
--- a/mail/app.mozbuild
+++ b/mail/app.mozbuild
@@ -14,12 +14,12 @@ DIRS += ['/%s/mail/components' % CONFIG[
 
 include('/%s/toolkit/toolkit.mozbuild' % CONFIG['mozreltopsrcdir'])
 
 if CONFIG['MOZ_EXTENSIONS']:
     DIRS += ['/%s/extensions' % CONFIG['mozreltopsrcdir']]
 
 DIRS += [
     '/%s' % CONFIG['MOZ_BRANDING_DIRECTORY'],
-    '/%s/calendar/lightning' % CONFIG['commreltopsrcdir'],
+    '/%s/calendar' % CONFIG['commreltopsrcdir'],
     '/%s/chat' % CONFIG['commreltopsrcdir'],
     '/%s/mail' % CONFIG['commreltopsrcdir'],
 ]