[Win][JSCOnly] Make jsconly build testapi and dlls and copy dlls when…

… running tests

https://bugs.webkit.org/show_bug.cgi?id=177279

Patch by Stephan Szabo <stephan.szabo@sony.com> on 2017-10-24
Reviewed by Yusuke Suzuki.

.:

* Source/cmake/OptionsJSCOnly.cmake:

Source/JavaScriptCore:

* shell/PlatformJSCOnly.cmake: Added.

Tools:

* Scripts/build-jsc:
* Scripts/run-jsc-stress-tests:

Canonical link: https://commits.webkit.org/194900@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@223904 268f45cc-cd09-0410-ab3c-d52691b4dbfc

ChangeLog

@@ -1,3 +1,12 @@
+2017-10-24  Stephan Szabo  <stephan.szabo@sony.com>
+
+        [Win][JSCOnly] Make jsconly build testapi and dlls and copy dlls when running tests
+        https://bugs.webkit.org/show_bug.cgi?id=177279
+
+        Reviewed by Yusuke Suzuki.
+
+        * Source/cmake/OptionsJSCOnly.cmake:
+
 2017-10-21  Tim Horton  <timothy_horton@apple.com>
 
         Turn on ccache for Mac cmake builds by default

Source/JavaScriptCore/ChangeLog

@@ -1,3 +1,12 @@
+2017-10-24  Stephan Szabo  <stephan.szabo@sony.com>
+
+        [Win][JSCOnly] Make jsconly build testapi and dlls and copy dlls when running tests
+        https://bugs.webkit.org/show_bug.cgi?id=177279
+
+        Reviewed by Yusuke Suzuki.
+
+        * shell/PlatformJSCOnly.cmake: Added.
+
 2017-10-15  Yusuke Suzuki  <utatane.tea@gmail.com>
 
         [JSC] modules can be visited more than once when resolving bindings through "star" exports as long as the exportName is different each time

Source/JavaScriptCore/shell/PlatformJSCOnly.cmake

@@ -0,0 +1,9 @@
+# FIXME: https://bugs.webkit.org/show_bug.cgi?id=178730
+# Make the Windows build and other builds work more similarly
+# rather than having a very different build process with
+# library/launcher on Windows and build directly into
+# executable elsewhere
+if (WIN32)
+    include(PlatformWin.cmake)
+    add_definitions(-DWIN_CAIRO)
+endif ()

Source/cmake/OptionsJSCOnly.cmake

@@ -53,6 +53,8 @@ endif ()
 
 if (WIN32)
     add_definitions(-DNOMINMAX)
+    add_definitions(-D_WINDOWS -DWINVER=0x601 -D_WIN32_WINNT=0x601)
+    add_definitions(-DUNICODE -D_UNICODE)
 
     if (NOT WEBKIT_LIBRARIES_DIR)
         if (DEFINED ENV{WEBKIT_LIBRARIES})
@@ -71,6 +73,13 @@ if (WIN32)
         set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib64)
         set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
     endif ()
+
+    set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_DEBUG "${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}")
+    set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELEASE "${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}")
+    set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_DEBUG "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}")
+    set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}")
+    set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}")
+    set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}")
 endif ()
 
 string(TOLOWER ${EVENT_LOOP_TYPE} LOWERCASE_EVENT_LOOP_TYPE)

Tools/ChangeLog

@@ -1,3 +1,13 @@
+2017-10-24  Stephan Szabo  <stephan.szabo@sony.com>
+
+        [Win][JSCOnly] Make jsconly build testapi and dlls and copy dlls when running tests
+        https://bugs.webkit.org/show_bug.cgi?id=177279
+
+        Reviewed by Yusuke Suzuki.
+
+        * Scripts/build-jsc:
+        * Scripts/run-jsc-stress-tests:
+
 2017-10-23  Lucas Forschler  <lforschler@apple.com>
 
         <rdar://problem/35045445>

Tools/Scripts/build-jsc

@@ -143,7 +143,7 @@ if (isCMakeBuild()) {
         $makeArgs .= ($makeArgs ? " " : "") . "-j" . numberOfCPUs() if $makeArgs !~ /-j\s*\d+/;
         $buildTarget = "jsc testb3 testair testapi $makeArgs";
     } elsif (canUseNinja()) {
-        $buildTarget .= "jsc testapi";
+        $buildTarget .= "jsc testapi testmasm";
     }
 
     # This call only returns if nothing wrong happened

Tools/Scripts/run-jsc-stress-tests

@@ -1567,6 +1567,14 @@ def prepareBundle
         if frameworkPath
             source = frameworkPath
             destination = Pathname.new(".vm")
+        elsif $hostOS == "windows"
+            # Make sure to copy dll along with jsc on Windows
+            source = [originalJSCPath] + Dir.glob(File.dirname(originalJSCPath) + "/jscLib.dll")
+            destination = $jscPath.dirname
+
+            Dir.chdir($outputDir) {
+                FileUtils.mkdir_p destination
+            }
         else
             source = originalJSCPath
             destination = $jscPath