Title: [102490] trunk
- Revision
- 102490
- Author
- dpra...@chromium.org
- Date
- 2011-12-09 16:41:40 -0800 (Fri, 09 Dec 2011)
Log Message
chromium win build: revert build_webkit_exes_from_webkit_gyp change
https://bugs.webkit.org/show_bug.cgi?id=74225
Source/WebKit/chromium:
Reviewed by Tony Chang.
This change sets build_webkit_exes_from_webkit_gyp back to 1;
the "All.gyp" solution doesn't work on windows.
* gyp_webkit:
Tools:
This change sets build_webkit_exes_from_webkit_gyp back to 1;
the "All.gyp" solution doesn't work on windows.
* Scripts/webkitdirs.pm:
(buildChromium):
Modified Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (102489 => 102490)
--- trunk/Source/WebKit/chromium/ChangeLog 2011-12-10 00:09:55 UTC (rev 102489)
+++ trunk/Source/WebKit/chromium/ChangeLog 2011-12-10 00:41:40 UTC (rev 102490)
@@ -1,5 +1,17 @@
2011-12-09 Dirk Pranke <dpra...@chromium.org>
+ chromium win build: revert build_webkit_exes_from_webkit_gyp change
+ https://bugs.webkit.org/show_bug.cgi?id=74225
+
+ Reviewed by Tony Chang.
+
+ This change sets build_webkit_exes_from_webkit_gyp back to 1;
+ the "All.gyp" solution doesn't work on windows.
+
+ * gyp_webkit:
+
+2011-12-09 Dirk Pranke <dpra...@chromium.org>
+
chromium: visual studio projects are busted when build_webkit_exes_from_webkit_gyp==0
https://bugs.webkit.org/show_bug.cgi?id=74212
Modified: trunk/Source/WebKit/chromium/gyp_webkit (102489 => 102490)
--- trunk/Source/WebKit/chromium/gyp_webkit 2011-12-10 00:09:55 UTC (rev 102489)
+++ trunk/Source/WebKit/chromium/gyp_webkit 2011-12-10 00:41:40 UTC (rev 102490)
@@ -120,7 +120,7 @@
'-Dv8_use_snapshot=false',
'-Dmsvs_use_common_release=0',
'-Ddisable_nacl=1',
- '-Dbuild_webkit_exes_from_webkit_gyp=0',
+ '-Dbuild_webkit_exes_from_webkit_gyp=1',
# WebKit doesn't use the chromium style checker.
'-Dmake_clang_dir=Source/WebKit/chromium/third_party/llvm-build/Release+Asserts',
@@ -130,7 +130,7 @@
'--depth=./',
# gyp file to execute.
- 'All.gyp'])
+ 'WebKit.gyp'])
print 'Updating webkit projects from gyp files...'
sys.stdout.flush()
Modified: trunk/Tools/ChangeLog (102489 => 102490)
--- trunk/Tools/ChangeLog 2011-12-10 00:09:55 UTC (rev 102489)
+++ trunk/Tools/ChangeLog 2011-12-10 00:41:40 UTC (rev 102490)
@@ -1,3 +1,14 @@
+2011-12-09 Dirk Pranke <dpra...@chromium.org>
+
+ chromium win build: revert build_webkit_exes_from_webkit_gyp change
+ https://bugs.webkit.org/show_bug.cgi?id=74225
+
+ This change sets build_webkit_exes_from_webkit_gyp back to 1;
+ the "All.gyp" solution doesn't work on windows.
+
+ * Scripts/webkitdirs.pm:
+ (buildChromium):
+
2011-12-09 Hugo Parente Lima <hugo.l...@openbossa.org>
[Qt] Click's count is limited to three continuous clicks.
Modified: trunk/Tools/Scripts/webkitdirs.pm (102489 => 102490)
--- trunk/Tools/Scripts/webkitdirs.pm 2011-12-10 00:09:55 UTC (rev 102489)
+++ trunk/Tools/Scripts/webkitdirs.pm 2011-12-10 00:41:40 UTC (rev 102490)
@@ -2081,10 +2081,10 @@
my $result = 1;
if (isDarwin() && !isChromiumAndroid() && !isChromiumMacMake()) {
# Mac build - builds the root xcode project.
- $result = buildXCodeProject("Source/WebKit/chromium/All", $clean, "-configuration", configuration(), @options);
+ $result = buildXCodeProject("Source/WebKit/chromium/WebKit", $clean, "-configuration", configuration(), @options);
} elsif (isCygwin() || isWindows()) {
# Windows build - builds the root visual studio solution.
- $result = buildChromiumVisualStudioProject("Source/WebKit/chromium/All.sln", $clean);
+ $result = buildChromiumVisualStudioProject("Source/WebKit/chromium/WebKit.sln", $clean);
} elsif (isLinux() || isChromiumAndroid() || isChromiumMacMake) {
# Linux build - build using make.
$result = buildChromiumMakefile("all", $clean, @options);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
