Title: [233363] trunk
- Revision
- 233363
- Author
- ross.kirsl...@sony.com
- Date
- 2018-06-29 10:55:24 -0700 (Fri, 29 Jun 2018)
Log Message
[JSCOnly] Restore Windows build.
https://bugs.webkit.org/show_bug.cgi?id=187127
Reviewed by Michael Catanzaro.
.:
* Source/cmake/OptionsJSCOnly.cmake:
Don't forget to set -DUCHAR_TYPE=wchar_t for ICU on Windows.
Use bin64/lib64 on Windows (for consistency with full WebKit build).
Tools:
* Scripts/build-jsc:
Fix condition for disabling FTL JIT on Windows.
* Scripts/webkitdirs.pm:
(executableProductDir):
JSCOnly should still use bin64 on Windows (for consistency with full WebKit build).
(determineIsWin64):
JSCOnly already defaults to 64-bit on Windows with Ninja -- ensure that this is true even with MSBuild.
Modified Paths
Diff
Modified: trunk/ChangeLog (233362 => 233363)
--- trunk/ChangeLog 2018-06-29 17:47:17 UTC (rev 233362)
+++ trunk/ChangeLog 2018-06-29 17:55:24 UTC (rev 233363)
@@ -1,3 +1,14 @@
+2018-06-29 Ross Kirsling <ross.kirsl...@sony.com>
+
+ [JSCOnly] Restore Windows build.
+ https://bugs.webkit.org/show_bug.cgi?id=187127
+
+ Reviewed by Michael Catanzaro.
+
+ * Source/cmake/OptionsJSCOnly.cmake:
+ Don't forget to set -DUCHAR_TYPE=wchar_t for ICU on Windows.
+ Use bin64/lib64 on Windows (for consistency with full WebKit build).
+
2018-06-28 Adam Barth <aba...@webkit.org>
Switch OS(FUCHSIA) to using JSCOnly
Modified: trunk/Source/cmake/OptionsJSCOnly.cmake (233362 => 233363)
--- trunk/Source/cmake/OptionsJSCOnly.cmake 2018-06-29 17:47:17 UTC (rev 233362)
+++ trunk/Source/cmake/OptionsJSCOnly.cmake 2018-06-29 17:55:24 UTC (rev 233363)
@@ -73,8 +73,9 @@
set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB32_PATHS OFF)
set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS ON)
+ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib64)
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib64)
- set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
+ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin64)
endif ()
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_DEBUG "${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}")
@@ -100,6 +101,9 @@
if (NOT WTF_OS_FUCHSIA)
# TODO: Add ICU on Fuchsia.
find_package(ICU REQUIRED)
+ if (WIN32)
+ add_definitions(-DUCHAR_TYPE=wchar_t)
+ endif ()
endif ()
else ()
add_definitions(-DU_DISABLE_RENAMING=1 -DU_SHOW_CPLUSPLUS_API=0)
Modified: trunk/Tools/ChangeLog (233362 => 233363)
--- trunk/Tools/ChangeLog 2018-06-29 17:47:17 UTC (rev 233362)
+++ trunk/Tools/ChangeLog 2018-06-29 17:55:24 UTC (rev 233363)
@@ -1,3 +1,19 @@
+2018-06-29 Ross Kirsling <ross.kirsl...@sony.com>
+
+ [JSCOnly] Restore Windows build.
+ https://bugs.webkit.org/show_bug.cgi?id=187127
+
+ Reviewed by Michael Catanzaro.
+
+ * Scripts/build-jsc:
+ Fix condition for disabling FTL JIT on Windows.
+
+ * Scripts/webkitdirs.pm:
+ (executableProductDir):
+ JSCOnly should still use bin64 on Windows (for consistency with full WebKit build).
+ (determineIsWin64):
+ JSCOnly already defaults to 64-bit on Windows with Ninja -- ensure that this is true even with MSBuild.
+
2018-06-29 Thibault Saunier <tsaun...@igalia.com>
[GTK][WPE]: Add a way to setup our development environment inside flatpak
Modified: trunk/Tools/Scripts/build-jsc (233362 => 233363)
--- trunk/Tools/Scripts/build-jsc 2018-06-29 17:47:17 UTC (rev 233362)
+++ trunk/Tools/Scripts/build-jsc 2018-06-29 17:55:24 UTC (rev 233363)
@@ -115,7 +115,7 @@
exit 1;
}
-if (isAppleWinWebKit()) {
+if (isAnyWindows()) {
$ftlJIT = 0;
}
Modified: trunk/Tools/Scripts/webkitdirs.pm (233362 => 233363)
--- trunk/Tools/Scripts/webkitdirs.pm 2018-06-29 17:47:17 UTC (rev 233362)
+++ trunk/Tools/Scripts/webkitdirs.pm 2018-06-29 17:55:24 UTC (rev 233363)
@@ -815,10 +815,10 @@
my $productDirectory = productDir();
my $binaryDirectory;
- if (isGtk() || isJSCOnly() || isWPE()) {
+ if (isAnyWindows()) {
+ $binaryDirectory = isWin64() ? "bin64" : "bin32";
+ } elsif (isGtk() || isJSCOnly() || isWPE()) {
$binaryDirectory = "bin";
- } elsif (isAnyWindows()) {
- $binaryDirectory = isWin64() ? "bin64" : "bin32";
} else {
return $productDirectory;
}
@@ -1296,7 +1296,7 @@
sub determineIsWin64()
{
return if defined($isWin64);
- $isWin64 = checkForArgumentAndRemoveFromARGV("--64-bit") || isWinCairo() && !shouldBuild32Bit();
+ $isWin64 = checkForArgumentAndRemoveFromARGV("--64-bit") || ((isWinCairo() || isJSCOnly()) && !shouldBuild32Bit());
}
sub determineIsWin64FromArchitecture($)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
