Bug 1116223 Move skin overrides to the chrome.manifest in the default theme XPI r=mkmelin
authorPhilip Chee <philip.chee@gmail.com>
Sun, 22 May 2016 22:02:08 +0800
changeset 25058 eac6743dc58b38bb53d6a58ec6d29d26d7a978bd
parent 25057 5408cfbe2a3065df3690a9f63571ff1585dfd15a
child 25059 f10c492613ccfe53350c2e8753483ba5723eeb31
push id1688
push userclokep@gmail.com
push dateMon, 01 Aug 2016 16:45:40 +0000
treeherdercomm-beta@9abd7cedb2af [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmkmelin
bugs1116223
Bug 1116223 Move skin overrides to the chrome.manifest in the default theme XPI r=mkmelin
mail/configure.in
mail/confvars.sh
mail/themes/chrome.manifest
mail/themes/linux/jar.mn
mail/themes/moz.build
mail/themes/osx/jar.mn
mail/themes/windows/jar.mn
--- a/mail/configure.in
+++ b/mail/configure.in
@@ -4,16 +4,17 @@ dnl This Source Code Form is subject to 
 dnl License, v. 2.0. If a copy of the MPL was not distributed with this
 dnl file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 dnl Things we need to carry from confvars.sh
 AC_DEFINE(MOZ_THUNDERBIRD)
 AC_SUBST(MOZ_THUNDERBIRD)
 AC_SUBST(MOZ_COMPOSER)
 AC_SUBST(THUNDERBIRD_VERSION)
+AC_DEFINE(MOZ_SEPARATE_MANIFEST_FOR_THEME_OVERRIDES)
 
 dnl Optional parts of the build.
 AC_SUBST(MOZ_MORK)
 if test "$MOZ_MORK"; then
   AC_DEFINE(MOZ_MORK)
 fi
 if test "$OS_ARCH" != "WINNT"; then
   MOZ_MOVEMAIL=1
--- a/mail/confvars.sh
+++ b/mail/confvars.sh
@@ -38,11 +38,12 @@ MOZ_APP_ID={3550f703-e582-4d05-9a08-453d
 ACCEPTED_MAR_CHANNEL_IDS=thunderbird-comm-central
 # The MAR_CHANNEL_ID must not contain the following 3 characters: ",\t "
 MAR_CHANNEL_ID=thunderbird-comm-central
 # Enable generational GC on desktop.
 JSGC_GENERATIONAL=1
 MOZ_PROFILE_MIGRATOR=1
 MOZ_JSDOWNLOADS=1
 MOZ_BINARY_EXTENSIONS=1
+MOZ_SEPARATE_MANIFEST_FOR_THEME_OVERRIDES=1
 
 # Enable building ./signmar and running libmar signature tests
 MOZ_ENABLE_SIGNMAR=1
deleted file mode 100644
--- a/mail/themes/chrome.manifest
+++ /dev/null
@@ -1,1 +0,0 @@
-
--- a/mail/themes/linux/jar.mn
+++ b/mail/themes/linux/jar.mn
@@ -263,10 +263,11 @@ classic.jar:
   skin/classic/messenger/icons/box-logo.png                   (mail/icons/box-logo.png)
   skin/classic/messenger/sharedPlatform.css                   (mail/linuxShared.css)
   skin/classic/messenger/shared/mailWindow1.css               (../shared/mail/mailWindow1.css)
   skin/classic/messenger/shared/messenger.css                 (../shared/mail/messenger.css)
   skin/classic/messenger/shared/messageHeader.css             (../shared/mail/messageHeader.css)
   skin/classic/messenger/shared/tabmail.css                   (../shared/mail/tabmail.css)
   skin/classic/messenger/shared/accountProvisioner.css         (../shared/mail/accountProvisioner.css)
   skin/classic/messenger/shared/addressbook.css               (../shared/mail/addressbook.css)
+[extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}] chrome.jar:
 % override chrome://global/skin/icons/close.png               chrome://global/skin/icons/close.svg
 % override chrome://global/skin/netError.css chrome://messenger/skin/aboutNetError.css
--- a/mail/themes/moz.build
+++ b/mail/themes/moz.build
@@ -11,16 +11,15 @@ else:
     DIRS += ['windows']
 
 classic_extension_dir = '{972ce4c6-7e08-4474-a285-3208198ce6fd}'
 
 DEFINES['THUNDERBIRD_VERSION'] = CONFIG['THUNDERBIRD_VERSION']
 DIST_SUBDIR = 'extensions/' + classic_extension_dir
 
 FINAL_TARGET_FILES += [
-    'chrome.manifest',
     'icon.png',
     'icon64.png',
 ]
 
 FINAL_TARGET_PP_FILES += [
     'install.rdf',
 ]
--- a/mail/themes/osx/jar.mn
+++ b/mail/themes/osx/jar.mn
@@ -350,9 +350,10 @@ classic.jar:
   skin/classic/messenger/icons/box-logo.png                      (mail/icons/box-logo.png)
   skin/classic/messenger/sharedPlatform.css                      (mail/osxShared.css)
   skin/classic/messenger/shared/mailWindow1.css                  (../shared/mail/mailWindow1.css)
   skin/classic/messenger/shared/messenger.css                    (../shared/mail/messenger.css)
   skin/classic/messenger/shared/messageHeader.css                (../shared/mail/messageHeader.css)
   skin/classic/messenger/shared/tabmail.css                      (../shared/mail/tabmail.css)
   skin/classic/messenger/shared/addressbook.css                  (../shared/mail/addressbook.css)
   skin/classic/messenger/shared/accountProvisioner.css           (../shared/mail/accountProvisioner.css)
+[extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}] chrome.jar:
 % override chrome://global/skin/netError.css chrome://messenger/skin/aboutNetError.css
--- a/mail/themes/windows/jar.mn
+++ b/mail/themes/windows/jar.mn
@@ -339,9 +339,10 @@ classic.jar:
   skin/classic/messenger/icons/box-logo.png                   (mail/icons/box-logo.png)
   skin/classic/messenger/sharedPlatform.css                   (mail/windowsShared.css)
   skin/classic/messenger/shared/mailWindow1.css               (../shared/mail/mailWindow1.css)
   skin/classic/messenger/shared/messenger.css                 (../shared/mail/messenger.css)
   skin/classic/messenger/shared/messageHeader.css             (../shared/mail/messageHeader.css)
   skin/classic/messenger/shared/tabmail.css                   (../shared/mail/tabmail.css)
   skin/classic/messenger/shared/addressbook.css               (../shared/mail/addressbook.css)
   skin/classic/messenger/shared/accountProvisioner.css        (../shared/mail/accountProvisioner.css)
+[extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}] chrome.jar:
 % override chrome://global/skin/netError.css chrome://messenger/skin/aboutNetError.css