Changeset 137375 in webkit


Ignore:
Timestamp:
Dec 11, 2012 3:45:29 PM (11 years ago)
Author:
eric@webkit.org
Message:

Unreviewed, rolling out r137371.
http://trac.webkit.org/changeset/137371
https://bugs.webkit.org/show_bug.cgi?id=104434

Various scripts are not ready for out/ as the build directory,
this can't work as written.

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

(buildChromium):

Location:
trunk/Tools
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/Tools/ChangeLog

    r137373 r137375  
     12012-12-11  Eric Seidel  <eric@webkit.org>
     2
     3        Unreviewed, rolling out r137371.
     4        http://trac.webkit.org/changeset/137371
     5        https://bugs.webkit.org/show_bug.cgi?id=104434
     6
     7        Various scripts are not ready for out/ as the build directory,
     8        this can't work as written.
     9
     10        * Scripts/update-webkit:
     11        * Scripts/webkitdirs.pm:
     12        (buildChromium):
     13
    1142012-12-11  Zan Dobersek  <zandobersek@gmail.com>
    215
  • trunk/Tools/Scripts/update-webkit

    r137371 r137375  
    4848my $useGYP = 0;
    4949my $useMake = 0;
    50 my $useNinja = 1;
     50my $useNinja = 0;
    5151
    5252determineIsChromium();
     
    6262    'gyp' => \$useGYP,
    6363    'make' => \$useMake,
    64     'ninja!' => \$useNinja,
     64    'ninja' => \$useNinja,
    6565);
    6666
     
    7070  --chromium          also update dependencies of the chromium port
    7171  --make              generate the Makefile-based build system (Chromium only)
    72   --no-ninja          generate the platform-native build system instead of ninja (Chromium only)
     72  --ninja             generate the ninja-based build system (Chromium only)
    7373  --chromium-android  also update dependencies of the chromium port for Android
    7474  -h|--help           show the help message
  • trunk/Tools/Scripts/webkitdirs.pm

    r137371 r137375  
    25462546        # Windows build - builds the root visual studio solution.
    25472547        $result = buildChromiumVisualStudioProject("Source/WebKit/chromium/All.sln", $clean);
    2548     } elsif (isChromiumNinja()) {
     2548    } elsif (isChromiumNinja() && !isChromiumAndroid()) {
    25492549        $result = buildChromiumNinja("all", $clean, @options);
    25502550    } elsif (isLinux() || isChromiumAndroid() || isChromiumMacMake()) {
Note: See TracChangeset for help on using the changeset viewer.