Changeset 137375 in webkit
- Timestamp:
- Dec 11, 2012 3:45:29 PM (11 years ago)
- Location:
- trunk/Tools
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Tools/ChangeLog
r137373 r137375 1 2012-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 1 14 2012-12-11 Zan Dobersek <zandobersek@gmail.com> 2 15 -
trunk/Tools/Scripts/update-webkit
r137371 r137375 48 48 my $useGYP = 0; 49 49 my $useMake = 0; 50 my $useNinja = 1;50 my $useNinja = 0; 51 51 52 52 determineIsChromium(); … … 62 62 'gyp' => \$useGYP, 63 63 'make' => \$useMake, 64 'ninja !' => \$useNinja,64 'ninja' => \$useNinja, 65 65 ); 66 66 … … 70 70 --chromium also update dependencies of the chromium port 71 71 --make generate the Makefile-based build system (Chromium only) 72 --n o-ninja generate the platform-native build system instead of ninja(Chromium only)72 --ninja generate the ninja-based build system (Chromium only) 73 73 --chromium-android also update dependencies of the chromium port for Android 74 74 -h|--help show the help message -
trunk/Tools/Scripts/webkitdirs.pm
r137371 r137375 2546 2546 # Windows build - builds the root visual studio solution. 2547 2547 $result = buildChromiumVisualStudioProject("Source/WebKit/chromium/All.sln", $clean); 2548 } elsif (isChromiumNinja() ) {2548 } elsif (isChromiumNinja() && !isChromiumAndroid()) { 2549 2549 $result = buildChromiumNinja("all", $clean, @options); 2550 2550 } elsif (isLinux() || isChromiumAndroid() || isChromiumMacMake()) {
Note: See TracChangeset
for help on using the changeset viewer.