Changeset 143093 in webkit


Ignore:
Timestamp:
Feb 15, 2013 7:26:06 PM (11 years ago)
Author:
Martin Robinson
Message:

[GTK] Spread the gyp build files throughout the tree
​https://bugs.webkit.org/show_bug.cgi?id=109960

Reviewed by Dirk Pranke.

Source/JavaScriptCore:

  • JavaScriptCore.gyp/JavaScriptCoreGTK.gyp: Renamed from Source/WebKit/gtk/gyp/JavaScriptCore.gyp.
  • JavaScriptCore.gyp/generate-derived-sources.sh: Renamed from Source/WebKit/gtk/gyp/generate-derived-sources.sh.

Source/WebKit/gtk:

  • gyp/Configuration.gypi.in: Remove the 'Source', since now it cannot be shared.
  • gyp/run-gyp: Update the path to the JavaScriptCore gypfile.

Source/WTF:

  • WTF.gyp/WTFGTK.gyp: Renamed from Source/WebKit/gtk/gyp/WTF.gyp.
Location:
trunk/Source
Files:
5 edited
3 moved

Legend:

Unmodified
Added
Removed

  • trunk/Source/JavaScriptCore/ChangeLog

    r143057 r143093  
     12013-02-15  Martin Robinson  <mrobinson@igalia.com>
     2
     3        [GTK] Spread the gyp build files throughout the tree
     4        https://bugs.webkit.org/show_bug.cgi?id=109960
     5
     6        Reviewed by Dirk Pranke.
     7
     8        * JavaScriptCore.gyp/JavaScriptCoreGTK.gyp: Renamed from Source/WebKit/gtk/gyp/JavaScriptCore.gyp.
     9        * JavaScriptCore.gyp/generate-derived-sources.sh: Renamed from Source/WebKit/gtk/gyp/generate-derived-sources.sh.
     10
    1112013-02-15  Filip Pizlo  <fpizlo@apple.com>
    212

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

    • Property svn:eol-style set to LF
    r143092 r143093  
    11{
    22  'includes': [
    3     '../../../JavaScriptCore/JavaScriptCore.gypi',
     3    '../JavaScriptCore.gypi',
    44  ],
     5
    56  'variables': {
     7    'JavaScriptCore': '..',
     8    'Source': '../..',
     9    'Dependencies': '<(Source)/WebKit/gtk/gyp/Dependencies.gyp',
    610    'javascriptcore_includes': [
    7       '<(Source)/',
    8       '<(Source)/JavaScriptCore',
    9       '<(Source)/JavaScriptCore/API',
    10       '<(Source)/JavaScriptCore/assembler',
    11       '<(Source)/JavaScriptCore/bytecode',
    12       '<(Source)/JavaScriptCore/bytecompiler',
    13       '<(Source)/JavaScriptCore/dfg',
    14       '<(Source)/JavaScriptCore/disassembler',
    15       '<(Source)/JavaScriptCore/heap',
    16       '<(Source)/JavaScriptCore/debugger',
    17       '<(Source)/JavaScriptCore/ForwardingHeaders',
    18       '<(Source)/JavaScriptCore/interpreter',
    19       '<(Source)/JavaScriptCore/jit',
    20       '<(Source)/JavaScriptCore/jit',
    21       '<(Source)/JavaScriptCore/llint',
    22       '<(Source)/JavaScriptCore/parser',
    23       '<(Source)/JavaScriptCore/profiler',
    24       '<(Source)/JavaScriptCore/runtime',
    25       '<(Source)/JavaScriptCore/tools',
    26       '<(Source)/JavaScriptCore/yarr',
     11      '<(Source)',
     12      '<(JavaScriptCore)',
     13      '<(JavaScriptCore)/API',
     14      '<(JavaScriptCore)/assembler',
     15      '<(JavaScriptCore)/bytecode',
     16      '<(JavaScriptCore)/bytecompiler',
     17      '<(JavaScriptCore)/dfg',
     18      '<(JavaScriptCore)/disassembler',
     19      '<(JavaScriptCore)/heap',
     20      '<(JavaScriptCore)/debugger',
     21      '<(JavaScriptCore)/ForwardingHeaders',
     22      '<(JavaScriptCore)/interpreter',
     23      '<(JavaScriptCore)/jit',
     24      '<(JavaScriptCore)/jit',
     25      '<(JavaScriptCore)/llint',
     26      '<(JavaScriptCore)/parser',
     27      '<(JavaScriptCore)/profiler',
     28      '<(JavaScriptCore)/runtime',
     29      '<(JavaScriptCore)/tools',
     30      '<(JavaScriptCore)/yarr',
    2731      '<(PRODUCT_DIR)/DerivedSources/JavaScriptCore',
    2832    ],
    2933  },
     34
    3035  'target_defaults' : {
    3136      'cflags' : [ '<@(global_cflags)', ],
    3237      'defines': [ '<@(global_defines)' ],
    3338  },
     39
    3440  'targets': [
    3541    {
    3642      'target_name': 'LLIntOffsetExtractor',
    3743        'dependencies': [
    38           'WTF.gyp:wtf',
     44          '<(Source)/WTF/WTF.gyp/WTFGTK.gyp:wtf',
    3945        ],
    4046        'type': 'executable',
    … …  
    4854          'action_name': 'llint_desired_offsets',
    4955          'inputs': [
    50             '<(Source)/JavaScriptCore/offlineasm/generate_offset_extractor.rb',
    51             '<(Source)/JavaScriptCore/llint/LowLevelInterpreter.asm',
     56            '<(JavaScriptCore)/offlineasm/generate_offset_extractor.rb',
     57            '<(JavaScriptCore)/llint/LowLevelInterpreter.asm',
    5258            '<@(llintdesiredoffsets_h_files)',
    5359          ],
    … …  
    5763          'action': [
    5864            'ruby',
    59             '<(Source)/JavaScriptCore/offlineasm/generate_offset_extractor.rb',
    60             '<(Source)/JavaScriptCore/llint/LowLevelInterpreter.asm',
     65            '<(JavaScriptCore)/offlineasm/generate_offset_extractor.rb',
     66            '<(JavaScriptCore)/llint/LowLevelInterpreter.asm',
    6167            '<@(_outputs)',
    6268          ],
    … …  
    6874        'type': 'shared_library',
    6975        'dependencies': [
    70           'WTF.gyp:wtf',
     76          '<(Source)/WTF/WTF.gyp/WTFGTK.gyp:wtf',
    7177          'LLIntOffsetExtractor',
    72           'Dependencies.gyp:glib',
    73           'Dependencies.gyp:icu',
     78          '<(Dependencies):glib',
     79          '<(Dependencies):icu',
    7480        ],
    7581        'product_extension': 'so.<@(javascriptcore_soname_version)',
    … …  
    8793          ['exclude', 'JSStringRefCF\\.(h|cpp)$'],
    8894        ],
    89         'direct_dependent_settings': {
    90           'include_dirs': [
    91             '<(Source)/WTF',
    92             '<(Source)/WTF/wtf',
    93           ],
    94         },
    9595      'actions': [
    9696        {
    9797          'action_name': 'Generate Derived Sources',
    9898          'inputs': [
    99             '<(Source)/JavaScriptCore/DerivedSources.make',
     99            '<(JavaScriptCore)/DerivedSources.make',
    100100            'generate-derived-sources.sh',
    101101          ],
    … …  
    108108          'action_name': 'llintassembly_header_generation',
    109109          'inputs': [
    110             '<(Source)/JavaScriptCore/offlineasm/asm.rb',
    111             '<(Source)/JavaScriptCore/llint/LowLevelInterpreter.asm',
     110            '<(JavaScriptCore)/offlineasm/asm.rb',
     111            '<(JavaScriptCore)/llint/LowLevelInterpreter.asm',
    112112            '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)LLIntOffsetExtractor<(EXECUTABLE_SUFFIX)',
    113113          ],

  • trunk/Source/JavaScriptCore/JavaScriptCore.gyp/generate-derived-sources.sh

    • Property svn:eol-style set to LF

  • trunk/Source/WTF/ChangeLog

    r143071 r143093  
     12013-02-15  Martin Robinson  <mrobinson@igalia.com>
     2
     3        [GTK] Spread the gyp build files throughout the tree
     4        https://bugs.webkit.org/show_bug.cgi?id=109960
     5
     6        Reviewed by Dirk Pranke.
     7
     8        * WTF.gyp/WTFGTK.gyp: Renamed from Source/WebKit/gtk/gyp/WTF.gyp.
     9
    1102013-02-15  Anders Carlsson  <andersca@apple.com>
    211

  • trunk/Source/WTF/WTF.gyp/WTFGTK.gyp

    • Property svn:eol-style set to LF
    r143092 r143093  
    11{
    22  'includes': [
    3     '../../../WTF/WTF.gypi',
     3    '../WTF.gypi',
    44  ],
     5
     6  'variables': {
     7    'WTF': '..',
     8    'Source': '../..',
     9    'Dependencies': '<(Source)/WebKit/gtk/gyp/Dependencies.gyp',
     10  },
     11
    512  'target_defaults' : {
    613      'cflags' : [ '<@(global_cflags)', ],
    714      'defines': [ '<@(global_defines)' ],
    815  },
     16
    917  'targets': [
    1018    {
    … …  
    1220      'type': 'static_library',
    1321      'dependencies': [
    14         'Dependencies.gyp:glib',
    15         'Dependencies.gyp:icu',
     22        '<(Dependencies):glib',
     23        '<(Dependencies):icu',
    1624       ],
    1725      'include_dirs': [
    18         '<(Source)/WTF',
    19         '<(Source)/WTF/wtf',
    20         '<(Source)/WTF/wtf/unicode',
     26        '<(WTF)',
     27        '<(WTF)/wtf',
     28        '<(WTF)/wtf/unicode',
    2129      ],
    2230      'sources': [
    … …  
    4250         ],
    4351        'include_dirs': [
    44           '<(Source)/WTF',
    45           '<(Source)/WTF/wtf',
     52          '<(WTF)',
     53          '<(WTF)/wtf',
    4654        ],
    4755      },

  • trunk/Source/WebKit/gtk/ChangeLog

    r143039 r143093  
     12013-02-15  Martin Robinson  <mrobinson@igalia.com>
     2
     3        [GTK] Spread the gyp build files throughout the tree
     4        https://bugs.webkit.org/show_bug.cgi?id=109960
     5
     6        Reviewed by Dirk Pranke.
     7
     8        * gyp/Configuration.gypi.in: Remove the 'Source', since now it cannot be shared.
     9        * gyp/run-gyp: Update the path to the JavaScriptCore gypfile.
     10
    1112013-02-15  Martin Robinson  <mrobinson@igalia.com>
    212

  • trunk/Source/WebKit/gtk/gyp/Configuration.gypi.in

    r143039 r143093  
    55    # relative to the source directory after running autogen.sh.
    66    'toplevel_directory': '@TOPLEVEL_DIRECTORY@',
    7 
    8     # Source is <toplevel>/Source, but relative to the actual .gyp files.
    9     'Source': '../../..',
    107
    118    'api_version': '@WEBKITGTK_API_VERSION@',

  • trunk/Source/WebKit/gtk/gyp/run-gyp

    r142706 r143093  
    1616                          '--depth=.',
    1717                          '--generator-output=%s' % build_directory,
    18                           'Source/WebKit/gtk/gyp/JavaScriptCore.gyp',
     18                          'Source/JavaScriptCore/JavaScriptCore.gyp/JavaScriptCoreGTK.gyp',
    1919                          '-I', os.path.join(build_directory, 'Configuration.gypi')]))
Note: See TracChangeset for help on using the changeset viewer.