Fix Tools build on case sensitive file systems
authorossy@webkit.org <ossy@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 9 Nov 2016 16:52:09 +0000 (16:52 +0000)
committerossy@webkit.org <ossy@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 9 Nov 2016 16:52:09 +0000 (16:52 +0000)
https://bugs.webkit.org/show_bug.cgi?id=164474

Unreviewed buildfix.

* DumpRenderTree/CMakeLists.txt:
* DumpRenderTree/PlatformMac.cmake:
* DumpRenderTree/PlatformWin.cmake:
* DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt:
* MiniBrowser/mac/CMakeLists.txt:

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

Tools/ChangeLog
Tools/DumpRenderTree/CMakeLists.txt
Tools/DumpRenderTree/PlatformMac.cmake
Tools/DumpRenderTree/PlatformWin.cmake
Tools/DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt
Tools/MiniBrowser/mac/CMakeLists.txt

index 2a07d82..745a0bd 100644 (file)
@@ -1,3 +1,16 @@
+2016-11-09  Csaba Osztrogon√°c  <ossy@webkit.org>
+
+        Fix Tools build on case sensitive file systems
+        https://bugs.webkit.org/show_bug.cgi?id=164474
+
+        Unreviewed buildfix.
+
+        * DumpRenderTree/CMakeLists.txt:
+        * DumpRenderTree/PlatformMac.cmake:
+        * DumpRenderTree/PlatformWin.cmake:
+        * DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt:
+        * MiniBrowser/mac/CMakeLists.txt:
+
 2016-11-04  Filip Pizlo  <fpizlo@apple.com>
 
         WTF::ParkingLot should stop using std::chrono because std::chrono::duration casts are prone to overflows
index dc8420d..33f5252 100644 (file)
@@ -81,36 +81,36 @@ set(DumpRenderTree_INCLUDE_DIRECTORIES
     ${WEBCORE_DIR}/testing/js
 )
 
