Changeset 228480 in webkit
- Timestamp:
- Feb 14, 2018 12:31:50 PM (6 years ago)
- Location:
- trunk/Tools
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Tools/ChangeLog
r228451 r228480 1 2018-02-14 Ross Kirsling <ross.kirsling@sony.com> 2 3 [Tools] --wincairo should imply --64-bit by default. 4 https://bugs.webkit.org/show_bug.cgi?id=182753 5 6 Reviewed by Daniel Bates. 7 8 WinCairo does not currently support 32-bit and `--wincairo` itself should refer to a working platform. 9 This patch ensures x64 is determined correctly for `build-webkit --no-ninja` and `run-webkit-tests`. 10 11 * Scripts/webkitdirs.pm: 12 (determinePassedArchitecture): 13 (shouldBuild32Bit): 14 (determineShouldBuild32Bit): 15 (determineIsWin64): 16 * Scripts/webkitpy/common/config/ports.py: 17 (WinCairoPort.build_webkit_command): 18 * Scripts/webkitpy/common/config/ports_unittest.py: 19 (DeprecatedPortTest.test_wincairo_port): 20 * Scripts/webkitpy/port/win.py: 21 (WinCairoPort): 22 1 23 2018-02-13 Commit Queue <commit-queue@webkit.org> 2 24 -
trunk/Tools/Scripts/webkitdirs.pm
r228106 r228480 143 143 my $isCMakeBuild; 144 144 my $isGenerateProjectOnly; 145 my $shouldBuild32Bit; 145 146 my $isWin64; 146 147 my $isInspectorFrontend; … … 936 937 937 938 $passedArchitecture = undef; 938 if ( checkForArgumentAndRemoveFromARGV("--32-bit")) {939 if (shouldBuild32Bit()) { 939 940 if (isAppleCocoaWebKit()) { 940 941 # PLATFORM_IOS: Don't run `arch` command inside Simulator environment … … 1234 1235 } 1235 1236 1237 sub shouldBuild32Bit() 1238 { 1239 determineShouldBuild32Bit(); 1240 return $shouldBuild32Bit; 1241 } 1242 1243 sub determineShouldBuild32Bit() 1244 { 1245 return if defined($shouldBuild32Bit); 1246 $shouldBuild32Bit = checkForArgumentAndRemoveFromARGV("--32-bit"); 1247 } 1248 1236 1249 sub isWin64() 1237 1250 { … … 1243 1256 { 1244 1257 return if defined($isWin64); 1245 $isWin64 = checkForArgumentAndRemoveFromARGV("--64-bit") ;1258 $isWin64 = checkForArgumentAndRemoveFromARGV("--64-bit") || isWinCairo() && !shouldBuild32Bit(); 1246 1259 } 1247 1260 -
trunk/Tools/Scripts/webkitpy/common/config/ports.py
r224560 r228480 193 193 command = super(WinCairoPort, self).build_webkit_command(build_style=build_style) 194 194 command.append('--wincairo') 195 command.append('--64-bit')196 195 return command 197 196 -
trunk/Tools/Scripts/webkitpy/common/config/ports_unittest.py
r224560 r228480 60 60 self.assertEqual(WinCairoPort().flag(), "--port=wincairo") 61 61 self.assertEqual(WinCairoPort().run_webkit_tests_command(), DeprecatedPort().script_shell_command("run-webkit-tests") + ["--wincairo"]) 62 self.assertEqual(WinCairoPort().build_webkit_command(), DeprecatedPort().script_shell_command("build-webkit") + ["--wincairo" , "--64-bit"])63 self.assertEqual(WinCairoPort().build_webkit_command(build_style="debug"), DeprecatedPort().script_shell_command("build-webkit") + ["--debug", "--wincairo" , "--64-bit"])62 self.assertEqual(WinCairoPort().build_webkit_command(), DeprecatedPort().script_shell_command("build-webkit") + ["--wincairo"]) 63 self.assertEqual(WinCairoPort().build_webkit_command(build_style="debug"), DeprecatedPort().script_shell_command("build-webkit") + ["--debug", "--wincairo"]) -
trunk/Tools/Scripts/webkitpy/port/win.py
r227427 r228480 450 450 port_name = "wincairo" 451 451 452 DEFAULT_ARCHITECTURE = 'x86_64' 453 452 454 TEST_PATH_SEPARATOR = os.sep 453 455
Note: See TracChangeset
for help on using the changeset viewer.