[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.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@233363 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index a3fc58d..66887b1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2018-06-29  Ross Kirsling  <ross.kirsling@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  <abarth@webkit.org>
 
         Switch OS(FUCHSIA) to using JSCOnly

diff --git a/Source/cmake/OptionsJSCOnly.cmake b/Source/cmake/OptionsJSCOnly.cmake
index aa307cd..f6d5631 100644 (file)
--- a/Source/cmake/OptionsJSCOnly.cmake
+++ b/Source/cmake/OptionsJSCOnly.cmake
@@ -73,8 +73,9 @@ if (WIN32)
         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 APPLE)
     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)

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index e576b85..4e02ddb 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,19 @@
+2018-06-29  Ross Kirsling  <ross.kirsling@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  <tsaunier@igalia.com>
 
         [GTK][WPE]: Add a way to setup our development environment inside flatpak

diff --git a/Tools/Scripts/build-jsc b/Tools/Scripts/build-jsc
index 27e8b13..f1def2a 100755 (executable)
--- a/Tools/Scripts/build-jsc
+++ b/Tools/Scripts/build-jsc
@@ -115,7 +115,7 @@ if ($showHelp) {
    exit 1;
 }
 
-if (isAppleWinWebKit()) {
+if (isAnyWindows()) {
     $ftlJIT = 0;
 }
 

diff --git a/Tools/Scripts/webkitdirs.pm b/Tools/Scripts/webkitdirs.pm
index e5c5914..dd4d240 100755 (executable)
--- a/Tools/Scripts/webkitdirs.pm
+++ b/Tools/Scripts/webkitdirs.pm
@@ -815,10 +815,10 @@ sub executableProductDir
     my $productDirectory = productDir();
 
     my $binaryDirectory;
-    if (isGtk() || isJSCOnly() || isWPE()) {
-        $binaryDirectory = "bin";
-    } elsif (isAnyWindows()) {
+    if (isAnyWindows()) {
         $binaryDirectory = isWin64() ? "bin64" : "bin32";
+    } elsif (isGtk() || isJSCOnly() || isWPE()) {
+        $binaryDirectory = "bin";
     } else {
         return $productDirectory;
     }
@@ -1296,7 +1296,7 @@ sub isWin64()
 sub determineIsWin64()
 {
     return if defined($isWin64);
-    $isWin64 = checkForArgumentAndRemoveFromARGV("--64-bit") || isWinCairo() && !shouldBuild32Bit();
+    $isWin64 = checkForArgumentAndRemoveFromARGV("--64-bit") || ((isWinCairo() || isJSCOnly()) && !shouldBuild32Bit());
 }
 
 sub determineIsWin64FromArchitecture($)