Title: [228480] trunk/Tools
- Revision
- 228480
- Author
- ross.kirsl...@sony.com
- Date
- 2018-02-14 12:31:50 -0800 (Wed, 14 Feb 2018)
Log Message
[Tools] --wincairo should imply --64-bit by default.
https://bugs.webkit.org/show_bug.cgi?id=182753
Reviewed by Daniel Bates.
WinCairo does not currently support 32-bit and `--wincairo` itself should refer to a working platform.
This patch ensures x64 is determined correctly for `build-webkit --no-ninja` and `run-webkit-tests`.
* Scripts/webkitdirs.pm:
(determinePassedArchitecture):
(shouldBuild32Bit):
(determineShouldBuild32Bit):
(determineIsWin64):
* Scripts/webkitpy/common/config/ports.py:
(WinCairoPort.build_webkit_command):
* Scripts/webkitpy/common/config/ports_unittest.py:
(DeprecatedPortTest.test_wincairo_port):
* Scripts/webkitpy/port/win.py:
(WinCairoPort):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (228479 => 228480)
--- trunk/Tools/ChangeLog 2018-02-14 20:17:30 UTC (rev 228479)
+++ trunk/Tools/ChangeLog 2018-02-14 20:31:50 UTC (rev 228480)
@@ -1,3 +1,25 @@
+2018-02-14 Ross Kirsling <ross.kirsl...@sony.com>
+
+ [Tools] --wincairo should imply --64-bit by default.
+ https://bugs.webkit.org/show_bug.cgi?id=182753
+
+ Reviewed by Daniel Bates.
+
+ WinCairo does not currently support 32-bit and `--wincairo` itself should refer to a working platform.
+ This patch ensures x64 is determined correctly for `build-webkit --no-ninja` and `run-webkit-tests`.
+
+ * Scripts/webkitdirs.pm:
+ (determinePassedArchitecture):
+ (shouldBuild32Bit):
+ (determineShouldBuild32Bit):
+ (determineIsWin64):
+ * Scripts/webkitpy/common/config/ports.py:
+ (WinCairoPort.build_webkit_command):
+ * Scripts/webkitpy/common/config/ports_unittest.py:
+ (DeprecatedPortTest.test_wincairo_port):
+ * Scripts/webkitpy/port/win.py:
+ (WinCairoPort):
+
2018-02-13 Commit Queue <commit-qu...@webkit.org>
Unreviewed, rolling out r228431.
Modified: trunk/Tools/Scripts/webkitdirs.pm (228479 => 228480)
--- trunk/Tools/Scripts/webkitdirs.pm 2018-02-14 20:17:30 UTC (rev 228479)
+++ trunk/Tools/Scripts/webkitdirs.pm 2018-02-14 20:31:50 UTC (rev 228480)
@@ -142,6 +142,7 @@
my $generateDsym;
my $isCMakeBuild;
my $isGenerateProjectOnly;
+my $shouldBuild32Bit;
my $isWin64;
my $isInspectorFrontend;
my $portName;
@@ -935,7 +936,7 @@
$searchedForPassedArchitecture = 1;
$passedArchitecture = undef;
- if (checkForArgumentAndRemoveFromARGV("--32-bit")) {
+ if (shouldBuild32Bit()) {
if (isAppleCocoaWebKit()) {
# PLATFORM_IOS: Don't run `arch` command inside Simulator environment
local %ENV = %ENV;
@@ -1233,6 +1234,18 @@
return portName() eq WinCairo;
}
+sub shouldBuild32Bit()
+{
+ determineShouldBuild32Bit();
+ return $shouldBuild32Bit;
+}
+
+sub determineShouldBuild32Bit()
+{
+ return if defined($shouldBuild32Bit);
+ $shouldBuild32Bit = checkForArgumentAndRemoveFromARGV("--32-bit");
+}
+
sub isWin64()
{
determineIsWin64();
@@ -1242,7 +1255,7 @@
sub determineIsWin64()
{
return if defined($isWin64);
- $isWin64 = checkForArgumentAndRemoveFromARGV("--64-bit");
+ $isWin64 = checkForArgumentAndRemoveFromARGV("--64-bit") || isWinCairo() && !shouldBuild32Bit();
}
sub determineIsWin64FromArchitecture($)
Modified: trunk/Tools/Scripts/webkitpy/common/config/ports.py (228479 => 228480)
--- trunk/Tools/Scripts/webkitpy/common/config/ports.py 2018-02-14 20:17:30 UTC (rev 228479)
+++ trunk/Tools/Scripts/webkitpy/common/config/ports.py 2018-02-14 20:31:50 UTC (rev 228480)
@@ -192,7 +192,6 @@
def build_webkit_command(self, build_style=None):
command = super(WinCairoPort, self).build_webkit_command(build_style=build_style)
command.append('--wincairo')
- command.append('--64-bit')
return command
def run_webkit_tests_command(self, build_style=None):
Modified: trunk/Tools/Scripts/webkitpy/common/config/ports_unittest.py (228479 => 228480)
--- trunk/Tools/Scripts/webkitpy/common/config/ports_unittest.py 2018-02-14 20:17:30 UTC (rev 228479)
+++ trunk/Tools/Scripts/webkitpy/common/config/ports_unittest.py 2018-02-14 20:31:50 UTC (rev 228480)
@@ -59,5 +59,5 @@
def test_wincairo_port(self):
self.assertEqual(WinCairoPort().flag(), "--port=wincairo")
self.assertEqual(WinCairoPort().run_webkit_tests_command(), DeprecatedPort().script_shell_command("run-webkit-tests") + ["--wincairo"])
- self.assertEqual(WinCairoPort().build_webkit_command(), DeprecatedPort().script_shell_command("build-webkit") + ["--wincairo", "--64-bit"])
- self.assertEqual(WinCairoPort().build_webkit_command(build_style="debug"), DeprecatedPort().script_shell_command("build-webkit") + ["--debug", "--wincairo", "--64-bit"])
+ self.assertEqual(WinCairoPort().build_webkit_command(), DeprecatedPort().script_shell_command("build-webkit") + ["--wincairo"])
+ self.assertEqual(WinCairoPort().build_webkit_command(build_style="debug"), DeprecatedPort().script_shell_command("build-webkit") + ["--debug", "--wincairo"])
Modified: trunk/Tools/Scripts/webkitpy/port/win.py (228479 => 228480)
--- trunk/Tools/Scripts/webkitpy/port/win.py 2018-02-14 20:17:30 UTC (rev 228479)
+++ trunk/Tools/Scripts/webkitpy/port/win.py 2018-02-14 20:31:50 UTC (rev 228480)
@@ -449,6 +449,8 @@
class WinCairoPort(WinPort):
port_name = "wincairo"
+ DEFAULT_ARCHITECTURE = 'x86_64'
+
TEST_PATH_SEPARATOR = os.sep
def default_baseline_search_path(self):
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
