Title: [138406] trunk/Tools
- Revision
- 138406
- Author
- [email protected]
- Date
- 2012-12-21 18:12:37 -0800 (Fri, 21 Dec 2012)
Log Message
chromium: webkit-build-directory doesn't handle ninja output dirs
https://bugs.webkit.org/show_bug.cgi?id=105671
Reviewed by Daniel Bates.
Teach webkit-build-directory to detect the ninja build directory.
* Scripts/webkitdirs.pm:
(determineBaseProductDir):
(determineIsChromiumNinja):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (138405 => 138406)
--- trunk/Tools/ChangeLog 2012-12-22 01:06:25 UTC (rev 138405)
+++ trunk/Tools/ChangeLog 2012-12-22 02:12:37 UTC (rev 138406)
@@ -1,3 +1,16 @@
+2012-12-21 Nico Weber <[email protected]>
+
+ chromium: webkit-build-directory doesn't handle ninja output dirs
+ https://bugs.webkit.org/show_bug.cgi?id=105671
+
+ Reviewed by Daniel Bates.
+
+ Teach webkit-build-directory to detect the ninja build directory.
+
+ * Scripts/webkitdirs.pm:
+ (determineBaseProductDir):
+ (determineIsChromiumNinja):
+
2012-12-21 Ryosuke Niwa <[email protected]>
[Mountain Lion] platform/mac/editing/spelling/removing-underline-after-accepting-autocorrection-using-punctuation.html failing
Modified: trunk/Tools/Scripts/webkitdirs.pm (138405 => 138406)
--- trunk/Tools/Scripts/webkitdirs.pm 2012-12-22 01:06:25 UTC (rev 138405)
+++ trunk/Tools/Scripts/webkitdirs.pm 2012-12-22 02:12:37 UTC (rev 138406)
@@ -222,7 +222,7 @@
undef $baseProductDir unless $baseProductDir =~ /^\//;
} elsif (isChromium()) {
- if (isLinux() || isChromiumAndroid() || isChromiumMacMake()) {
+ if (isLinux() || isChromiumAndroid() || isChromiumMacMake() || isChromiumNinja()) {
$baseProductDir = "$sourceDir/out";
} elsif (isDarwin()) {
$baseProductDir = "$sourceDir/Source/WebKit/chromium/xcodebuild";
@@ -1200,7 +1200,11 @@
{
return if defined($isChromiumNinja);
- my $config = configuration();
+ # This function can be called from baseProductDir(), which in turn is
+ # called by configuration(). So calling configuration() here leads to
+ # infinite recursion. Gyp writes both Debug and Release at the same time
+ # by default, so just check the timestamp on the Release build.ninja file.
+ my $config = "Release";
my $hasUpToDateNinjabuild = 0;
if (-e "out/$config/build.ninja") {
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
