Changeset 105330 in webkit


Ignore:
Timestamp:
Jan 18, 2012 3:03:04 PM (12 years ago)
Author:
dpranke@chromium.org
Message:

[chromium] move Tools.gyp, switch build-webkit --chromium to All.gyp
​https://bugs.webkit.org/show_bug.cgi?id=76505

Reviewed by Tony Chang.

.:

Update with newly-generated files.

  • .gitignore:

Source/WebKit/chromium:

Update path to Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp.

  • All.gyp:
  • gyp_webkit:
  • change to using All.gyp
  • change build_webkit_exes_from_webkit_gyp to 0

Tools:

Update chromium build script to use All.gyp instead of WebKit.gyp

  • DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp: Renamed from Source/WebKit/chromium/Tools.gyp.
  • Scripts/webkitdirs.pm:
Location:
trunk
Files:
1 added
7 edited
1 moved

Legend:

Unmodified
Added
Removed

  • trunk/.gitignore

    r104048 r105330  
    5959Source/Platform/Platform.gyp/*.sln
    6060Source/Platform/Platform.gyp/*.vcproj*
    61 Tools/Tools.xcodeproj
    62 Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.xcodeproj
     61Source/Platform/Platform.gyp/*.xcodeproj*
     62Tools/DumpRenderTree/DumpRenderTree.gyp/*.Makefile
     63Tools/DumpRenderTree/DumpRenderTree.gyp/*.mk
     64Tools/DumpRenderTree/DumpRenderTree.gyp/*.ninja
     65Tools/DumpRenderTree/DumpRenderTree.gyp/*.sln
     66Tools/DumpRenderTree/DumpRenderTree.gyp/*.vcproj*
     67Tools/DumpRenderTree/DumpRenderTree.gyp/*.xcodeproj*
    6368
    6469# Ignore status files that manage Chromium dependencies.

  • trunk/ChangeLog

    r105315 r105330  
     12012-01-18  Dirk Pranke  <dpranke@chromium.org>
     2
     3        [chromium] move Tools.gyp, switch build-webkit --chromium to All.gyp
     4        https://bugs.webkit.org/show_bug.cgi?id=76505
     5
     6        Reviewed by Tony Chang.
     7
     8        Update with newly-generated files.
     9
     10        * .gitignore:
     11
    1122012-01-18  Eric Carlson  <eric.carlson@apple.com>
    213

  • trunk/Source/WebKit/chromium/All.gyp

    r102482 r105330  
    4242            'dependencies': [
    4343                'WebKitUnitTests.gyp:webkit_unit_tests',
    44                 'Tools.gyp:DumpRenderTree',
     44                '../../../Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp:DumpRenderTree',
    4545            ],
    4646        }

  • trunk/Source/WebKit/chromium/ChangeLog

    r105324 r105330  
     12012-01-18  Dirk Pranke  <dpranke@chromium.org>
     2
     3        [chromium] move Tools.gyp, switch build-webkit --chromium to All.gyp
     4        https://bugs.webkit.org/show_bug.cgi?id=76505
     5
     6        Reviewed by Tony Chang.
     7
     8        Update path to Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp.
     9
     10        * All.gyp:
     11        * gyp_webkit:
     12        - change to using All.gyp
     13        - change build_webkit_exes_from_webkit_gyp to 0
     14
    1152012-01-18  David Grogan  <dgrogan@chromium.org>
    216

  • trunk/Source/WebKit/chromium/gyp_webkit

    r102727 r105330  
    120120               '-Dv8_use_snapshot=false',
    121121               '-Dmsvs_use_common_release=0',
    122                '-Dbuild_webkit_exes_from_webkit_gyp=1',
     122               '-Dbuild_webkit_exes_from_webkit_gyp=0',
    123123
    124124               # WebKit doesn't use the chromium style checker.
    … …  
    130130
    131131               # gyp file to execute.
    132                'WebKit.gyp'])
     132               'All.gyp'])
    133133
    134134  print 'Updating webkit projects from gyp files...'

  • trunk/Tools/ChangeLog

    r105325 r105330  
     12012-01-18  Dirk Pranke  <dpranke@chromium.org>
     2
     3        [chromium] move Tools.gyp, switch build-webkit --chromium to All.gyp
     4        https://bugs.webkit.org/show_bug.cgi?id=76505
     5
     6        Reviewed by Tony Chang.
     7
     8        Update chromium build script to use All.gyp instead of WebKit.gyp
     9
     10        * DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp: Renamed from Source/WebKit/chromium/Tools.gyp.
     11        * Scripts/webkitdirs.pm:
     12
    1132012-01-18  Sam Weinig  <sam@webkit.org>
    214

  • trunk/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp

    r105329 r105330  
    3131{
    3232    'variables': {
    33         'tools_dir': '../../../Tools',
    34         'source_dir': '../..',
     33        'tools_dir': '../..',
     34        'source_dir': '../../../Source',
    3535    },
    3636     # FIXME: Remove this conditional check once chromium's
    … …  
    4040         ['build_webkit_exes_from_webkit_gyp==0', {
    4141            'includes': [
    42                 '../../../Tools/DumpRenderTree/DumpRenderTree.gypi',
    43                 'features.gypi',
     42                '../DumpRenderTree.gypi',
     43                '../../../Source/WebKit/chromium/features.gypi',
    4444            ],
    4545            'variables': {
    … …  
    5353                    },{
    5454                        # WebKit is checked out in src/chromium/third_party/WebKit
    55                         'chromium_src_dir': '../../../..',
     55                        'chromium_src_dir': '<(tools_dir)/../..',
    5656                    }],
    5757                ],

  • trunk/Tools/Scripts/webkitdirs.pm

    r105258 r105330  
    22592259    if (isDarwin() && !isChromiumAndroid() && !isChromiumMacMake()) {
    22602260        # Mac build - builds the root xcode project.
    2261         $result = buildXCodeProject("Source/WebKit/chromium/WebKit", $clean, "-configuration", configuration(), @options);
     2261        $result = buildXCodeProject("Source/WebKit/chromium/All", $clean, "-configuration", configuration(), @options);
    22622262    } elsif (isCygwin() || isWindows()) {
    22632263        # Windows build - builds the root visual studio solution.
    2264         $result = buildChromiumVisualStudioProject("Source/WebKit/chromium/WebKit.sln", $clean);
     2264        $result = buildChromiumVisualStudioProject("Source/WebKit/chromium/All.sln", $clean);
    22652265    } elsif (isLinux() || isChromiumAndroid() || isChromiumMacMake()) {
    22662266        # Linux build - build using make.
Note: See TracChangeset for help on using the changeset viewer.