Title: [157716] trunk/Tools
- Revision
- 157716
- Author
- commit-qu...@webkit.org
- Date
- 2013-10-21 02:44:06 -0700 (Mon, 21 Oct 2013)
Log Message
[WinCairo] Build does not start.
https://bugs.webkit.org/show_bug.cgi?id=123059
Patch by pe...@outlook.com <pe...@outlook.com> on 2013-10-21
Reviewed by Csaba Osztrogonác.
The function isAppleWinWebKit() does no longer return true for WinCairo, need to add isWinCairo() checks instead.
* Scripts/build-webkit:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (157715 => 157716)
--- trunk/Tools/ChangeLog 2013-10-21 09:43:13 UTC (rev 157715)
+++ trunk/Tools/ChangeLog 2013-10-21 09:44:06 UTC (rev 157716)
@@ -1,3 +1,14 @@
+2013-10-21 pe...@outlook.com <pe...@outlook.com>
+
+ [WinCairo] Build does not start.
+ https://bugs.webkit.org/show_bug.cgi?id=123059
+
+ Reviewed by Csaba Osztrogonác.
+
+ The function isAppleWinWebKit() does no longer return true for WinCairo, need to add isWinCairo() checks instead.
+
+ * Scripts/build-webkit:
+
2013-10-21 Zan Dobersek <zdober...@igalia.com>
[Jhbuild] Bump the required Jhbuild revision
Modified: trunk/Tools/Scripts/build-webkit (157715 => 157716)
--- trunk/Tools/Scripts/build-webkit 2013-10-21 09:43:13 UTC (rev 157715)
+++ trunk/Tools/Scripts/build-webkit 2013-10-21 09:44:06 UTC (rev 157716)
@@ -162,7 +162,7 @@
my @projects = ("Source/_javascript_Core", "Source/WebCore", "Source/WebKit");
# Build WTF as a separate static library on ports which support it.
-splice @projects, 0, 0, "Source/WTF" if isAppleMacWebKit() or isAppleWinWebKit();
+splice @projects, 0, 0, "Source/WTF" if isAppleMacWebKit() or isAppleWinWebKit() or isWinCairo();
for my $dir (@projects) {
if (! -d $dir) {
@@ -277,7 +277,7 @@
push @local_options, XcodeCoverageSupportOptions() if $coverageSupport;
my $projectPath = $project =~ /gtest/ ? "xcode/gtest" : $project;
$result = buildXCodeProject($projectPath, $clean, @local_options, @ARGV);
- } elsif (isAppleWinWebKit()) {
+ } elsif (isAppleWinWebKit() || isWinCairo()) {
if ($project eq "WebKit") {
my $webkitSolutionPath = "WebKit.vcxproj/WebKit.sln";
$result = buildVisualStudioProject($webkitSolutionPath, $clean);
@@ -295,7 +295,7 @@
if (exitStatus($result)) {
my $scriptDir = relativeScriptsDir();
- if (isAppleWinWebKit()) {
+ if (isAppleWinWebKit() || isWinCairo()) {
print "\n\n===== BUILD FAILED ======\n\n";
print "Please ensure you have run $scriptDir/update-webkit to install dependencies.\n\n";
print "You can view build errors by checking the BuildLog.htm files located at:\n$baseProductDir/obj/<project>/<config>.\n";
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
