Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(814)

Unified Diff: gyp/fontconfig.gyp

Issue 132333002: Fix Mac fontconfig build (try 2) (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: comments Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « gyp/common_variables.gypi ('k') | gyp/gm.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gyp/fontconfig.gyp
diff --git a/gyp/fontconfig.gyp b/gyp/fontconfig.gyp
index 35f699faaea386022c58dfa751c1fba32a3531e0..0a4a09899ad18fc11b785a0c45af429ebb8fedab 100644
--- a/gyp/fontconfig.gyp
+++ b/gyp/fontconfig.gyp
@@ -13,13 +13,31 @@
'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',
],
@@ -66,12 +84,12 @@
'conditions': [
['skia_os == "mac"', {
'include_dirs': [
+ '<(SHARED_INTERMEDIATE_DIR)/fontconfig_config',
'../third_party/fontconfig/config/mac',
'../third_party/fontconfig/config/mac/src',
],
- 'defines': [
- 'FC_CACHEDIR',
- 'FONTCONFIG_PATH',
+ 'dependencies': [
+ 'fontconfig_config_template',
],
'libraries': [
'$(SDKROOT)/usr/lib/libexpat.dylib',
@@ -97,4 +115,85 @@
],
},
],
+ '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',
+ ],
+ },
+ ],
+ }],
+ ],
}
« no previous file with comments | « gyp/common_variables.gypi ('k') | gyp/gm.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698