Bug 1620962 - Part 2: Port Bug 1608610 "Remove MOZ_CALENDAR build config flag and related code". r=frg
authorBill Gianopoulos <wgianopoulos@gmail.com>
Thu, 13 Feb 2020 06:18:11 -0500
changeset 37529 f11d674aeadd590efe892ecfd27a8200d90c81bc
parent 37528 555da51727e5aed9006b55d872d881ffb6a05af7
child 37530 a385dbb494e4300ba2fcfdfe842a49c5a4862807
push id2566
push userclokep@gmail.com
push dateMon, 09 Mar 2020 19:20:31 +0000
treeherdercomm-beta@a352facfa0a4 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfrg
bugs1620962, 1608610
Bug 1620962 - Part 2: Port Bug 1608610 "Remove MOZ_CALENDAR build config flag and related code". r=frg
suite/app.mozbuild
suite/installer/Makefile.in
suite/installer/package-manifest.in
--- a/suite/app.mozbuild
+++ b/suite/app.mozbuild
@@ -11,19 +11,14 @@ if CONFIG['MOZ_EXTENSIONS']:
     DIRS += ['/extensions']
 
 if CONFIG['MOZ_IRC']:
     DIRS += ['/extensions/irc']
 
 if CONFIG['MOZ_DOMINSPECTOR']:
     DIRS += ['/extensions/inspector']
 
-DIRS += ['/%s' % CONFIG['MOZ_BRANDING_DIRECTORY']]
-
-if CONFIG['MOZ_CALENDAR']:
-    DIRS += [
-        '/comm/calendar/lightning',
-    ]
-
 DIRS += [
+    '/%s' % CONFIG['MOZ_BRANDING_DIRECTORY'],
+    '/comm/calendar',
     '/comm/editor/ui',
     '/comm/suite',
 ]
--- a/suite/installer/Makefile.in
+++ b/suite/installer/Makefile.in
@@ -47,20 +47,16 @@ ifdef MOZ_D3DCOMPILER_VISTA_DLL
 DEFINES += -DMOZ_D3DCOMPILER_VISTA_DLL=$(MOZ_D3DCOMPILER_VISTA_DLL)
 endif
 endif
 
 ifdef NIGHTLY_BUILD
 DEFINES += -DNIGHTLY_BUILD=1
 endif
 
-ifdef MOZ_CALENDAR
-DEFINES += -DMOZ_CALENDAR=1
-endif
-
 ifdef MOZ_DEBUG
 DEFINES += -DMOZ_DEBUG=1
 endif
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),gtk)
 DEFINES += -DMOZ_GTK=1
 endif
 
--- a/suite/installer/package-manifest.in
+++ b/suite/installer/package-manifest.in
@@ -519,17 +519,16 @@ man/*
 @RESPATH@/distribution/extensions/inspector@mozilla.org.xpi
 #endif
 
 [debugqa]
 #ifdef MOZ_PACKAGE_DEBUGQA
 @RESPATH@/distribution/extensions/debugQA@mozilla.org.xpi
 #endif
 
-#ifdef MOZ_CALENDAR
 [calendar]
 @RESPATH@/chrome/calendar@JAREXT@
 @RESPATH@/chrome/calendar.manifest
 @RESPATH@/chrome/lightning@JAREXT@
 @RESPATH@/chrome/lightning.manifest
 
 @RESPATH@/res/zones.json
 @RESPATH@/@PREF_DIR@/lightning.js
@@ -600,9 +599,8 @@ man/*
 @RESPATH@/components/calRecurrenceRule.js
 @RESPATH@/components/calRelation.js
 @RESPATH@/components/calStartupService.js
 @RESPATH@/components/calTimezone.js
 @RESPATH@/components/calTodo.js
 @RESPATH@/components/calTransactionManager.js
 @RESPATH@/components/calWeekInfoService.js
 @RESPATH@/components/calWeekPrinter.js
-#endif