AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert of https://codereview.chromium.org/113203003/

Browse Source 
Reason for revert: Broken under XCode.

R=bungeman@google.com, epoger@google.com
TBR=bungeman@google.com, epoger@google.com
NOTREECHECKS=true
NOTRY=true

Author: vandebo@chromium.org

Review URL: https://codereview.chromium.org/132093003

git-svn-id: http://skia.googlecode.com/svn/trunk@12997 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
commit-bot@chromium.org 2014-01-09 17:52:54 +00:00
parent 2b0f7c321c
commit 32eea431de
6 changed files with 9 additions and 174 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gyp/common_variables.gypi
View File

@ -57,11 +57,6 @@
}, {
'os_posix%': 1,
}],
[ 'skia_os in ["linux", "win", "mac"]', {
'skia_poppler_enabled%': 1,
}, {
'skia_poppler_enabled%': 0,
}],
[ 'skia_os in ["linux", "freebsd", "openbsd", "solaris"]', {
'skia_arch_width%': 64,
}, {
@ -151,7 +146,6 @@
'skia_resource_cache_mb_limit%': '<(skia_resource_cache_mb_limit)',
'skia_resource_cache_count_limit%': '<(skia_resource_cache_count_limit)',
'skia_angle%': '<(skia_angle)',
'skia_poppler_enabled%': '<(skia_poppler_enabled)',
'skia_arch_width%': '<(skia_arch_width)',
'skia_arch_type%': '<(skia_arch_type)',
'skia_chrome_utils%': '<(skia_chrome_utils)',

107
gyp/fontconfig.gyp
View File

@ -13,31 +13,13 @@
'targets': [
{
'target_name': 'fontconfig',
'type': 'none',
'dependencies': [
'libfontconfig',
],
'direct_dependent_settings': {
'include_dirs': [
'../third_party/externals/fontconfig',
],
},
'conditions': [
['skia_os == "mac"', {
'dependencies': [
'fontconfig_setup',
],
}],
],
},
{
'target_name': 'libfontconfig',
'type': 'static_library',
'dependencies': [
'freetype.gyp:freetype_poppler',
],
'include_dirs' : [
'../third_party/externals/fontconfig',
'../third_party/fontconfig/config',
'../third_party/fontconfig/config/src',
],
@ -84,12 +66,12 @@
'conditions': [
['skia_os == "mac"', {
'include_dirs': [
'<(SHARED_INTERMEDIATE_DIR)/fontconfig_config',
'../third_party/fontconfig/config/mac',
'../third_party/fontconfig/config/mac/src',
],
'dependencies': [
'fontconfig_config_template',
'defines': [
'FC_CACHEDIR',
'FONTCONFIG_PATH',
],
'libraries': [
'$(SDKROOT)/usr/lib/libexpat.dylib',
@ -115,85 +97,4 @@
],
},
],
'conditions': [
['skia_os == "mac"', {
'variables': {
'cachedir': '<(PRODUCT_DIR)/fontconfig/cache',
'configdir': '<(PRODUCT_DIR)/fontconfig/etc',
},
'targets': [
{
'target_name': 'fontconfig_config_template',
'type': 'none',
'actions': [{
'action_name': 'fontconfig_config_template',
'message': 'Generating fontconfig header',
'inputs': [
'../third_party/fontconfig/process-template.py',
'../third_party/fontconfig/config/mac/config.h.template',
],
'outputs': [
'<(SHARED_INTERMEDIATE_DIR)/fontconfig_config/config.h',
],
'action': [
'python', '../third_party/fontconfig/process-template.py',
'-i', '../third_party/fontconfig/config/mac/config.h.template',
'-o', '<@(_outputs)',
'-p', '@FC_CACHEDIR@', '<(cachedir)',
'-p', '@FONTCONFIG_PATH@', '<(configdir)',
],
}],
}, {
'target_name': 'fontconfig_setup',
'type': 'none',
'dependencies': [
'fc-cache',
],
'actions': [{
'action_name': 'fontconfig_config_file',
'message': 'Generating font.conf',
'inputs': [
'../third_party/fontconfig/process-template.py',
'../third_party/externals/fontconfig/fonts.conf.in',
],
'outputs': [ '<(configdir)/fonts.conf', ],
'action': [
'python', '../third_party/fontconfig/process-template.py',
'-i', '../third_party/externals/fontconfig/fonts.conf.in',
'-o', '<(configdir)/fonts.conf',
'-p', '@FC_CACHEDIR@', '<(cachedir)',
'-k', '@FC_DEFAULT_FONTS@', '/System/Library/Fonts',
'-k', '@FC_FONTPATH@', '<dir>/Library/Fonts</dir>',
'-p', '@CONFIGDIR@', '<(configdir)/conf.d',
'-k', '@PACKAGE@', 'fontconfig',
'-k', '@VERSION@', '2.10.93',
],
}, {
'action_name': 'populate_fontconfig_cache',
'message':
'Generating fontconfig cache (this will take a few minutes).',
'inputs': [
'<(PRODUCT_DIR)/fc-cache',
'<(configdir)/fonts.conf',
],
'outputs': [ '<(cachedir)/CACHEDIR.TAG', ],
'action': [ '<(PRODUCT_DIR)/fc-cache', '-s', '-f', '-v', ],
}],
},
{
'target_name': 'fc-cache',
'type': 'executable',
'dependencies': [
'libfontconfig',
],
'libraries':[
'$(SDKROOT)/usr/lib/libexpat.dylib',
],
'sources': [
'../third_party/externals/fontconfig/fc-cache/fc-cache.c',
],
},
],
}],
],
}

2
gyp/gm.gyp
View File

@ -73,7 +73,7 @@
'pdfviewer_lib.gyp:pdfviewer_lib',
],
}],
['skia_poppler_enabled', {
['skia_os in ["linux", "mac", "win"]', {
'dependencies': [
'poppler.gyp:libpoppler-cpp-gpl',
],

11
third_party/fontconfig/README.chromium vendored
View File

@ -33,14 +33,9 @@ third_party/fontconfig/config:
fc-lang/fclang.h
src/fcobjshash.h
On Mac, these are the files generated by
./configure --with-add-fonts=/System/Library/Fonts,/Library/Fonts
config/mac/config.h.template then has a section added to the top:
+/* Manually added template defines */
+#define FC_CACHEDIR "@FC_CACHEDIR@"
+#define FONTCONFIG_PATH "@FONTCONFIG_PATH@"
On Linux and Mac, these are the files generated by ./configure, with no
additional flags.
On Windows, the configuration files were from
http://comments.gmane.org/gmane.comp.fonts.fontconfig/4438
(fontconfig development list).

6
third_party/fontconfig/config/mac/config.h.template → third_party/fontconfig/config/mac/config.h vendored
View File

@ -1,10 +1,6 @@
/* config.h. Generated from config.h.in by configure. */
/* config.h.in. Generated from configure.ac by autoheader. */
/* Manually added template defines */
#define FC_CACHEDIR "@FC_CACHEDIR@"
#define FONTCONFIG_PATH "@FONTCONFIG_PATH@"
/* Define if building universal (internal helper macro) */
/* #undef AC_APPLE_UNIVERSAL_BUILD */
@ -15,7 +11,7 @@
/* #undef ENABLE_LIBXML2 */
/* Additional font directories */
#define FC_ADD_FONTS "/System/Library/Fonts,/Library/Fonts"
#define FC_ADD_FONTS "yes"
/* Architecture prefix to use for cache file names */
/* #undef FC_ARCHITECTURE */

51
third_party/fontconfig/process-template.py vendored
View File

@ -1,51 +0,0 @@
#!/usr/bin/python
# Copyright 2014 Google Inc.
#
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
# A simple template processing script.
import argparse
import os
import sys
parser = argparse.ArgumentParser()
parser.add_argument('-i', '--input')
parser.add_argument('-o', '--output')
parser.add_argument(
'-k', '--keyword_substitution', action='append', nargs=2,
metavar=('KEY', 'VALUE'), help='Changes KEY to VALUE in the template.')
parser.add_argument(
'-p', '--path_substitution', action='append', nargs=2,
metavar=('KEY', 'PATH'),
help='Makes PATH absolute then changes KEY to PATH in the template.')
args = parser.parse_args()
input = sys.stdin
if args.input:
input = open(args.input, 'r')
output = sys.stdout
if args.output:
output = open(args.output, 'w')
path_subs = None
if args.path_substitution:
path_subs = [
[sub[0], os.path.abspath(sub[1])] for sub in args.path_substitution
]
for line in input:
if args.keyword_substitution:
for (key, value) in args.keyword_substitution:
line = line.replace(key, value)
if path_subs:
for (key, path) in path_subs:
line = line.replace(key, path)
output.write(line)
input.close()
output.close()