Title: [160475] branches/safari-537.74-branch/Tools
- Revision
- 160475
- Author
- [email protected]
- Date
- 2013-12-11 19:20:10 -0800 (Wed, 11 Dec 2013)
Log Message
Merged r156290. <rdar://problem/15498810>
Modified Paths
Diff
Modified: branches/safari-537.74-branch/Tools/ChangeLog (160474 => 160475)
--- branches/safari-537.74-branch/Tools/ChangeLog 2013-12-12 03:08:17 UTC (rev 160474)
+++ branches/safari-537.74-branch/Tools/ChangeLog 2013-12-12 03:20:10 UTC (rev 160475)
@@ -1,5 +1,21 @@
2013-12-11 Matthew Hanson <[email protected]>
+ Merged r156290.
+
+ 2013-09-23 Alex Christensen <[email protected]>
+
+ Added --64-bit option for Windows build.
+ https://bugs.webkit.org/show_bug.cgi?id=121799
+
+ Reviewed by Brent Fulgham.
+
+ * Scripts/webkitdirs.pm:
+ (determinePassedConfiguration): Add "|x64" for 64-bit configuration.
+ (isWin64): Added.
+ (determineIsWin64): Added.
+
+2013-12-11 Matthew Hanson <[email protected]>
+
Rollout r160469. Not rolling out from trunk because r160469 was
applied on the branch from a patch file.
Modified: branches/safari-537.74-branch/Tools/Scripts/webkitdirs.pm (160474 => 160475)
--- branches/safari-537.74-branch/Tools/Scripts/webkitdirs.pm 2013-12-12 03:08:17 UTC (rev 160474)
+++ branches/safari-537.74-branch/Tools/Scripts/webkitdirs.pm 2013-12-12 03:20:10 UTC (rev 160475)
@@ -94,6 +94,7 @@
my $isGtk;
my $isWinCE;
my $isWinCairo;
+my $isWin64;
my $isEfl;
my $isBlackBerry;
my $isInspectorFrontend;
@@ -621,18 +622,21 @@
splice(@ARGV, $i, 1);
$passedConfiguration = "Debug";
$passedConfiguration .= "_WinCairo" if (isWinCairo() && isCygwin());
+ $passedConfiguration .= "|x64" if isWin64();
return;
}
if ($opt =~ /^--release$/i) {
splice(@ARGV, $i, 1);
$passedConfiguration = "Release";
$passedConfiguration .= "_WinCairo" if (isWinCairo() && isCygwin());
+ $passedConfiguration .= "|x64" if isWin64();
return;
}
if ($opt =~ /^--profil(e|ing)$/i) {
splice(@ARGV, $i, 1);
$passedConfiguration = "Profiling";
$passedConfiguration .= "_WinCairo" if (isWinCairo() && isCygwin());
+ $passedConfiguration .= "|x64" if isWin64();
return;
}
}
@@ -1206,6 +1210,18 @@
$isWinCairo = checkForArgumentAndRemoveFromARGV("--wincairo");
}
+sub isWin64()
+{
+ determineIsWin64();
+ return $isWin64;
+}
+
+sub determineIsWin64()
+{
+ return if defined($isWin64);
+ $isWin64 = checkForArgumentAndRemoveFromARGV("--64-bit");
+}
+
sub isCygwin()
{
return ($^O eq "cygwin") || 0;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
