diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-01-09 17:52:54 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-01-09 17:52:54 +0000 |
| commit | 32eea431dec439b84fc3c12967e5dcc968519da4 (patch) | |
| tree | f6aece2244536e1d6ad1d60ca1798bfa06441ae5 /gyp | |
| parent | 2b0f7c321cd286913d63a4815e805ef55fa28e2d (diff) | |
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
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/common_variables.gypi | 6 | ||||
| -rw-r--r-- | gyp/fontconfig.gyp | 107 | ||||
| -rw-r--r-- | gyp/gm.gyp | 2 |
3 files changed, 5 insertions, 110 deletions
diff --git a/gyp/common_variables.gypi b/gyp/common_variables.gypi index 1c6111ac4a..74e596cf19 100644 --- a/gyp/common_variables.gypi +++ b/gyp/common_variables.gypi @@ -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)', diff --git a/gyp/fontconfig.gyp b/gyp/fontconfig.gyp index 0a4a09899a..35f699faae 100644 --- a/gyp/fontconfig.gyp +++ b/gyp/fontconfig.gyp @@ -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', - ], - }, - ], - }], - ], } diff --git a/gyp/gm.gyp b/gyp/gm.gyp index 657bc560ea..a543aca4db 100644 --- a/gyp/gm.gyp +++ b/gyp/gm.gyp @@ -73,7 +73,7 @@ 'pdfviewer_lib.gyp:pdfviewer_lib', ], }], - ['skia_poppler_enabled', { + ['skia_os in ["linux", "mac", "win"]', { 'dependencies': [ 'poppler.gyp:libpoppler-cpp-gpl', ], |