Changeset 147294 in webkit


Ignore:
Timestamp:
Mar 31, 2013 8:06:57 PM (11 years ago)
Author:
abarth@webkit.org
Message:

[Chromium] Yarr should build using a separate GYP file from JavaScriptCore
​https://bugs.webkit.org/show_bug.cgi?id=113652

Reviewed by Nico Weber.

Source/JavaScriptCore:

This patch moves JavaScriptCore.gyp to yarr.gyp because Chromium only
uses this GYP file to build yarr.

  • JavaScriptCore.gyp/JavaScriptCoreGTK.gyp:
  • JavaScriptCore.gypi:
  • yarr/yarr.gyp: Renamed from Source/JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp.

Source/WebCore:

  • WebCore.gyp/WebCore.gyp:
    • Update references to yarr.gyp.
Location:
trunk/Source
Files:
5 edited
1 moved

Legend:

Unmodified
Added
Removed

  • trunk/Source/JavaScriptCore/ChangeLog

    r147290 r147294  
     12013-03-31  Adam Barth  <abarth@webkit.org>
     2
     3        [Chromium] Yarr should build using a separate GYP file from JavaScriptCore
     4        https://bugs.webkit.org/show_bug.cgi?id=113652
     5
     6        Reviewed by Nico Weber.
     7
     8        This patch moves JavaScriptCore.gyp to yarr.gyp because Chromium only
     9        uses this GYP file to build yarr.
     10
     11        * JavaScriptCore.gyp/JavaScriptCoreGTK.gyp:
     12        * JavaScriptCore.gypi:
     13        * yarr/yarr.gyp: Renamed from Source/JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp.
     14
    1152013-03-31  Filip Pizlo  <fpizlo@apple.com>
    216

  • trunk/Source/JavaScriptCore/JavaScriptCore.gyp/JavaScriptCoreGTK.gyp

    r146677 r147294  
    140140      'include_dirs': [ '<@(javascriptcore_includes)' ],
    141141      'sources': [
    142         '<@(javascriptcore_yarr_files)',
    143142        '<@(javascriptcore_derived_source_files)',
    144143        '<@(javascriptcore_files)',

  • trunk/Source/JavaScriptCore/JavaScriptCore.gypi

    r147282 r147294  
    22    'variables': {
    33        'project_dir': ['.'],
    4         'javascriptcore_yarr_files': [
    5             'yarr/YarrCanonicalizeUCS2.cpp',
    6             'yarr/YarrInterpreter.cpp',
    7             'yarr/YarrPattern.cpp',
    8             'yarr/YarrSyntaxChecker.cpp',
    9         ],
    104        'javascriptcore_derived_source_files': [
    115            '<(PRODUCT_DIR)/DerivedSources/JavaScriptCore/RegExpJitTables.h',
    … …  
    827821            'tools/ProfileTreeNode.h',
    828822            'tools/TieredMMapArray.h',
     823            'yarr/Yarr.h',
     824            'yarr/YarrCanonicalizeUCS2.cpp',
    829825            'yarr/YarrCanonicalizeUCS2.h',
    830             'yarr/Yarr.h',
     826            'yarr/YarrInterpreter.cpp',
    831827            'yarr/YarrInterpreter.h',
    832828            'yarr/YarrJIT.cpp',
    833829            'yarr/YarrJIT.h',
    834830            'yarr/YarrParser.h',
     831            'yarr/YarrPattern.cpp',
    835832            'yarr/YarrPattern.h',
     833            'yarr/YarrSyntaxChecker.cpp',
    836834            'yarr/YarrSyntaxChecker.h',
    837835        ],

  • trunk/Source/JavaScriptCore/yarr/yarr.gyp

    r147293 r147294  
    3333    '../../WebKit/chromium/WinPrecompile.gypi',
    3434    '../../WebKit/chromium/features.gypi',
    35     '../JavaScriptCore.gypi',
    3635  ],
    37   'variables': {
    38     # Location of the chromium src directory.
    39     'conditions': [
    40       ['inside_chromium_build==0', {
    41         # Webkit is being built outside of the full chromium project.
    42         'chromium_src_dir': '../../WebKit/chromium',
    43       },{
    44         # WebKit is checked out in src/chromium/third_party/WebKit
    45         'chromium_src_dir': '../../../../..',
    46       }],
    47     ],
    48   },
    4936  'conditions': [
    5037    ['os_posix == 1 and OS != "mac" and gcc_version>=46', {
    … …  
    8269        '<(INTERMEDIATE_DIR)',
    8370        '..',
    84         '../runtime',
    8571      ],
    8672      'sources': [
    87         '<@(javascriptcore_yarr_files)',
     73        'Yarr.h',
     74        'YarrCanonicalizeUCS2.cpp',
     75        'YarrCanonicalizeUCS2.h',
     76        'YarrInterpreter.cpp',
     77        'YarrInterpreter.h',
     78        'YarrParser.h',
     79        'YarrPattern.cpp',
     80        'YarrPattern.h',
     81        'YarrSyntaxChecker.cpp',
     82        'YarrSyntaxChecker.h',
    8883      ],
    8984      'export_dependent_settings': [

  • trunk/Source/WebCore/ChangeLog

    r147293 r147294  
     12013-03-31  Adam Barth  <abarth@webkit.org>
     2
     3        [Chromium] Yarr should build using a separate GYP file from JavaScriptCore
     4        https://bugs.webkit.org/show_bug.cgi?id=113652
     5
     6        Reviewed by Nico Weber.
     7
     8        * WebCore.gyp/WebCore.gyp:
     9            - Update references to yarr.gyp.
     10
    1112013-03-31  Kangil Han  <kangil.han@samsung.com>
    212

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

    r147167 r147294  
    12591259        'injected_script_source',
    12601260        'debugger_script_source',
    1261         '../../JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp:yarr',
     1261        '../../JavaScriptCore/yarr/yarr.gyp:yarr',
    12621262        '../../WTF/WTF.gyp/WTF.gyp:wtf',
    12631263        '<(chromium_src_dir)/build/temp_gyp/googleurl.gyp:googleurl',
    … …  
    13871387        'webcore_bindings_sources',
    13881388        '../../ThirdParty/glu/glu.gyp:libtess',
    1389         '../../JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp:yarr',
     1389        '../../JavaScriptCore/yarr/yarr.gyp:yarr',
    13901390        '../../WTF/WTF.gyp/WTF.gyp:wtf',
    13911391        '<(chromium_src_dir)/build/temp_gyp/googleurl.gyp:googleurl',
    … …  
    14061406      ],
    14071407      'export_dependent_settings': [
    1408         '../../JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp:yarr',
     1408        '../../JavaScriptCore/yarr/yarr.gyp:yarr',
    14091409        '../../WTF/WTF.gyp/WTF.gyp:wtf',
    14101410        '<(chromium_src_dir)/build/temp_gyp/googleurl.gyp:googleurl',
Note: See TracChangeset for help on using the changeset viewer.