[Win] Enforce launcher/library naming scheme
authorbfulgham@apple.com <bfulgham@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 15 Oct 2015 00:11:54 +0000 (00:11 +0000)
committerbfulgham@apple.com <bfulgham@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 15 Oct 2015 00:11:54 +0000 (00:11 +0000)
https://bugs.webkit.org/show_bug.cgi?id=150124

Reviewed by Alex Christensen.

Source/JavaScriptCore:

* JavaScriptCore.vcxproj/jsc/DLLLauncherMain.cpp: Look for
{name}Lib.dll instead of {name}.dll.
(wWinMain):
* shell/PlatformWin.cmake: Add 'Lib' suffix to DLLs.

Tools:

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

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

Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/JavaScriptCore.vcxproj/jsc/DLLLauncherMain.cpp
Source/JavaScriptCore/shell/PlatformWin.cmake
Tools/ChangeLog
Tools/DumpRenderTree/PlatformWin.cmake
Tools/MiniBrowser/win/CMakeLists.txt
Tools/TestWebKitAPI/PlatformWin.cmake
Tools/win/DLLLauncher/DLLLauncherMain.cpp

index 8ef1d30..b0a8baf 100644 (file)
@@ -1,3 +1,15 @@
+2015-10-14  Brent Fulgham  <bfulgham@apple.com>
+
+        [Win] Enforce launcher/library naming scheme
+        https://bugs.webkit.org/show_bug.cgi?id=150124
+
+        Reviewed by Alex Christensen.
+
+        * JavaScriptCore.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_miller@apple.com>
 
         ES6 Fix TypedArray constructors.
index e2359a2..66c1739 100644 (file)
@@ -207,7 +207,7 @@ int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpstrCm
         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()))
index ca50e98..0304595 100644 (file)
@@ -7,7 +7,6 @@ list(APPEND JSC_LIBRARIES
 
 target_link_libraries(jscLib ${JSC_LIBRARIES})
 set_target_properties(jscLib PROPERTIES FOLDER "JavaScriptCore")
-set_target_properties(jscLib PROPERTIES OUTPUT_NAME "jsc${DEBUG_SUFFIX}")
 
 if (${WTF_PLATFORM_WIN_CAIRO})
     add_definitions(-DWIN_CAIRO)
@@ -21,7 +20,6 @@ set(JSC_OUTPUT_NAME "jsc${DEBUG_SUFFIX}")
 
 add_library(testRegExpLib SHARED ../testRegExp.cpp)
 set_target_properties(testRegExpLib PROPERTIES FOLDER "JavaScriptCore")
-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 @@ add_library(testapiLib SHARED
 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 "JavaScriptCore")
-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)
index 68f495a..eab6c2d 100644 (file)
@@ -1,3 +1,17 @@
+2015-10-14  Brent Fulgham  <bfulgham@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  <akling@apple.com>
 
         REGRESSION(r190882): Concatenating a character array and an empty string is broken.
index e860096..5b1423c 100644 (file)
@@ -125,7 +125,6 @@ add_definitions(-DUSE_CONSOLE_ENTRY_POINT)
 
 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 @@ set_target_properties(ImageDiff PROPERTIES OUTPUT_NAME "ImageDiff")
 
 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)
index 55b3a6b..a13f16f 100644 (file)
@@ -56,7 +56,6 @@ include_directories(${MiniBrowser_INCLUDE_DIRECTORIES})
 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)
index be4ae34..39f9807 100644 (file)
@@ -82,7 +82,7 @@ add_library(TestWTFLib SHARED
     ${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 @@ add_library(TestWebCoreLib SHARED
 )
 
 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 @@ add_library(TestWebKitLib SHARED
 )
 
 target_link_libraries(TestWebKitLib ${test_webcore_LIBRARIES})
-set_target_properties(TestWebKitLib PROPERTIES OUTPUT_NAME "TestWebKit")
 
 add_executable(TestWebKit
     ${TOOLS_DIR}/win/DLLLauncher/DLLLauncherMain.cpp
index a48e336..1d6d84f 100644 (file)
@@ -236,7 +236,7 @@ int WINAPI wWinMain(_In_ HINSTANCE hInstance, _In_opt_ HINSTANCE hPrevInstance,
         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()))