[webkit-changes] [WebKit/WebKit] 21785f: [Win] Remove DLLLauncherMain.cpp
Fujii Hironori
noreply at github.com
Thu Jul 6 13:00:29 PDT 2023
Branch: refs/heads/main
Home: https://github.com/WebKit/WebKit
Commit: 21785f58f0ef78badabb6ab466a888bc5399cbf2
https://github.com/WebKit/WebKit/commit/21785f58f0ef78badabb6ab466a888bc5399cbf2
Author: Fujii Hironori <Hironori.Fujii at sony.com>
Date: 2023-07-06 (Thu, 06 Jul 2023)
Changed paths:
M Source/JavaScriptCore/jsc.cpp
R Source/JavaScriptCore/shell/DLLLauncherMain.cpp
M Source/JavaScriptCore/shell/PlatformWin.cmake
M Source/WebDriver/PlatformWin.cmake
M Source/WebDriver/WebDriverMain.cpp
M Source/cmake/WebKitMacros.cmake
M Tools/ImageDiff/ImageDiff.cpp
M Tools/ImageDiff/PlatformWin.cmake
M Tools/MiniBrowser/win/CMakeLists.txt
M Tools/MiniBrowser/win/Common.cpp
M Tools/MiniBrowser/win/WinMain.cpp
M Tools/Scripts/run-javascriptcore-tests
M Tools/Scripts/run-jsc
M Tools/Scripts/webkitdirs.pm
M Tools/Scripts/webkitpy/port/win.py
M Tools/TestWebKitAPI/PlatformWin.cmake
M Tools/TestWebKitAPI/win/main.cpp
M Tools/WebKitTestRunner/PlatformWin.cmake
M Tools/WebKitTestRunner/win/main.cpp
R Tools/win/DLLLauncher/DLLLauncherMain.cpp
Log Message:
-----------
[Win] Remove DLLLauncherMain.cpp
https://bugs.webkit.org/show_bug.cgi?id=253812
Reviewed by Don Olmstead.
We no longer need DLLLauncherMain.cpp since Apple Windows port was
removed. It made CMake scripts complicated and the missing required
DLL error message useless.
There are three ways to do it:
1. Copy all DLL files of WebKitRequirements to the output directory during the build process.
This makes the size of a built product archive big.
2. Runner scripts (run-webkit-tests and run-jsc etc) set PATH.
Apple ports do the same for DYLD_FRAMEWORK_PATH.
3. Windows port developers manually set PATH to "WebKitLibraries\win\bin64" before running executables.
As well as they had to set WEBKIT_LIBRARIES env var so far.
This patch takes approach #2.
* Source/JavaScriptCore/jsc.cpp:
(jscmain):
(dllLauncherEntryPoint): Deleted.
* Source/JavaScriptCore/shell/DLLLauncherMain.cpp: Removed.
* Source/JavaScriptCore/shell/PlatformWin.cmake:
* Source/WebDriver/PlatformWin.cmake:
* Source/WebDriver/WebDriverMain.cpp:
(main):
(dllLauncherEntryPoint): Deleted.
* Source/cmake/WebKitMacros.cmake:
* Tools/ImageDiff/ImageDiff.cpp:
(main):
(dllLauncherEntryPoint): Deleted.
* Tools/ImageDiff/PlatformWin.cmake:
* Tools/MiniBrowser/win/CMakeLists.txt:
* Tools/MiniBrowser/win/Common.cpp:
(DllMain): Deleted.
* Tools/MiniBrowser/win/WinMain.cpp:
(wWinMain):
(dllLauncherEntryPoint): Deleted.
* Tools/Scripts/run-javascriptcore-tests:
* Tools/Scripts/run-jsc:
* Tools/Scripts/webkitdirs.pm:
(setupWindowsWebKitEnvironment):
* Tools/Scripts/webkitpy/port/win.py:
(WinPort.setup_environ_for_server):
* Tools/TestWebKitAPI/PlatformWin.cmake:
* Tools/TestWebKitAPI/win/main.cpp:
(main):
(dllLauncherEntryPoint): Deleted.
* Tools/WebKitTestRunner/PlatformWin.cmake:
* Tools/WebKitTestRunner/win/main.cpp:
(main):
(dllLauncherEntryPoint): Deleted.
* Tools/win/DLLLauncher/DLLLauncherMain.cpp: Removed.
Canonical link: https://commits.webkit.org/265819@main
More information about the webkit-changes
mailing list