-set(TestNetscapePlugin_SOURCES
-    TestNetscapePlugin/PluginObject.cpp
-    TestNetscapePlugin/PluginTest.cpp
-    TestNetscapePlugin/TestObject.cpp
-    TestNetscapePlugin/main.cpp
+set(TestNetscapePlugIn_SOURCES
+    TestNetscapePlugIn/PluginObject.cpp
+    TestNetscapePlugIn/PluginTest.cpp
+    TestNetscapePlugIn/TestObject.cpp
+    TestNetscapePlugIn/main.cpp
 
-    TestNetscapePlugin/Tests/DocumentOpenInDestroyStream.cpp
-    TestNetscapePlugin/Tests/EvaluateJSAfterRemovingPluginElement.cpp
-    TestNetscapePlugin/Tests/FormValue.cpp
-    TestNetscapePlugin/Tests/GetURLNotifyWithURLThatFailsToLoad.cpp
-    TestNetscapePlugin/Tests/GetURLWithJavaScriptURL.cpp
-    TestNetscapePlugin/Tests/GetURLWithJavaScriptURLDestroyingPlugin.cpp
-    TestNetscapePlugin/Tests/GetUserAgentWithNullNPPFromNPPNew.cpp
-    TestNetscapePlugin/Tests/LogNPPSetWindow.cpp
-    TestNetscapePlugin/Tests/NPDeallocateCalledBeforeNPShutdown.cpp
-    TestNetscapePlugin/Tests/NPPNewFails.cpp
-    TestNetscapePlugin/Tests/NPPSetWindowCalledDuringDestruction.cpp
-    TestNetscapePlugin/Tests/NPRuntimeCallsWithNullNPP.cpp
-    TestNetscapePlugin/Tests/NPRuntimeObjectFromDestroyedPlugin.cpp
-    TestNetscapePlugin/Tests/NPRuntimeRemoveProperty.cpp
-    TestNetscapePlugin/Tests/NullNPPGetValuePointer.cpp
-    TestNetscapePlugin/Tests/PassDifferentNPPStruct.cpp
-    TestNetscapePlugin/Tests/PluginScriptableNPObjectInvokeDefault.cpp
-    TestNetscapePlugin/Tests/PluginScriptableObjectOverridesAllProperties.cpp
-    TestNetscapePlugin/Tests/PrivateBrowsing.cpp
-    TestNetscapePlugin/Tests/ToStringAndValueOfObject.cpp
-    TestNetscapePlugin/Tests/URLRedirect.cpp
+    TestNetscapePlugIn/Tests/DocumentOpenInDestroyStream.cpp
+    TestNetscapePlugIn/Tests/EvaluateJSAfterRemovingPluginElement.cpp
+    TestNetscapePlugIn/Tests/FormValue.cpp
+    TestNetscapePlugIn/Tests/GetURLNotifyWithURLThatFailsToLoad.cpp
+    TestNetscapePlugIn/Tests/GetURLWithJavaScriptURL.cpp
+    TestNetscapePlugIn/Tests/GetURLWithJavaScriptURLDestroyingPlugin.cpp
+    TestNetscapePlugIn/Tests/GetUserAgentWithNullNPPFromNPPNew.cpp
+    TestNetscapePlugIn/Tests/LogNPPSetWindow.cpp
+    TestNetscapePlugIn/Tests/NPDeallocateCalledBeforeNPShutdown.cpp
+    TestNetscapePlugIn/Tests/NPPNewFails.cpp
+    TestNetscapePlugIn/Tests/NPPSetWindowCalledDuringDestruction.cpp
+    TestNetscapePlugIn/Tests/NPRuntimeCallsWithNullNPP.cpp
+    TestNetscapePlugIn/Tests/NPRuntimeObjectFromDestroyedPlugin.cpp
+    TestNetscapePlugIn/Tests/NPRuntimeRemoveProperty.cpp
+    TestNetscapePlugIn/Tests/NullNPPGetValuePointer.cpp
+    TestNetscapePlugIn/Tests/PassDifferentNPPStruct.cpp
+    TestNetscapePlugIn/Tests/PluginScriptableNPObjectInvokeDefault.cpp
+    TestNetscapePlugIn/Tests/PluginScriptableObjectOverridesAllProperties.cpp
+    TestNetscapePlugIn/Tests/PrivateBrowsing.cpp
+    TestNetscapePlugIn/Tests/ToStringAndValueOfObject.cpp
+    TestNetscapePlugIn/Tests/URLRedirect.cpp
 )
 
-set(TestNetscapePlugin_LIBRARIES
+set(TestNetscapePlugIn_LIBRARIES
     JavaScriptCore
     WTF
     WebCoreTestSupport
@@ -138,8 +138,8 @@ target_link_libraries(DumpRenderTree ${DumpRenderTree_LIBRARIES})
 add_dependencies(DumpRenderTree DumpRenderTreeBindings)
 
 if (ENABLE_NETSCAPE_PLUGIN_API)
-    add_library(TestNetscapePlugin SHARED ${TestNetscapePlugin_SOURCES})
-    target_link_libraries(TestNetscapePlugin ${TestNetscapePlugin_LIBRARIES})
+    add_library(TestNetscapePlugIn SHARED ${TestNetscapePlugIn_SOURCES})
+    target_link_libraries(TestNetscapePlugIn ${TestNetscapePlugIn_LIBRARIES})
 endif ()
 
 if (WIN32)
index 0262387..24e8d64 100644 (file)
@@ -12,7 +12,7 @@ set(WEBKITSYSTEMINTERFACE_LIBRARY libWebKitSystemInterfaceElCapitan.a)
 endif ()
 link_directories(../../WebKitLibraries)
 
-list(APPEND TestNetscapePlugin_LIBRARIES
+list(APPEND TestNetscapePlugIn_LIBRARIES
     ${QUARTZ_LIBRARY}
     WebKit2
 )
@@ -47,18 +47,18 @@ list(APPEND DumpRenderTree_INCLUDE_DIRECTORIES
     ${WTF_DIR}/icu
 )
 
-# Common ${TestNetscapePlugin_SOURCES} from CMakeLists.txt are C++ source files.
-list(APPEND TestNetscapePlugin_Cpp_SOURCES
-    ${TestNetscapePlugin_SOURCES}
+# Common ${TestNetscapePlugIn_SOURCES} from CMakeLists.txt are C++ source files.
+list(APPEND TestNetscapePlugIn_Cpp_SOURCES
+    ${TestNetscapePlugIn_SOURCES}
 )
 
-list(APPEND TestNetscapePlugin_ObjCpp_SOURCES
+list(APPEND TestNetscapePlugIn_ObjCpp_SOURCES
     TestNetscapePlugIn/PluginObjectMac.mm
 )
 
-set(TestNetscapePlugin_SOURCES
-    ${TestNetscapePlugin_Cpp_SOURCES}
-    ${TestNetscapePlugin_ObjCpp_SOURCES}
+set(TestNetscapePlugIn_SOURCES
+    ${TestNetscapePlugIn_Cpp_SOURCES}
+    ${TestNetscapePlugIn_ObjCpp_SOURCES}
 )
 
 # Common ${DumpRenderTree_SOURCES} from CMakeLists.txt are C++ source files.
@@ -124,11 +124,11 @@ foreach (_file ${DumpRenderTree_ObjC_SOURCES})
     set_source_files_properties(${_file} PROPERTIES COMPILE_FLAGS "-std=c99")
 endforeach ()
 
-foreach (_file ${DumpRenderTree_Cpp_SOURCES} ${TestNetscapePlugin_Cpp_SOURCES})
+foreach (_file ${DumpRenderTree_Cpp_SOURCES} ${TestNetscapePlugIn_Cpp_SOURCES})
     set_source_files_properties(${_file} PROPERTIES COMPILE_FLAGS "-std=c++14")
 endforeach ()
 
-foreach (_file ${DumpRenderTree_ObjCpp_SOURCES} ${TestNetscapePlugin_ObjCpp_SOURCES})
+foreach (_file ${DumpRenderTree_ObjCpp_SOURCES} ${TestNetscapePlugIn_ObjCpp_SOURCES})
     set_source_files_properties(${_file} PROPERTIES COMPILE_FLAGS "-ObjC++ -std=c++14")
 endforeach ()
 
index 9eb6d85..75ea5ac 100644 (file)
@@ -23,7 +23,7 @@ set(DumpRenderTreeLib_SOURCES
     win/WorkQueueItemWin.cpp
 )
 
-list(APPEND TestNetscapePlugin_LIBRARIES
+list(APPEND TestNetscapePlugIn_LIBRARIES
     WebKit
 )
 
@@ -31,28 +31,28 @@ set(DumpRenderTree_SOURCES
     ${TOOLS_DIR}/win/DLLLauncher/DLLLauncherMain.cpp
 )
 
-list(APPEND TestNetscapePlugin_SOURCES
+list(APPEND TestNetscapePlugIn_SOURCES
     win/TestNetscapePlugin.def
     win/TestNetscapePlugin.rc
 
-    TestNetscapePlugin/Tests/win/CallJSThatDestroysPlugin.cpp
-    TestNetscapePlugin/Tests/win/DrawsGradient.cpp
-    TestNetscapePlugin/Tests/win/DumpWindowRect.cpp
-    TestNetscapePlugin/Tests/win/GetValueNetscapeWindow.cpp
-    TestNetscapePlugin/Tests/win/NPNInvalidateRectInvalidatesWindow.cpp
-    TestNetscapePlugin/Tests/win/WindowGeometryInitializedBeforeSetWindow.cpp
-    TestNetscapePlugin/Tests/win/WindowRegionIsSetToClipRect.cpp
-    TestNetscapePlugin/Tests/win/WindowlessPaintRectCoordinates.cpp
-
-    TestNetscapePlugin/win/WindowGeometryTest.cpp
-    TestNetscapePlugin/win/WindowedPluginTest.cpp
+    TestNetscapePlugIn/Tests/win/CallJSThatDestroysPlugin.cpp
+    TestNetscapePlugIn/Tests/win/DrawsGradient.cpp
+    TestNetscapePlugIn/Tests/win/DumpWindowRect.cpp
+    TestNetscapePlugIn/Tests/win/GetValueNetscapeWindow.cpp
+    TestNetscapePlugIn/Tests/win/NPNInvalidateRectInvalidatesWindow.cpp
+    TestNetscapePlugIn/Tests/win/WindowGeometryInitializedBeforeSetWindow.cpp
+    TestNetscapePlugIn/Tests/win/WindowRegionIsSetToClipRect.cpp
+    TestNetscapePlugIn/Tests/win/WindowlessPaintRectCoordinates.cpp
+
+    TestNetscapePlugIn/win/WindowGeometryTest.cpp
+    TestNetscapePlugIn/win/WindowedPluginTest.cpp
 )
 
 if (${WTF_PLATFORM_WIN_CAIRO})
     add_definitions(-DWIN_CAIRO)
 endif ()
 
-list(APPEND TestNetscapePlugin_LIBRARIES
+list(APPEND TestNetscapePlugIn_LIBRARIES
     Msimg32
     Shlwapi
     WebKit
@@ -70,11 +70,11 @@ set(ImageDiff_LIBRARIES
 
 list(APPEND DumpRenderTree_INCLUDE_DIRECTORIES
     win
-    TestNetscapePlugin
-    TestNetscapePlugin/ForwardingHeaders
-    TestNetscapePlugin/Tests
-    TestNetscapePlugin/win
-    TestNetscapePlugin/Tests/win
+    TestNetscapePlugIn
+    TestNetscapePlugIn/ForwardingHeaders
+    TestNetscapePlugIn/Tests
+    TestNetscapePlugIn/win
+    TestNetscapePlugIn/Tests/win
     ${WEBKIT_DIR}/win
     ${DERIVED_SOURCES_DIR}/WebKit/Interfaces
 )
index c431667..a5391b5 100644 (file)
@@ -1,6 +1,6 @@
 set(WEBKIT_TESTNETSCAPEPLUGIN_DIR "${TOOLS_DIR}/DumpRenderTree/TestNetscapePlugIn")
 
-set(WebKitTestNetscapePlugin_SOURCES
+set(WebKitTestNetscapePlugIn_SOURCES
     ${WEBKIT_TESTNETSCAPEPLUGIN_DIR}/PluginObject.cpp
     ${WEBKIT_TESTNETSCAPEPLUGIN_DIR}/PluginTest.cpp
     ${WEBKIT_TESTNETSCAPEPLUGIN_DIR}/TestObject.cpp
@@ -30,21 +30,21 @@ set(WebKitTestNetscapePlugin_SOURCES
     ${WEBKIT_TESTNETSCAPEPLUGIN_DIR}/Tests/x11/CallInvalidateRectWithNullNPPArgument.cpp
 )
 
-set(WebKitTestNetscapePlugin_INCLUDE_DIRECTORIES
+set(WebKitTestNetscapePlugIn_INCLUDE_DIRECTORIES
     ${WEBKIT_TESTNETSCAPEPLUGIN_DIR}
     ${WEBKIT_TESTNETSCAPEPLUGIN_DIR}/ForwardingHeaders
     ${WEBCORE_DIR}
     ${WTF_DIR}
 )
 
-set(WebKitTestNetscapePlugin_SYSTEM_INCLUDE_DIRECTORIES
+set(WebKitTestNetscapePlugIn_SYSTEM_INCLUDE_DIRECTORIES
     ${X11_INCLUDE_DIR}
 )
 
-include_directories(${WebKitTestNetscapePlugin_INCLUDE_DIRECTORIES})
-include_directories(SYSTEM ${WebKitTestNetscapePlugin_SYSTEM_INCLUDE_DIRECTORIES})
+include_directories(${WebKitTestNetscapePlugIn_INCLUDE_DIRECTORIES})
+include_directories(SYSTEM ${WebKitTestNetscapePlugIn_SYSTEM_INCLUDE_DIRECTORIES})
 
-set(WebKitTestNetscapePlugin_LIBRARIES
+set(WebKitTestNetscapePlugIn_LIBRARIES
     ${X11_LIBRARIES}
 )
 
@@ -52,10 +52,10 @@ if (WTF_OS_UNIX)
     add_definitions(-DXP_UNIX)
 endif ()
 
-add_library(TestNetscapePlugin SHARED ${WebKitTestNetscapePlugin_SOURCES})
-target_link_libraries(TestNetscapePlugin ${WebKitTestNetscapePlugin_LIBRARIES})
-set_target_properties(TestNetscapePlugin PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/plugins)
-WEBKIT_SET_EXTRA_COMPILER_FLAGS(TestNetscapePlugin)
+add_library(TestNetscapePlugIn SHARED ${WebKitTestNetscapePlugIn_SOURCES})
+target_link_libraries(TestNetscapePlugIn ${WebKitTestNetscapePlugIn_LIBRARIES})
+set_target_properties(TestNetscapePlugIn PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/plugins)
+WEBKIT_SET_EXTRA_COMPILER_FLAGS(TestNetscapePlugIn)
 
 # Suppress unused parameter warnings for sources in WebKit2.
-ADD_TARGET_PROPERTIES(TestNetscapePlugin COMPILE_FLAGS "-Wno-unused-parameter")
+ADD_TARGET_PROPERTIES(TestNetscapePlugIn COMPILE_FLAGS "-Wno-unused-parameter")
index 75ef6d4..75ae7ce 100644 (file)
@@ -12,7 +12,7 @@ set(MiniBrowser_SOURCES
     ${MINIBROWSER_DIR}/WK2BrowserWindowController.m
     ${MINIBROWSER_DIR}/main.m
     ${TOOLS_DIR}/MiniBrowser/MBToolbarItem.m
-    ${TOOLS_DIR}/MiniBrowser/MiniBrowserWebProcessPlugin.m
+    ${TOOLS_DIR}/MiniBrowser/MiniBrowserWebProcessPlugIn.m
 )
 
 set(MiniBrowser_INCLUDE_DIRECTORIES