Changeset 80459 in webkit


Ignore:
Timestamp:
Mar 7, 2011 1:25:37 AM (13 years ago)
Author:
abarth@webkit.org
Message:

2011-03-06 Adam Barth <​abarth@webkit.org>

Reviewed by Eric Seidel.

Filter sources in WebCore GYP build for Mac
​https://bugs.webkit.org/show_bug.cgi?id=55857

This patch removes a large number of files that do not build as part of
the Mac build. I'm not fully sold on this method of
including/excluding files, but it's the "gyp way" so we should probably
try it first.

This patch also sets xcode_list_excluded_files to 0, which removes the
excluded files from the Xcode project file, which is necessary in order
to prevent the header map feature from including the wrong header file.

  • gyp/WebCore.gyp:
Location:
trunk/Source
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r80457 r80459  
     12011-03-06  Adam Barth  <abarth@webkit.org>
     2
     3        Reviewed by Eric Seidel.
     4
     5        Filter sources in WebCore GYP build for Mac
     6        https://bugs.webkit.org/show_bug.cgi?id=55857
     7
     8        This patch removes a large number of files that do not build as part of
     9        the Mac build.  I'm not fully sold on this method of
     10        including/excluding files, but it's the "gyp way" so we should probably
     11        try it first.
     12
     13        This patch also sets xcode_list_excluded_files to 0, which removes the
     14        excluded files from the Xcode project file, which is necessary in order
     15        to prevent the header map feature from including the wrong header file.
     16
     17        * gyp/WebCore.gyp:
     18
    1192011-03-07  Ryuan Choi  <ryuan.choi@samsung.com>
    220

  • trunk/Source/WebCore/WebCore.gypi

    r80452 r80459  
    11{
    22    'variables': {
    3         'webcore_include_dirs': [
    4           '.',
    5           'accessibility',
    6           'accessibility/chromium',
    7           'bindings',
    8           'bindings/generic',
    9           'bindings/v8',
    10           'bindings/v8/custom',
    11           'bindings/v8/specialization',
    12           'bridge',
    13           'bridge/jni',
    14           'bridge/jni/v8',
    15           'css',
    16           'dom',
    17           'dom/default',
    18           'editing',
    19           'fileapi',
    20           'history',
    21           'html',
    22           'html/canvas',
    23           'html/parser',
    24           'html/shadow',
    25           'icu',
    26           'inspector',
    27           'loader',
    28           'loader/appcache',
    29           'loader/archive',
    30           'loader/cache',
    31           'loader/icon',
    32           'mathml',
    33           'notifications',
    34           'page',
    35           'page/animation',
    36           'page/chromium',
    37           'platform',
    38           'platform/animation',
    39           'platform/audio',
    40           'platform/audio/chromium',
    41           'platform/chromium',
    42           'platform/graphics',
    43           'platform/graphics/chromium',
    44           'platform/graphics/filters',
    45           'platform/graphics/gpu',
    46           'platform/graphics/opentype',
    47           'platform/graphics/skia',
    48           'platform/graphics/transforms',
    49           'platform/image-decoders',
    50           'platform/image-decoders/bmp',
    51           'platform/image-decoders/gif',
    52           'platform/image-decoders/ico',
    53           'platform/image-decoders/jpeg',
    54           'platform/image-decoders/png',
    55           'platform/image-decoders/skia',
    56           'platform/image-decoders/webp',
    57           'platform/image-decoders/xbm',
    58           'platform/image-encoders/skia',
    59           'platform/mock',
    60           'platform/network',
    61           'platform/network/chromium',
    62           'platform/sql',
    63           'platform/text',
    64           'platform/text/transcoder',
    65           'plugins',
    66           'plugins/chromium',
    67           'rendering',
    68           'rendering/style',
    69           'rendering/svg',
    70           'storage',
    71           'storage/chromium',
    72           'svg',
    73           'svg/animation',
    74           'svg/graphics',
    75           'svg/graphics/filters',
    76           'svg/properties',
    77           'thirdparty/glu',
    78           'webaudio',
    79           'websockets',
    80           'workers',
    81           'xml',
    82         ],
    833        # These headers are part of WebCore's public API in the Apple Mac build.
    844        'webcore_publicheader_files': [

  • trunk/Source/WebCore/gyp/WebCore.gyp

    r80452 r80459  
    1717      ],
    1818      'include_dirs': [
    19         '<@(webcore_include_dirs)',
     19        '<(DEPTH)/WebCore/icu',
    2020        '<(DEPTH)/WebCore/ForwardingHeaders',
     21        '<(PRODUCT_DIR)/usr/local/include',
     22        '/usr/include/libxml2',
    2123      ],
    2224      'sources': [
    … …  
    4143        'libxml2.dylib',
    4244        'libz.dylib',
     45      ],
     46      'sources/': [
     47        ['exclude', 'accessibility/[^/]+/'],
     48        ['include', 'accessibility/mac/'],
     49        ['exclude', 'bindings/[^/]+/'],
     50        ['include', 'bindings/generic/'],
     51        ['include', 'bindings/js/'],
     52        ['include', 'bindings/objc/'],
     53        ['exclude', 'bridge/jni/v8/'],
     54        ['exclude', 'bridge/qt/'],
     55        # FIXME: These files shouldn't be in this directory.
     56        ['exclude', 'bridge/testbindings\.cpp'],
     57        ['exclude', 'bridge/testbindings\.mm'],
     58        ['exclude', 'bridge/testqtbindings\.cpp'],
     59        ['exclude', 'editing/[^/]+/'],
     60        ['include', 'editing/mac/'],
     61        ['exclude', 'history/[^/]+/'],
     62        ['include', 'history/cf/'],
     63        ['include', 'history/mac/'],
     64        ['exclude', 'loader/[^/]+/'],
     65        ['include', 'loader/appcache/'],
     66        ['include', 'loader/archive/'],
     67        ['include', 'loader/cache/'],
     68        ['include', 'loader/cf/'],
     69        ['include', 'loader/icon/'],
     70        ['include', 'loader/mac/'],
     71        ['exclude', 'page/[^/]+/'],
     72        ['include', 'page/animation/'],
     73        ['include', 'page/mac/'],
     74        ['exclude', 'platform/[^/]+/'],
     75        ['include', 'platform/animation/'],
     76        ['include', 'platform/audio/'],
     77        ['exclude', 'platform/audio/[^/]+/'],
     78        ['include', 'platform/audio/mac/'],
     79        ['include', 'platform/audio/fftw/'], # FIXME: Is this correct? mkl is the other choice.
     80        ['include', 'platform/audio/resources/'],
     81        ['include', 'platform/cf/'],
     82        ['include', 'platform/cocoa/'],
     83        ['include', 'platform/graphics/'],
     84        ['exclude', 'platform/graphics/[^/]+/'],
     85        ['include', 'platform/graphics/ca/'],
     86        ['include', 'platform/graphics/cg/'],
     87        # FIXME: This file appears to be misplaced.
     88        ['exclude', 'platform/graphics/cg/FontPlatformData\.h'],
     89        ['include', 'platform/graphics/cocoa/'],
     90        ['include', 'platform/graphics/filters/'],
     91        ['include', 'platform/graphics/gpu/'],
     92        ['include', 'platform/graphics/mac/'],
     93        ['include', 'platform/graphics/opengl/'],
     94        ['include', 'platform/graphics/transforms/'],
     95        ['include', 'platform/mac/'],
     96        ['include', 'platform/mock/'],
     97        ['include', 'platform/network/'],
     98        ['exclude', 'platform/network/[^/]+/'],
     99        ['include', 'platform/network/cf'],
     100        ['include', 'platform/network/mac'],
     101        ['include', 'platform/posix/'],
     102        ['include', 'platform/sql/'],
     103        ['exclude', 'platform/sql/chromium'],
     104        ['include', 'platform/text/'],
     105        ['exclude', 'platform/text/[^/]+/'],
     106        ['include', 'platform/text/cf'],
     107        ['include', 'platform/text/mac'],
     108        ['include', 'platform/text/transcoder'],
     109        ['exclude', 'DerivedSources\.cpp$'],
     110        # FIXME: Consider using one or more AllInOne files.
     111        ['exclude', '(Chromium|Win|Qt)\.cpp$'],
     112        ['exclude', 'AllInOne\.cpp$'],
     113        ['exclude', 'WebCore\.gyp/mac/Empty\.cpp$']
    43114      ],
    44115      'mac_framework_headers': [

  • trunk/Source/gyp/configure

    r80393 r80459  
    4444        'gyp',  # FIXME: gyp shouldn't need to be in the PATH.
    4545        os.path.join(project, 'gyp', project + '.gyp'),
     46        '-G',
     47        'xcode_list_excluded_files=0',
    4648        '--depth=.',
    4749    ])
Note: See TracChangeset for help on using the changeset viewer.