Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (191074 => 191075)
--- trunk/Source/_javascript_Core/ChangeLog 2015-10-14 23:19:20 UTC (rev 191074)
+++ trunk/Source/_javascript_Core/ChangeLog 2015-10-15 00:11:54 UTC (rev 191075)
@@ -1,3 +1,15 @@
+2015-10-14 Brent Fulgham <bfulg...@apple.com>
+
+ [Win] Enforce launcher/library naming scheme
+ https://bugs.webkit.org/show_bug.cgi?id=150124
+
+ Reviewed by Alex Christensen.
+
+ * _javascript_Core.vcxproj/jsc/DLLLauncherMain.cpp: Look for
+ {name}Lib.dll instead of {name}.dll.
+ (wWinMain):
+ * shell/PlatformWin.cmake: Add 'Lib' suffix to DLLs.
+
2015-10-14 Keith Miller <keith_mil...@apple.com>
ES6 Fix TypedArray constructors.
Modified: trunk/Source/_javascript_Core/_javascript_Core.vcxproj/jsc/DLLLauncherMain.cpp (191074 => 191075)
--- trunk/Source/_javascript_Core/_javascript_Core.vcxproj/jsc/DLLLauncherMain.cpp 2015-10-14 23:19:20 UTC (rev 191074)
+++ trunk/Source/_javascript_Core/_javascript_Core.vcxproj/jsc/DLLLauncherMain.cpp 2015-10-15 00:11:54 UTC (rev 191075)
@@ -207,7 +207,7 @@
return 1;
// Load our corresponding DLL.
- wstring dllName = programName + L".dll";
+ wstring dllName = programName + L"Lib.dll";
if (!::PathRemoveFileSpecW(exePath))
return fatalError(programName, L"::PathRemoveFileSpecW failed: " + getLastErrorString(::GetLastError()));
if (!::PathAppendW(exePath, dllName.c_str()))
Modified: trunk/Source/_javascript_Core/shell/PlatformWin.cmake (191074 => 191075)
--- trunk/Source/_javascript_Core/shell/PlatformWin.cmake 2015-10-14 23:19:20 UTC (rev 191074)
+++ trunk/Source/_javascript_Core/shell/PlatformWin.cmake 2015-10-15 00:11:54 UTC (rev 191075)
@@ -7,7 +7,6 @@
target_link_libraries(jscLib ${JSC_LIBRARIES})
set_target_properties(jscLib PROPERTIES FOLDER "_javascript_Core")
-set_target_properties(jscLib PROPERTIES OUTPUT_NAME "jsc${DEBUG_SUFFIX}")
if (${WTF_PLATFORM_WIN_CAIRO})
add_definitions(-DWIN_CAIRO)
@@ -21,7 +20,6 @@
add_library(testRegExpLib SHARED ../testRegExp.cpp)
set_target_properties(testRegExpLib PROPERTIES FOLDER "_javascript_Core")
-set_target_properties(testRegExpLib PROPERTIES OUTPUT_NAME "testRegExp${DEBUG_SUFFIX}")
add_executable(testRegExp ${JSC_SOURCES})
set_target_properties(testRegExp PROPERTIES OUTPUT_NAME "testRegExp${DEBUG_SUFFIX}")
target_link_libraries(testRegExp shlwapi)
@@ -39,7 +37,6 @@
set_source_files_properties(../API/tests/CustomGlobalObjectClassTest.c PROPERTIES COMPILE_FLAGS "/TP /MT")
set_source_files_properties(../API/tests/testapi.c PROPERTIES COMPILE_FLAGS "/TP /MT")
set_target_properties(testapiLib PROPERTIES FOLDER "_javascript_Core")
-set_target_properties(testapiLib PROPERTIES OUTPUT_NAME "testapi${DEBUG_SUFFIX}")
add_executable(testapi ${JSC_SOURCES})
set_target_properties(testapi PROPERTIES OUTPUT_NAME "testapi${DEBUG_SUFFIX}")
target_link_libraries(testapi shlwapi)
Modified: trunk/Tools/ChangeLog (191074 => 191075)
--- trunk/Tools/ChangeLog 2015-10-14 23:19:20 UTC (rev 191074)
+++ trunk/Tools/ChangeLog 2015-10-15 00:11:54 UTC (rev 191075)
@@ -1,3 +1,17 @@
+2015-10-14 Brent Fulgham <bfulg...@apple.com>
+
+ [Win] Enforce launcher/library naming scheme
+ https://bugs.webkit.org/show_bug.cgi?id=150124
+
+ Reviewed by Alex Christensen.
+
+ * DumpRenderTree/PlatformWin.cmake: Use 'Lib' suffix for DLLs.
+ * MiniBrowser/win/CMakeLists.txt: Ditto.
+ * TestWebKitAPI/PlatformWin.cmake: Ditto.
+ * win/DLLLauncher/DLLLauncherMain.cpp:
+ (wWinMain): Look for a DLL named {name}Lib.dll, rather than the
+ original {name}.dll.
+
2015-10-14 Andreas Kling <akl...@apple.com>
REGRESSION(r190882): Concatenating a character array and an empty string is broken.
Modified: trunk/Tools/DumpRenderTree/PlatformWin.cmake (191074 => 191075)
--- trunk/Tools/DumpRenderTree/PlatformWin.cmake 2015-10-14 23:19:20 UTC (rev 191074)
+++ trunk/Tools/DumpRenderTree/PlatformWin.cmake 2015-10-15 00:11:54 UTC (rev 191075)
@@ -125,7 +125,6 @@
add_library(DumpRenderTreeLib SHARED ${DumpRenderTreeLib_SOURCES})
set_target_properties(DumpRenderTreeLib PROPERTIES FOLDER "Tools")
-set_target_properties(DumpRenderTreeLib PROPERTIES OUTPUT_NAME "DumpRenderTree")
target_link_libraries(DumpRenderTreeLib ${DumpRenderTreeLib_LIBRARIES})
add_executable(ImageDiff ${TOOLS_DIR}/win/DLLLauncher/DLLLauncherMain.cpp)
@@ -135,7 +134,6 @@
add_library(ImageDiffLib SHARED ${ImageDiff_SOURCES})
set_target_properties(ImageDiffLib PROPERTIES FOLDER "Tools")
-set_target_properties(ImageDiffLib PROPERTIES OUTPUT_NAME "ImageDiff")
target_link_libraries(ImageDiffLib ${ImageDiff_LIBRARIES})
add_dependencies(ImageDiff ImageDiffLib)
Modified: trunk/Tools/MiniBrowser/win/CMakeLists.txt (191074 => 191075)
--- trunk/Tools/MiniBrowser/win/CMakeLists.txt 2015-10-14 23:19:20 UTC (rev 191074)
+++ trunk/Tools/MiniBrowser/win/CMakeLists.txt 2015-10-15 00:11:54 UTC (rev 191075)
@@ -56,7 +56,6 @@
add_library(MiniBrowserLib SHARED ${MiniBrowser_SOURCES})
target_link_libraries(MiniBrowserLib ${MiniBrowser_LIBRARIES})
set_target_properties(MiniBrowserLib PROPERTIES FOLDER "Tools")
-set_target_properties(MiniBrowserLib PROPERTIES OUTPUT_NAME "MiniBrowser")
add_executable(MiniBrowser WIN32 ${TOOLS_DIR}/win/DLLLauncher/DLLLauncherMain.cpp ../MiniBrowser.vcxproj/MiniBrowser.rc)
target_link_libraries(MiniBrowser shlwapi)
Modified: trunk/Tools/TestWebKitAPI/PlatformWin.cmake (191074 => 191075)
--- trunk/Tools/TestWebKitAPI/PlatformWin.cmake 2015-10-14 23:19:20 UTC (rev 191074)
+++ trunk/Tools/TestWebKitAPI/PlatformWin.cmake 2015-10-15 00:11:54 UTC (rev 191075)
@@ -82,7 +82,7 @@
${test_main_SOURCES}
${TestWTF_SOURCES}
)
-set_target_properties(TestWTFLib PROPERTIES OUTPUT_NAME "TestWTF")
+set_target_properties(TestWTFLib PROPERTIES OUTPUT_NAME "TestWTFLib")
target_link_libraries(TestWTFLib ${test_wtf_LIBRARIES})
set(test_wtf_LIBRARIES
@@ -96,7 +96,7 @@
)
target_link_libraries(TestWebCoreLib ${test_webcore_LIBRARIES})
-set_target_properties(TestWebCoreLib PROPERTIES OUTPUT_NAME "TestWebCore")
+set_target_properties(TestWebCoreLib PROPERTIES OUTPUT_NAME "TestWebCoreLib")
add_executable(TestWebCore
${TOOLS_DIR}/win/DLLLauncher/DLLLauncherMain.cpp
@@ -115,7 +115,6 @@
)
target_link_libraries(TestWebKitLib ${test_webcore_LIBRARIES})
-set_target_properties(TestWebKitLib PROPERTIES OUTPUT_NAME "TestWebKit")
add_executable(TestWebKit
${TOOLS_DIR}/win/DLLLauncher/DLLLauncherMain.cpp
Modified: trunk/Tools/win/DLLLauncher/DLLLauncherMain.cpp (191074 => 191075)
--- trunk/Tools/win/DLLLauncher/DLLLauncherMain.cpp 2015-10-14 23:19:20 UTC (rev 191074)
+++ trunk/Tools/win/DLLLauncher/DLLLauncherMain.cpp 2015-10-15 00:11:54 UTC (rev 191075)
@@ -236,7 +236,7 @@
return 1;
// Load our corresponding DLL.
- wstring dllName = programName + L".dll";
+ wstring dllName = programName + L"Lib.dll";
if (!::PathRemoveFileSpecW(exePath))
return fatalError(programName, L"::PathRemoveFileSpecW failed: " + getLastErrorString(::GetLastError()));
if (!::PathAppendW(exePath, dllName.c_str()))
