Fix Mac fontconfig build

gyp/fontconfig.gyp

Index: gyp/fontconfig.gyp
diff --git a/gyp/fontconfig.gyp b/gyp/fontconfig.gyp
index 35f699faaea386022c58dfa751c1fba32a3531e0..8363cc7904a4120015dcf83727c61a4c6260e6f3 100644
--- a/gyp/fontconfig.gyp
+++ b/gyp/fontconfig.gyp
@@ -13,13 +13,31 @@
   'targets': [
     {
       'target_name': 'fontconfig',
+      'type': 'none',
+      'dependencies': [

[epoger, 2014/01/08 19:40:22]

Why the additional level of indirection here?

Is it just to add a dependency on fontconfig_setup for Mac?  If so, couldn't you
just add that within the old fontconfig target's dependencies?

[vandebo (ex-Chrome), 2014/01/08 21:24:15]

You mean make the thing that depends on fontconfig also depend on 
fontconfig_setup on Mac?  I think this style keeps it more contained.

[epoger, 2014/01/08 21:38:12]

No, I meant making fontconfig depend on fontconfig_setup.  But perhaps there is
some reason that is not OK to do...

[vandebo (ex-Chrome), 2014/01/08 22:08:18]

I need fontconfig_setup to run after fontconfig is built, so I don't think I can
do that.

[epoger, 2014/01/09 15:22:31]

Ah, now I understand.  Might be worth adding a comment in the gyp file,
indicating that reasoning.

+        'libfontconfig',
+      ],
+      'direct_dependent_settings': {
+        'include_dirs': [
+          '../third_party/externals/fontconfig',
+        ],
+      },
+      'conditions': [
+        ['skia_os == "mac"', {
+          'dependencies': [
+            'fontconfig_setup',
+          ],
+        } ],

[bungeman-skia, 2014/01/07 21:13:29]

nit: there normally isn't a space between the curly and square when used like
this.

[vandebo (ex-Chrome), 2014/01/08 21:24:15]

Done.

+      ],
+    },
+    {
+      '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',
+             ],

[bungeman-skia, 2014/01/07 21:13:29]

nit: outdent 1 space

[vandebo (ex-Chrome), 2014/01/08 21:24:15]

Done.

+            '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)',
+              '-s', 'FC_DEFAULT_FONTS', '/System/Library/Fonts',
+              '-s', 'FC_FONTPATH', '<dir>/Library/Fonts</dir>',
+              '-p', 'CONFIGDIR', '<(configdir)/conf.d',
+              '-s', 'PACKAGE', 'fontconfig',
+              '-s', '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',
+          ],
+        },
+      ],
+    } ],

[bungeman-skia, 2014/01/07 21:13:29]

nit: extra space

+  ],
 }