Changeset 80100 in webkit


Ignore:
Timestamp:
Mar 2, 2011 12:47:33 AM (13 years ago)
Author:
abarth@webkit.org
Message:

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

Reviewed by Dimitri Glazkov.

Teach JavaScriptCore GYP build how to build minidom
https://bugs.webkit.org/show_bug.cgi?id=55536

Location:
trunk/Source/JavaScriptCore
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/JavaScriptCore/ChangeLog

    r80094 r80100  
     12011-03-02  Adam Barth  <abarth@webkit.org>
     2
     3        Reviewed by Dimitri Glazkov.
     4
     5        Teach JavaScriptCore GYP build how to build minidom
     6        https://bugs.webkit.org/show_bug.cgi?id=55536
     7
     8        * JavaScriptCore.gypi:
     9        * gyp/JavaScriptCore.gyp:
     10
    1112011-03-01  Adam Barth  <abarth@webkit.org>
    212
  • trunk/Source/JavaScriptCore/JavaScriptCore.gypi

    r80094 r80100  
    250250            'API/JSWeakObjectMapRefPrivate.cpp',
    251251            'API/OpaqueJSString.cpp',
    252             'API/tests/JSNode.h',
    253             'API/tests/JSNodeList.h',
    254             'API/tests/Node.h',
    255             'API/tests/NodeList.h',
    256252            'AllInOneFile.cpp',
    257253            'ForwardingHeaders/JavaScriptCore/APICast.h',
     
    661657            'yarr/YarrSyntaxChecker.cpp',
    662658            'yarr/YarrSyntaxChecker.h',
    663         ]
     659        ],
     660        'minidom_files': [
     661            'API/tests/JSNode.c',
     662            'API/tests/JSNode.h',
     663            'API/tests/JSNodeList.c',
     664            'API/tests/JSNodeList.h',
     665            'API/tests/Node.c',
     666            'API/tests/Node.h',
     667            'API/tests/NodeList.c',
     668            'API/tests/NodeList.h',
     669            'API/tests/minidom.c',
     670        ],
    664671    }
    665672}
  • trunk/Source/JavaScriptCore/gyp/JavaScriptCore.gyp

    r80094 r80100  
    44  ],
    55  'xcode_config_file': '<(DEPTH)/JavaScriptCore/Configurations/DebugRelease.xcconfig',
     6  'variables': {
     7    # FIXME: We should use a header map instead of listing these explicitly.
     8    'javascriptcore_include_dirs': [
     9      '<(DEPTH)', # Some paths in API include JavaScriptCore/
     10      '<(DEPTH)/JavaScriptCore',
     11      '<(DEPTH)/JavaScriptCore/ForwardingHeaders',
     12      '<(DEPTH)/JavaScriptCore/API',
     13      '<(DEPTH)/JavaScriptCore/assembler',
     14      '<(DEPTH)/JavaScriptCore/collector/handles',
     15      '<(DEPTH)/JavaScriptCore/bytecode',
     16      '<(DEPTH)/JavaScriptCore/bytecompiler',
     17      '<(DEPTH)/JavaScriptCore/debugger',
     18      '<(DEPTH)/JavaScriptCore/icu',
     19      '<(DEPTH)/JavaScriptCore/interpreter',
     20      '<(DEPTH)/JavaScriptCore/jit',
     21      '<(DEPTH)/JavaScriptCore/parser',
     22      '<(DEPTH)/JavaScriptCore/profiler',
     23      '<(DEPTH)/JavaScriptCore/runtime',
     24      '<(DEPTH)/JavaScriptCore/wtf',
     25      '<(DEPTH)/JavaScriptCore/wtf/unicode',
     26      '<(PRODUCT_DIR)/DerivedSources/JavaScriptCore',
     27    ],
     28  },
    629  'targets': [
    730    {
     
    1336      ],
    1437      'include_dirs': [
    15         '<(DEPTH)', # Some paths in API include JavaScriptCore/
    16         '<(DEPTH)/JavaScriptCore',
    17         '<(DEPTH)/JavaScriptCore/ForwardingHeaders',
    18         '<(DEPTH)/JavaScriptCore/API',
    19         '<(DEPTH)/JavaScriptCore/assembler',
    20         '<(DEPTH)/JavaScriptCore/collector/handles',
    21         '<(DEPTH)/JavaScriptCore/bytecode',
    22         '<(DEPTH)/JavaScriptCore/bytecompiler',
    23         '<(DEPTH)/JavaScriptCore/debugger',
    24         '<(DEPTH)/JavaScriptCore/icu',
    25         '<(DEPTH)/JavaScriptCore/interpreter',
    26         '<(DEPTH)/JavaScriptCore/jit',
    27         '<(DEPTH)/JavaScriptCore/parser',
    28         '<(DEPTH)/JavaScriptCore/profiler',
    29         '<(DEPTH)/JavaScriptCore/runtime',
    30         '<(DEPTH)/JavaScriptCore/wtf',
    31         '<(DEPTH)/JavaScriptCore/wtf/unicode',
    32         '<(PRODUCT_DIR)/DerivedSources/JavaScriptCore',
     38        '<@(javascriptcore_include_dirs)',
    3339      ],
    3440      'sources': [
     
    157163      }],
    158164    },
     165    {
     166      'target_name': 'minidom',
     167      'type': 'executable',
     168      'dependencies': [
     169        'JavaScriptCore',
     170      ],
     171      # FIXME: We should use a header map instead of listing these explicitly.
     172      'include_dirs': [
     173        '<@(javascriptcore_include_dirs)',
     174      ],
     175      'sources': [
     176        '<@(minidom_files)',
     177        '<(PRODUCT_DIR)/JavaScriptCore.framework',
     178        '$(SDKROOT)/System/Library/Frameworks/CoreFoundation.framework',
     179      ],
     180      'conditions': [
     181        ['OS=="mac"', {
     182          'xcode_settings': {
     183            'USE_HEADERMAP': 'NO',
     184          }
     185        }],
     186      ],
     187    },
    159188  ], # targets
    160189}
Note: See TracChangeset for help on using the changeset viewer.