Move bundled fonts to toolkit.

master
Fedor 2019-12-25 15:47:01 +03:00
parent 7ead11b16f
commit 4b6bb8d713
10 changed files with 5 additions and 23 deletions

View File

@ -1,9 +0,0 @@
Twemoji Mozilla
================
The upstream repository of Twemoji Mozilla can be found at
https://github.com/mozilla/twemoji-colr
Please refer commit history for the current version of the font.
This file purposely omit the version, so there is no need to update it here.

View File

@ -1,11 +0,0 @@
# -*- Mode: python; 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/.
if CONFIG['OS_ARCH'] in ('WINNT', 'Linux'):
DIST_SUBDIR = ''
FINAL_TARGET_FILES.fonts += [
'TwemojiMozilla.ttf'
]

View File

@ -11,7 +11,6 @@ SPHINX_TREES['browser'] = 'docs'
DIRS += [
'base',
'components',
'fonts',
'locales',
'modules',
'themes',

View File

@ -9,7 +9,6 @@ CONFIGURE_SUBST_FILES += ['installer/Makefile']
DIRS += [
'base',
'components',
'fonts',
'locales',
'modules',
'themes',

View File

@ -3687,6 +3687,8 @@ if test -n "$MOZ_BUNDLED_FONTS"; then
AC_DEFINE(MOZ_BUNDLED_FONTS)
fi
AC_SUBST(MOZ_BUNDLED_FONTS)
dnl ========================================================
dnl Verify MAR signatures
dnl ========================================================

View File

@ -5,5 +5,4 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
if CONFIG['OS_ARCH'] in ('WINNT', 'Linux'):
DIST_SUBDIR = ''
FINAL_TARGET_FILES.fonts += ['TwemojiMozilla.ttf']

View File

@ -19,6 +19,9 @@ DIRS += [
'themes',
]
if CONFIG['MOZ_BUNDLED_FONTS']:
DIRS += ['fonts']
if CONFIG['MOZ_JETPACK']:
DIRS += ['jetpack']