Title: [223904] trunk
- Revision
- 223904
- Author
- [email protected]
- Date
- 2017-10-24 11:46:31 -0700 (Tue, 24 Oct 2017)
Log Message
[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 <[email protected]> on 2017-10-24
Reviewed by Yusuke Suzuki.
.:
* Source/cmake/OptionsJSCOnly.cmake:
Source/_javascript_Core:
* shell/PlatformJSCOnly.cmake: Added.
Tools:
* Scripts/build-jsc:
* Scripts/run-jsc-stress-tests:
Modified Paths
Added Paths
Diff
Modified: trunk/ChangeLog (223903 => 223904)
--- trunk/ChangeLog 2017-10-24 18:43:31 UTC (rev 223903)
+++ trunk/ChangeLog 2017-10-24 18:46:31 UTC (rev 223904)
@@ -1,3 +1,12 @@
+2017-10-24 Stephan Szabo <[email protected]>
+
+ [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 <[email protected]>
Turn on ccache for Mac cmake builds by default
Modified: trunk/Source/_javascript_Core/ChangeLog (223903 => 223904)
--- trunk/Source/_javascript_Core/ChangeLog 2017-10-24 18:43:31 UTC (rev 223903)
+++ trunk/Source/_javascript_Core/ChangeLog 2017-10-24 18:46:31 UTC (rev 223904)
@@ -1,3 +1,12 @@
+2017-10-24 Stephan Szabo <[email protected]>
+
+ [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 <[email protected]>
[JSC] modules can be visited more than once when resolving bindings through "star" exports as long as the exportName is different each time
Added: trunk/Source/_javascript_Core/shell/PlatformJSCOnly.cmake (0 => 223904)
--- trunk/Source/_javascript_Core/shell/PlatformJSCOnly.cmake (rev 0)
+++ trunk/Source/_javascript_Core/shell/PlatformJSCOnly.cmake 2017-10-24 18:46:31 UTC (rev 223904)
@@ -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 ()
Modified: trunk/Source/cmake/OptionsJSCOnly.cmake (223903 => 223904)
--- trunk/Source/cmake/OptionsJSCOnly.cmake 2017-10-24 18:43:31 UTC (rev 223903)
+++ trunk/Source/cmake/OptionsJSCOnly.cmake 2017-10-24 18:46:31 UTC (rev 223904)
@@ -53,6 +53,8 @@
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 @@
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)
Modified: trunk/Tools/ChangeLog (223903 => 223904)
--- trunk/Tools/ChangeLog 2017-10-24 18:43:31 UTC (rev 223903)
+++ trunk/Tools/ChangeLog 2017-10-24 18:46:31 UTC (rev 223904)
@@ -1,3 +1,13 @@
+2017-10-24 Stephan Szabo <[email protected]>
+
+ [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 <[email protected]>
<rdar://problem/35045445>
Modified: trunk/Tools/Scripts/build-jsc (223903 => 223904)
--- trunk/Tools/Scripts/build-jsc 2017-10-24 18:43:31 UTC (rev 223903)
+++ trunk/Tools/Scripts/build-jsc 2017-10-24 18:46:31 UTC (rev 223904)
@@ -143,7 +143,7 @@
$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
Modified: trunk/Tools/Scripts/run-jsc-stress-tests (223903 => 223904)
--- trunk/Tools/Scripts/run-jsc-stress-tests 2017-10-24 18:43:31 UTC (rev 223903)
+++ trunk/Tools/Scripts/run-jsc-stress-tests 2017-10-24 18:46:31 UTC (rev 223904)
@@ -1567,6 +1567,14 @@
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
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
