зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1365419 - Use the new os=LikeUnix flag instead of relying on overrides. r=bsmedberg
Since it wasn't possible to have specific manifest entries for !Darwin !WINNT !Android, a few places in the tree use the following pattern: entry-for-unix entry-for-osx os=Darwin entry-for-windows os=WINNT This works because subsequent manifest entries with more specific flags override previous manifest entries. Incidentally, this led to problems such as the one mentioned in changeset c94e87a18096. Now that there is a flag for !Darwin !WINNT !Android, we can use it instead. --HG-- extra : rebase_source : 6f20a9b31d48c8ee4126662730e95789de740971
This commit is contained in:
Родитель
6a0f9240a2
Коммит
69a5734db2
|
@ -3,7 +3,7 @@
|
|||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
[features/flyweb@mozilla.org] chrome.jar:
|
||||
% skin flyweb classic/1.0 %skin/linux/
|
||||
% skin flyweb classic/1.0 %skin/linux/ os=LikeUnix
|
||||
% skin flyweb classic/1.0 %skin/osx/ os=Darwin
|
||||
% skin flyweb classic/1.0 %skin/windows/ os=WINNT
|
||||
% skin flyweb-shared classic/1.0 %skin/shared/
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
% content formautofill %content/
|
||||
content/ (content/*)
|
||||
|
||||
% skin formautofill classic/1.0 %skin/linux/
|
||||
% skin formautofill classic/1.0 %skin/linux/ os=LikeUnix
|
||||
% skin formautofill classic/1.0 %skin/osx/ os=Darwin
|
||||
% skin formautofill classic/1.0 %skin/windows/ os=WINNT
|
||||
% skin formautofill-shared classic/1.0 %skin/shared/
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
[features/firefox@getpocket.com] chrome.jar:
|
||||
% content pocket %content/ contentaccessible=yes
|
||||
% skin pocket classic/1.0 %skin/linux/
|
||||
% skin pocket classic/1.0 %skin/linux/ os=LikeUnix
|
||||
% skin pocket classic/1.0 %skin/osx/ os=Darwin
|
||||
% skin pocket classic/1.0 %skin/windows/ os=WINNT
|
||||
% skin pocket-shared classic/1.0 %skin/shared/
|
||||
|
|
|
@ -92,7 +92,7 @@
|
|||
locale/@AB_CD@/global/wizard.properties (%chrome/global/wizard.properties)
|
||||
locale/@AB_CD@/global/crashes.dtd (%crashreporter/crashes.dtd)
|
||||
locale/@AB_CD@/global/crashes.properties (%crashreporter/crashes.properties)
|
||||
% locale global-platform @AB_CD@ %locale/@AB_CD@/global-platform/gtk/
|
||||
% locale global-platform @AB_CD@ %locale/@AB_CD@/global-platform/gtk/ os=LikeUnix
|
||||
% locale global-platform @AB_CD@ %locale/@AB_CD@/global-platform/mac/ os=Darwin
|
||||
% locale global-platform @AB_CD@ %locale/@AB_CD@/global-platform/win/ os=WINNT
|
||||
locale/@AB_CD@/global-platform/mac/platformKeys.properties (%chrome/global-platform/mac/platformKeys.properties)
|
||||
|
|
Загрузка…
Ссылка в новой задаче