Bug 1427505: Move `MOZ_SEPARATE_MANIFEST_FOR_THEME_OVERRIDES` to moz.configure; r=Fallen,frg
authorTom Prince <mozilla@hocat.ca>
Sun, 31 Dec 2017 15:37:40 -0700
changeset 29864 e60b3d52d364eb91499b7b90f11487fdc261d03c
parent 29863 abd3ecd7c46d908d3ed76470f3f9b22c5b87915d
child 29865 2b82730084427beb0d775a99b1dc8399a77799f4
push id2108
push userclokep@gmail.com
push dateMon, 22 Jan 2018 17:53:55 +0000
treeherdercomm-beta@c44930d8ad9b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersFallen, frg
bugs1427505
Bug 1427505: Move `MOZ_SEPARATE_MANIFEST_FOR_THEME_OVERRIDES` to moz.configure; r=Fallen,frg MozReview-Commit-ID: HAcP94Xys4a
mail/configure.in
mail/moz.configure
suite/configure.in
suite/confvars.sh
suite/moz.configure
--- a/mail/configure.in
+++ b/mail/configure.in
@@ -3,17 +3,16 @@ dnl vi: set tabstop=2 shiftwidth=2 expan
 dnl This Source Code Form is subject to the terms of the Mozilla Public
 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(THUNDERBIRD_VERSION)
-AC_DEFINE(MOZ_SEPARATE_MANIFEST_FOR_THEME_OVERRIDES)
 AC_SUBST(MOZ_BUNDLED_FONTS)
 
 dnl More things we need to carry from confvars.sh
 AC_SUBST(moztopsrcdir)
 AC_SUBST(commtopsrcdir)
 AC_SUBST(mozreltopsrcdir)
 AC_SUBST(commreltopsrcdir)
 AC_SUBST(commtopobjdir)
--- a/mail/moz.configure
+++ b/mail/moz.configure
@@ -1,14 +1,16 @@
 # -*- 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/.
 
+set_define('MOZ_SEPARATE_MANIFEST_FOR_THEME_OVERRIDES', True)
+
 imply_option('MOZ_PLACES', True)
 imply_option('MOZ_ALLOW_LEGACY_EXTENSIONS', True)
 
 
 @depends(application)
 def is_comm_topdir(app):
     return not app[0].startswith('comm/')
 
--- a/suite/configure.in
+++ b/suite/configure.in
@@ -3,17 +3,16 @@ dnl vi: set tabstop=2 shiftwidth=2 expan
 dnl This Source Code Form is subject to the terms of the Mozilla Public
 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_SUITE)
 AC_SUBST(MOZ_SUITE)
 AC_SUBST(SEAMONKEY_VERSION)
-AC_DEFINE(MOZ_SEPARATE_MANIFEST_FOR_THEME_OVERRIDES)
 AC_SUBST(MOZ_BUNDLED_FONTS)
 AC_SUBST(MOZ_IRC)
 AC_SUBST(MOZ_DOMINSPECTOR)
 AC_SUBST(MOZ_DEBUGQA)
 
 dnl More things we need to carry from confvars.sh
 AC_SUBST(moztopsrcdir)
 AC_SUBST(commtopsrcdir)
--- a/suite/confvars.sh
+++ b/suite/confvars.sh
@@ -22,17 +22,16 @@ MAR_CHANNEL_ID=seamonkey-comm-central
 MOZ_SERVICES_FXACCOUNTS=1
 
 MOZ_APP_VERSION_TXT=${_topsrcdir}/$MOZ_BUILD_APP/config/version.txt
 MOZ_APP_VERSION=`cat $MOZ_APP_VERSION_TXT`
 SEAMONKEY_VERSION=$MOZ_APP_VERSION
 
 MOZ_APP_ID={92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}
 MOZ_PROFILE_MIGRATOR=1
-MOZ_SEPARATE_MANIFEST_FOR_THEME_OVERRIDES=1
 
 if test "$NIGHTLY_BUILD"; then
   MOZ_RUST_URLPARSE=1
 fi
 
 if test "$OS_ARCH" = "WINNT" -o \
         "$OS_ARCH" = "Linux"; then
   MOZ_BUNDLED_FONTS=1
--- a/suite/moz.configure
+++ b/suite/moz.configure
@@ -1,14 +1,16 @@
 # -*- 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/.
 
+set_define('MOZ_SEPARATE_MANIFEST_FOR_THEME_OVERRIDES', True)
+
 imply_option('MOZ_PLACES', True)
 imply_option('MOZ_SERVICES_SYNC', True)
 imply_option('MOZ_ALLOW_LEGACY_EXTENSIONS', True)
 
 imply_option('--enable-calendar', True)
 
 
 @depends(application)