Title: [102280] trunk/Tools
- Revision
- 102280
- Author
- [email protected]
- Date
- 2011-12-07 16:12:46 -0800 (Wed, 07 Dec 2011)
Log Message
fix build-webkit --chromium after breakage in r102201
https://bugs.webkit.org/show_bug.cgi?id=74031
Reviewed by Tony Chang.
r102201 introduced a change to the chromium build that splits
the executables out of WebKit.gyp into other gyp files, and adds
a new "All.gyp" that builds everything. However, I forgot to
update the build script to use All.gyp.
* Scripts/webkitdirs.pm:
(buildChromium):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (102279 => 102280)
--- trunk/Tools/ChangeLog 2011-12-07 23:43:03 UTC (rev 102279)
+++ trunk/Tools/ChangeLog 2011-12-08 00:12:46 UTC (rev 102280)
@@ -1,3 +1,18 @@
+2011-12-07 Dirk Pranke <[email protected]>
+
+ fix build-webkit --chromium after breakage in r102201
+ https://bugs.webkit.org/show_bug.cgi?id=74031
+
+ Reviewed by Tony Chang.
+
+ r102201 introduced a change to the chromium build that splits
+ the executables out of WebKit.gyp into other gyp files, and adds
+ a new "All.gyp" that builds everything. However, I forgot to
+ update the build script to use All.gyp.
+
+ * Scripts/webkitdirs.pm:
+ (buildChromium):
+
2011-12-07 Tom Zakrajsek <[email protected]>
Moved myself to the committers list.
Modified: trunk/Tools/Scripts/webkitdirs.pm (102279 => 102280)
--- trunk/Tools/Scripts/webkitdirs.pm 2011-12-07 23:43:03 UTC (rev 102279)
+++ trunk/Tools/Scripts/webkitdirs.pm 2011-12-08 00:12:46 UTC (rev 102280)
@@ -2081,10 +2081,10 @@
my $result = 1;
if (isDarwin() && !isChromiumAndroid() && !isChromiumMacMake()) {
# Mac build - builds the root xcode project.
- $result = buildXCodeProject("Source/WebKit/chromium/WebKit", $clean, "-configuration", configuration(), @options);
+ $result = buildXCodeProject("Source/WebKit/chromium/All", $clean, "-configuration", configuration(), @options);
} elsif (isCygwin() || isWindows()) {
# Windows build - builds the root visual studio solution.
- $result = buildChromiumVisualStudioProject("Source/WebKit/chromium/WebKit.sln", $clean);
+ $result = buildChromiumVisualStudioProject("Source/WebKit/chromium/All.sln", $clean);
} elsif (isLinux() || isChromiumAndroid() || isChromiumMacMake) {
# Linux build - build using make.
$result = buildChromiumMakefile("all", $clean, @options);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
