Changeset 93515 in webkit


Ignore:
Timestamp:
Aug 22, 2011 10:49:24 AM (13 years ago)
Author:
commit-queue@webkit.org
Message:

Pass --makeargs of build-webkit to chromium linux builder
https://bugs.webkit.org/show_bug.cgi?id=66361

Patch by Xianzhu Wang <wangxianzhu@chromium.org> on 2011-08-22
Reviewed by Tony Chang.

  • Scripts/build-webkit:
  • Scripts/webkitdirs.pm:

(buildChromiumMakefile):
(buildChromium):

Location:
trunk/Tools
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/Tools/ChangeLog

    r93511 r93515  
     12011-08-22  Xianzhu Wang  <wangxianzhu@chromium.org>
     2
     3        Pass --makeargs of build-webkit to chromium linux builder
     4        https://bugs.webkit.org/show_bug.cgi?id=66361
     5
     6        Reviewed by Tony Chang.
     7
     8        * Scripts/build-webkit:
     9        * Scripts/webkitdirs.pm:
     10        (buildChromiumMakefile):
     11        (buildChromium):
     12
    1132011-08-22  Peter Beverloo  <peter@chromium.org>
    214
  • trunk/Tools/Scripts/build-webkit

    r92792 r93515  
    579579    # Chromium doesn't build by project directories.
    580580    @projects = ();
     581    push @options, "--makeargs=" . $makeArgs if $makeArgs;
    581582    my $result = buildChromium($clean, @options);
    582583    exit exitStatus($result) if exitStatus($result);
  • trunk/Tools/Scripts/webkitdirs.pm

    r92244 r93515  
    18241824}
    18251825
    1826 sub buildChromiumMakefile($$)
    1827 {
    1828     my ($target, $clean) = @_;
     1826sub buildChromiumMakefile($$@)
     1827{
     1828    my ($target, $clean, @options) = @_;
    18291829    if ($clean) {
    18301830        return system qw(rm -rf out);
     
    18321832    my $config = configuration();
    18331833    my $numCpus = numberOfCPUs();
    1834     my @command = ("make", "-fMakefile.chromium", "-j$numCpus", "BUILDTYPE=$config", $target);
    1835     print join(" ", @command) . "\n";
    1836     return system @command;
     1834    my $makeArgs;
     1835    for (@options) {
     1836        $makeArgs = $1 if /^--makeargs=(.*)/i;
     1837    }
     1838    $makeArgs = "-j$numCpus" if not $makeArgs;
     1839    my $command = "make -fMakefile.chromium $makeArgs BUILDTYPE=$config $target";
     1840    print "$command\n";
     1841    return system $command;
    18371842}
    18381843
     
    18951900    } elsif (isLinux()) {
    18961901        # Linux build - build using make.
    1897         $ result = buildChromiumMakefile("all", $clean);
     1902        $result = buildChromiumMakefile("all", $clean, @options);
    18981903    } else {
    18991904        print STDERR "This platform is not supported by chromium.\n";
Note: See TracChangeset for help on using the changeset viewer.