Changeset 60884 in webkit


Ignore:
Timestamp:
Jun 9, 2010 12:22:39 AM (14 years ago)
Author:
tony@chromium.org
Message:

2010-06-08 Tony Chang <tony@chromium.org>

Reviewed by David Levin.

[chromium] compile linux chromium in WebKit/out instead of WebKit/WebKit/chromium/out
https://bugs.webkit.org/show_bug.cgi?id=40285

Take 2 at landing this patch, this time rolling DEPS just a bit
further to pick up some chromium fixes.

  • DEPS
  • gyp_webkit:

2010-06-08 Tony Chang <tony@chromium.org>

Reviewed by David Levin.

[chromium] compile linux chromium in WebKit/out instead of WebKit/WebKit/chromium/out
https://bugs.webkit.org/show_bug.cgi?id=40285

  • Scripts/webkitdirs.pm:
  • Scripts/webkitpy/layout_tests/port/chromium_linux.py:
Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/WebKit/chromium/ChangeLog

    r60879 r60884  
     12010-06-08  Tony Chang  <tony@chromium.org>
     2
     3        Reviewed by David Levin.
     4
     5        [chromium] compile linux chromium in WebKit/out instead of WebKit/WebKit/chromium/out
     6        https://bugs.webkit.org/show_bug.cgi?id=40285
     7
     8        Take 2 at landing this patch, this time rolling DEPS just a bit
     9        further to pick up some chromium fixes.
     10
     11        * DEPS
     12        * gyp_webkit:
     13
    1142010-06-08  Sheriff Bot  <webkit.review.bot@gmail.com>
    215
  • trunk/WebKit/chromium/DEPS

    r60879 r60884  
    3333vars = {
    3434  'chromium_svn': 'http://src.chromium.org/svn/trunk/src',
    35   'chromium_rev': '49128',
     35  'chromium_rev': '49224',
    3636}
    3737
  • trunk/WebKit/chromium/gyp_webkit

    r60879 r60884  
    7979  # On linux, we want gyp to output a makefile (default is scons).
    8080  if sys.platform == 'linux2':
    81     args.extend(['-fmake'])
     81    args.extend(['-fmake',
     82                 '--suffix=.chromium',
     83                 '--toplevel-dir=../..',
     84                 # auto_regeneration doesn't work with toplevel-dir
     85                 '-Gauto_regeneration=0'])
    8286
    8387  # Other command args:
     
    9195               '--depth=./',
    9296
    93                # gyp files to execute.
     97               # gyp file to execute.
    9498               'WebKit.gyp'])
    9599
  • trunk/WebKitTools/ChangeLog

    r60883 r60884  
     12010-06-08  Tony Chang  <tony@chromium.org>
     2
     3        Reviewed by David Levin.
     4
     5        [chromium] compile linux chromium in WebKit/out instead of WebKit/WebKit/chromium/out
     6        https://bugs.webkit.org/show_bug.cgi?id=40285
     7
     8        * Scripts/webkitdirs.pm:
     9        * Scripts/webkitpy/layout_tests/port/chromium_linux.py:
     10
    1112010-06-03  Roland Steiner  <rolandsteiner@chromium.org>
    212
  • trunk/WebKitTools/Scripts/webkitdirs.pm

    r60879 r60884  
    14351435}
    14361436
    1437 sub buildChromiumMakefile($$$)
    1438 {
    1439     my ($dir, $target, $clean) = @_;
    1440     chdir $dir;
     1437sub buildChromiumMakefile($$)
     1438{
     1439    my ($target, $clean) = @_;
    14411440    if ($clean) {
    14421441        return system qw(rm -rf out);
     
    14441443    my $config = configuration();
    14451444    my $numCpus = (grep /processor/, `cat /proc/cpuinfo`) || 1;
    1446     my @command = ("make", "-j$numCpus", "BUILDTYPE=$config", $target);
     1445    my @command = ("make", "-fMakefile.chromium", "-j$numCpus", "BUILDTYPE=$config", $target);
    14471446    print join(" ", @command) . "\n";
    14481447    return system @command;
     
    15021501    } elsif (isLinux()) {
    15031502        # Linux build - build using make.
    1504         $ result = buildChromiumMakefile("WebKit/chromium/", "all", $clean);
     1503        $ result = buildChromiumMakefile("all", $clean);
    15051504    } else {
    15061505        print STDERR "This platform is not supported by chromium.\n";
  • trunk/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium_linux.py

    r60879 r60884  
    8383    def _build_path(self, *comps):
    8484        if self._options.use_drt:
    85             base = os.path.join(self.path_from_webkit_base(), 'WebKit',
    86                                 'chromium')
     85            base = os.path.join(self.path_from_webkit_base())
    8786        else:
    8887            base = self.path_from_chromium_base()
Note: See TracChangeset for help on using the changeset viewer.