Changeset 48827 in webkit


Ignore:
Timestamp:
Sep 28, 2009 1:30:52 PM (15 years ago)
Author:
eric@webkit.org
Message:

2009-09-28 Yaar Schnitman <​yaar@chromium.org>

Reviewed by Dimitri Glazkov.

Chromium port - recognize we are being built independently
of chromium and look for dependencies under webkit/chromium rather
than chromium/src.

​https://bugs.webkit.org/show_bug.cgi?id=29722

2009-09-28 Yaar Schnitman <​yaar@chromium.org>

Reviewed by Dimitri Glazkov.

Chromium port - recognize we are being built independently
of chromium and look for dependencies under webkit/chromium rather
than chromium/src.

​https://bugs.webkit.org/show_bug.cgi?id=29722

  • WebCore.gyp/WebCore.gyp: See above. Also removed a few files from the sources list, since they are not supposed to be built here.

2009-09-28 Yaar Schnitman <​yaar@chromium.org>

Reviewed by Dimitri Glazkov.

​https://bugs.webkit.org/show_bug.cgi?id=29722

  • chromium/DEPS: Describes the chromium port's dependencies and is used by gclient to fetch them.
  • chromium/webkit.gyp: Currently only builds webcore but in the future will also build the webkit api.
Location:
trunk
Files:
2 added
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/JavaScriptCore/ChangeLog

    r48826 r48827  
     12009-09-28  Yaar Schnitman  <yaar@chromium.org>
     2
     3        Reviewed by Dimitri Glazkov.
     4
     5        Chromium port - recognize we are being built independently
     6        of chromium and look for dependencies under webkit/chromium rather
     7        than chromium/src.
     8
     9        https://bugs.webkit.org/show_bug.cgi?id=29722
     10
     11        * JavaScriptCore.gyp/JavaScriptCore.gyp:
     12
    1132009-09-28  Jakub Wieczorek  <faw217@gmail.com>
    214

  • trunk/JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp

    r48640 r48827  
    3737  ],
    3838  'variables': {
    39     # FIXME: Sense whether upstream or downstream build, and
    40     # point to the right src dir
    41     'chromium_src_dir': '../../../..',
     39    # Location of the chromium src directory.
     40    'conditions': [
     41      ['inside_chromium_build==0', {
     42        # Webkit is being built outside of the full chromium project.
     43        'chromium_src_dir': '../../WebKit/chromium',
     44      },{
     45        # WebKit is checked out in src/chromium/third_party/WebKit
     46        'chromium_src_dir': '../../../..',
     47      }],
     48    ],
    4249  },
    4350  'targets': [

  • trunk/WebCore/ChangeLog

    r48826 r48827  
     12009-09-28  Yaar Schnitman  <yaar@chromium.org>
     2
     3        Reviewed by Dimitri Glazkov.
     4
     5        Chromium port - recognize we are being built independently
     6        of chromium and look for dependencies under webkit/chromium rather
     7        than chromium/src.
     8
     9        https://bugs.webkit.org/show_bug.cgi?id=29722
     10
     11        * WebCore.gyp/WebCore.gyp: See above. Also removed a few files from
     12          the sources list, since they are not supposed to be built here.
     13
    1142009-09-28  Jakub Wieczorek  <faw217@gmail.com>
    215

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

    r48777 r48827  
    3636    '../WebCore.gypi',
    3737  ],
     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      'variables': {'chromium_src_dir': '../../WebKit/chromium'},
     43    },{
     44      # WebKit is checked out in src/chromium/third_party/WebKit
     45      'variables': {'chromium_src_dir': '../../../..'},
     46    }],
     47  ], 
     48
    3849  'variables': {
    39     # FIXEME: Sense whether upstream or downstream build, and
    40     # point to the right src dir
    41     'chromium_src_dir': '../../../..',
    42 
    4350    # If set to 1, doesn't compile debug symbols into webcore reducing the
    4451    # size of the binary and increasing the speed of gdb.  gcc only.
    … …  
    413420        '<@(webcore_files)',
    414421
    415         '<(chromium_src_dir)/webkit/extensions/v8/gc_extension.cc',
    416         '<(chromium_src_dir)/webkit/extensions/v8/gc_extension.h',
    417         '<(chromium_src_dir)/webkit/extensions/v8/gears_extension.cc',
    418         '<(chromium_src_dir)/webkit/extensions/v8/gears_extension.h',
    419         '<(chromium_src_dir)/webkit/extensions/v8/interval_extension.cc',
    420         '<(chromium_src_dir)/webkit/extensions/v8/interval_extension.h',
    421         '<(chromium_src_dir)/webkit/extensions/v8/playback_extension.cc',
    422         '<(chromium_src_dir)/webkit/extensions/v8/playback_extension.h',
    423         '<(chromium_src_dir)/webkit/extensions/v8/profiler_extension.cc',
    424         '<(chromium_src_dir)/webkit/extensions/v8/profiler_extension.h',
    425         '<(chromium_src_dir)/webkit/extensions/v8/benchmarking_extension.cc',
    426         '<(chromium_src_dir)/webkit/extensions/v8/benchmarking_extension.h',
    427 
    428422        # For WebCoreSystemInterface, Mac-only.
    429423        '../../WebKit/mac/WebCoreSupport/WebSystemInterface.m',

  • trunk/WebKit/ChangeLog

    r48795 r48827  
     12009-09-28  Yaar Schnitman  <yaar@chromium.org>
     2
     3        Reviewed by Dimitri Glazkov.
     4
     5        https://bugs.webkit.org/show_bug.cgi?id=29722
     6
     7        * chromium/DEPS: Describes the chromium port's dependencies and
     8          is used by gclient to fetch them.
     9        * chromium/webkit.gyp: Currently only builds webcore but in
     10          the future will also build the webkit api.
     11
    1122009-09-26  David Kilzer  <ddkilzer@apple.com>
    213
Note: See TracChangeset for help on using the changeset viewer.