Title: [257679] trunk
- Revision
- 257679
- Author
- hironori.fu...@sony.com
- Date
- 2020-02-28 23:03:48 -0800 (Fri, 28 Feb 2020)
Log Message
Unreviewed, rolling out r257565.
It broke WinCairo MiniBrowser
Reverted changeset:
"[CMake] Use WEBKIT_EXECUTABLE in MiniBrowser"
https://bugs.webkit.org/show_bug.cgi?id=206894
https://trac.webkit.org/changeset/257565
Modified Paths
Diff
Modified: trunk/ChangeLog (257678 => 257679)
--- trunk/ChangeLog 2020-02-29 05:52:10 UTC (rev 257678)
+++ trunk/ChangeLog 2020-02-29 07:03:48 UTC (rev 257679)
@@ -1,3 +1,15 @@
+2020-02-28 Fujii Hironori <hironori.fu...@sony.com>
+
+ Unreviewed, rolling out r257565.
+
+ It broke WinCairo MiniBrowser
+
+ Reverted changeset:
+
+ "[CMake] Use WEBKIT_EXECUTABLE in MiniBrowser"
+ https://bugs.webkit.org/show_bug.cgi?id=206894
+ https://trac.webkit.org/changeset/257565
+
2020-02-28 Takashi Komori <takashi.kom...@sony.com>
[Curl] Add TLS debugging feature to log encryption keys
Modified: trunk/Source/cmake/WebKitFS.cmake (257678 => 257679)
--- trunk/Source/cmake/WebKitFS.cmake 2020-02-29 05:52:10 UTC (rev 257678)
+++ trunk/Source/cmake/WebKitFS.cmake 2020-02-29 07:03:48 UTC (rev 257679)
@@ -47,7 +47,6 @@
set(WebKitLegacy_DERIVED_SOURCES_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebKitLegacy")
set(WebKit_DERIVED_SOURCES_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebKit")
set(WebInspectorUI_DERIVED_SOURCES_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebInspectorUI")
-set(MiniBrowser_DERIVED_SOURCES_DIR "${CMAKE_BINARY_DIR}/DerivedSources/MiniBrowser")
set(FORWARDING_HEADERS_DIR ${DERIVED_SOURCES_DIR}/ForwardingHeaders)
Modified: trunk/Tools/ChangeLog (257678 => 257679)
--- trunk/Tools/ChangeLog 2020-02-29 05:52:10 UTC (rev 257678)
+++ trunk/Tools/ChangeLog 2020-02-29 07:03:48 UTC (rev 257679)
@@ -1,3 +1,15 @@
+2020-02-28 Fujii Hironori <hironori.fu...@sony.com>
+
+ Unreviewed, rolling out r257565.
+
+ It broke WinCairo MiniBrowser
+
+ Reverted changeset:
+
+ "[CMake] Use WEBKIT_EXECUTABLE in MiniBrowser"
+ https://bugs.webkit.org/show_bug.cgi?id=206894
+ https://trac.webkit.org/changeset/257565
+
2020-02-28 Aakash Jain <aakash_j...@apple.com>
EWS fails to retry build in case of kill-old-processes exception
Modified: trunk/Tools/MiniBrowser/gtk/CMakeLists.txt (257678 => 257679)
--- trunk/Tools/MiniBrowser/gtk/CMakeLists.txt 2020-02-29 05:52:10 UTC (rev 257678)
+++ trunk/Tools/MiniBrowser/gtk/CMakeLists.txt 2020-02-29 07:03:48 UTC (rev 257679)
@@ -1,27 +1,27 @@
-set(MiniBrowser_DIR "${TOOLS_DIR}/MiniBrowser/gtk")
+set(MINIBROWSER_DIR "${TOOLS_DIR}/MiniBrowser/gtk")
+set(DERIVED_SOURCES_MINIBROWSER_DIR "${CMAKE_BINARY_DIR}/DerivedSources/MiniBrowser")
-file(MAKE_DIRECTORY ${MiniBrowser_DERIVED_SOURCES_DIR})
+file(MAKE_DIRECTORY ${DERIVED_SOURCES_MINIBROWSER_DIR})
set(MiniBrowser_SOURCES
- ${MiniBrowser_DERIVED_SOURCES_DIR}/BrowserMarshal.c
- BrowserCellRendererVariant.c
- BrowserCellRendererVariant.h
- BrowserDownloadsBar.c
- BrowserDownloadsBar.h
- BrowserSearchBar.c
- BrowserSearchBar.h
- BrowserSettingsDialog.c
- BrowserSettingsDialog.h
- BrowserTab.c
- BrowserTab.h
- BrowserWindow.c
- BrowserWindow.h
- main.c
+ ${DERIVED_SOURCES_MINIBROWSER_DIR}/BrowserMarshal.c
+ ${MINIBROWSER_DIR}/BrowserCellRendererVariant.c
+ ${MINIBROWSER_DIR}/BrowserCellRendererVariant.h
+ ${MINIBROWSER_DIR}/BrowserDownloadsBar.c
+ ${MINIBROWSER_DIR}/BrowserDownloadsBar.h
+ ${MINIBROWSER_DIR}/BrowserSearchBar.c
+ ${MINIBROWSER_DIR}/BrowserSearchBar.h
+ ${MINIBROWSER_DIR}/BrowserSettingsDialog.c
+ ${MINIBROWSER_DIR}/BrowserSettingsDialog.h
+ ${MINIBROWSER_DIR}/BrowserTab.c
+ ${MINIBROWSER_DIR}/BrowserTab.h
+ ${MINIBROWSER_DIR}/BrowserWindow.c
+ ${MINIBROWSER_DIR}/BrowserWindow.h
+ ${MINIBROWSER_DIR}/main.c
)
-set(MiniBrowser_PRIVATE_INCLUDE_DIRECTORIES
- ${CMAKE_BINRARY_DIR}
- ${MiniBrowser_DERIVED_SOURCES_DIR}
+set(MiniBrowser_INCLUDE_DIRECTORIES
+ ${DERIVED_SOURCES_MINIBROWSER_DIR}
${DERIVED_SOURCES_WEBKIT2GTK_DIR}
${FORWARDING_HEADERS_WEBKIT2GTK_DIR}
${FORWARDING_HEADERS_DIR}
@@ -35,7 +35,7 @@
${GSTREAMER_INCLUDE_DIRS}
)
-set(MiniBrowser_PRIVATE_LIBRARIES
+set(MiniBrowser_LIBRARIES
${_javascript_Core_LIBRARY_NAME}
WebKit
${GTK3_LIBRARIES}
@@ -44,26 +44,25 @@
${GSTREAMER_LIBRARIES}
)
-set(MiniBrowser_DEPENDENCIES
- NetworkProcess
- WebProcess
-)
-
add_custom_command(
- OUTPUT ${MiniBrowser_DERIVED_SOURCES_DIR}/BrowserMarshal.c
- ${MiniBrowser_DERIVED_SOURCES_DIR}/BrowserMarshal.h
- MAIN_DEPENDENCY ${MiniBrowser_DIR}/browser-marshal.list
- COMMAND glib-genmarshal --prefix=browser_marshal ${MiniBrowser_DIR}/browser-marshal.list --body > ${MiniBrowser_DERIVED_SOURCES_DIR}/BrowserMarshal.c
- COMMAND glib-genmarshal --prefix=browser_marshal ${MiniBrowser_DIR}/browser-marshal.list --header > ${MiniBrowser_DERIVED_SOURCES_DIR}/BrowserMarshal.h
+ OUTPUT ${DERIVED_SOURCES_MINIBROWSER_DIR}/BrowserMarshal.c
+ ${DERIVED_SOURCES_MINIBROWSER_DIR}/BrowserMarshal.h
+ MAIN_DEPENDENCY ${MINIBROWSER_DIR}/browser-marshal.list
+ COMMAND glib-genmarshal --prefix=browser_marshal ${MINIBROWSER_DIR}/browser-marshal.list --body > ${DERIVED_SOURCES_MINIBROWSER_DIR}/BrowserMarshal.c
+ COMMAND glib-genmarshal --prefix=browser_marshal ${MINIBROWSER_DIR}/browser-marshal.list --header > ${DERIVED_SOURCES_MINIBROWSER_DIR}/BrowserMarshal.h
VERBATIM)
-set(MiniBrowser_PRIVATE_DEFINITIONS GDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_6)
if (DEVELOPER_MODE)
- list(APPEND MiniBrowser_PRIVATE_DEFINITIONS -DWEBKIT_INJECTED_BUNDLE_PATH="${CMAKE_LIBRARY_OUTPUT_DIRECTORY}")
+ add_definitions(-DWEBKIT_INJECTED_BUNDLE_PATH="${CMAKE_LIBRARY_OUTPUT_DIRECTORY}")
endif ()
-WEBKIT_EXECUTABLE_DECLARE(MiniBrowser)
-WEBKIT_EXECUTABLE(MiniBrowser)
+add_definitions(-DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_6)
+
+include_directories(${MiniBrowser_INCLUDE_DIRECTORIES})
+include_directories(SYSTEM ${MiniBrowser_SYSTEM_INCLUDE_DIRECTORIES})
+add_executable(MiniBrowser ${MiniBrowser_SOURCES})
+target_link_libraries(MiniBrowser ${MiniBrowser_LIBRARIES})
+
WEBKIT_ADD_TARGET_CXX_FLAGS(MiniBrowser -Wno-unused-parameter)
install(TARGETS MiniBrowser DESTINATION "${LIBEXEC_INSTALL_DIR}")
Modified: trunk/Tools/MiniBrowser/win/CMakeLists.txt (257678 => 257679)
--- trunk/Tools/MiniBrowser/win/CMakeLists.txt 2020-02-29 05:52:10 UTC (rev 257678)
+++ trunk/Tools/MiniBrowser/win/CMakeLists.txt 2020-02-29 07:03:48 UTC (rev 257679)
@@ -1,5 +1,6 @@
-set(MiniBrowser_PRIVATE_INCLUDE_DIRECTORIES
- ${CMAKE_BINARY_DIR}
+set(MiniBrowser_INCLUDE_DIRECTORIES
+ ${PAL_FRAMEWORK_HEADERS_DIR}
+ ${WebCore_PRIVATE_FRAMEWORK_HEADERS_DIR}
)
set(MiniBrowser_SOURCES
@@ -11,26 +12,23 @@
stdafx.cpp
)
-set(MiniBrowser_PRIVATE_DEFINITIONS _UNICODE)
-set(MiniBrowser_PRIVATE_LIBRARIES
+set(MiniBrowser_LIBRARIES
+ DbgHelp
WebKit::WTF
comctl32
+ comsupp
+ comsuppw
shlwapi
- user32
)
-if (${WTF_PLATFORM_WIN_CAIRO})
- list(APPEND MiniBrowser_PRIVATE_DEFINITIONS WIN_CAIRO)
-endif ()
-
if (USE_CF)
- list(APPEND MiniBrowser_PRIVATE_LIBRARIES
+ list(APPEND MiniBrowser_LIBRARIES
${COREFOUNDATION_LIBRARY}
)
endif ()
if (ENABLE_WEBKIT_LEGACY)
- list(APPEND MiniBrowser_PRIVATE_DEFINITIONS ENABLE_WEBKIT_LEGACY)
+ add_definitions(-DENABLE_WEBKIT_LEGACY)
list(APPEND MiniBrowser_INCLUDE_DIRECTORIES
${WebKitLegacy_FRAMEWORK_HEADERS_DIR}
)
@@ -42,7 +40,7 @@
WebDownloadDelegate.cpp
WebKitLegacyBrowserWindow.cpp
)
- list(APPEND MiniBrowser_PRIVATE_LIBRARIES
+ list(APPEND MiniBrowser_LIBRARIES
WebKitLegacy
WebKitLegacyGUID
)
@@ -49,7 +47,7 @@
endif ()
if (ENABLE_WEBKIT)
- list(APPEND MiniBrowser_PRIVATE_DEFINITIONS ENABLE_WEBKIT)
+ add_definitions(-DENABLE_WEBKIT)
list(APPEND MiniBrowser_INCLUDE_DIRECTORIES
${WebKit_FRAMEWORK_HEADERS_DIR}
${WebKit_PRIVATE_FRAMEWORK_HEADERS_DIR}
@@ -57,20 +55,24 @@
list(APPEND MiniBrowser_SOURCES
WebKitBrowserWindow.cpp
)
- list(APPEND MiniBrowser_PRIVATE_LIBRARIES
+ list(APPEND MiniBrowser_LIBRARIES
WebKit
)
- list(APPEND MiniBrowser_DEPENDENCIES
- NetworkProcess
- WebKitFrameworkHeaders
- WebProcess
- )
endif ()
-WEBKIT_EXECUTABLE_DECLARE(MiniBrowser)
-WEBKIT_WRAP_EXECUTABLE(MiniBrowser
- SOURCES ${TOOLS_DIR}/win/DLLLauncher/DLLLauncherMain.cpp MiniBrowser.rc
- LIBRARIES shlwapi
-)
-WEBKIT_EXECUTABLE(MiniBrowser)
-set_target_properties(MiniBrowser PROPERTIES WIN32_EXECUTABLE ON)
+set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${MSVC_RUNTIME_LINKER_FLAGS}")
+set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /ENTRY:wWinMainCRTStartup")
+
+if (${WTF_PLATFORM_WIN_CAIRO})
+ add_definitions(-DWIN_CAIRO)
+endif ()
+add_definitions(-D_UNICODE)
+include_directories(${MiniBrowser_INCLUDE_DIRECTORIES})
+add_library(MiniBrowserLib SHARED ${MiniBrowser_SOURCES})
+target_link_libraries(MiniBrowserLib ${MiniBrowser_LIBRARIES})
+
+add_executable(MiniBrowser WIN32 ${TOOLS_DIR}/win/DLLLauncher/DLLLauncherMain.cpp MiniBrowser.rc)
+target_link_libraries(MiniBrowser shlwapi)
+set_target_properties(MiniBrowser PROPERTIES OUTPUT_NAME "MiniBrowser")
+
+add_dependencies(MiniBrowser MiniBrowserLib)
Modified: trunk/Tools/MiniBrowser/wpe/CMakeLists.txt (257678 => 257679)
--- trunk/Tools/MiniBrowser/wpe/CMakeLists.txt 2020-02-29 05:52:10 UTC (rev 257678)
+++ trunk/Tools/MiniBrowser/wpe/CMakeLists.txt 2020-02-29 07:03:48 UTC (rev 257679)
@@ -1,9 +1,10 @@
+set(MINIBROWSER_DIR "${TOOLS_DIR}/MiniBrowser/wpe")
+
set(MiniBrowser_SOURCES
- main.cpp
+ ${MINIBROWSER_DIR}/main.cpp
)
-set(MiniBrowser_PRIVATE_INCLUDE_DIRECTORIES
- ${CMAKE_BINARY_DIR}
+set(MiniBrowser_INCLUDE_DIRECTORIES
${TOOLS_DIR}/wpe/backends/
${DERIVED_SOURCES_WPE_API_DIR}
${FORWARDING_HEADERS_WPE_DIR}
@@ -15,7 +16,7 @@
${WPEBACKEND_FDO_INCLUDE_DIRS}
)
-set(MiniBrowser_PRIVATE_LIBRARIES
+set(MiniBrowser_LIBRARIES
WPE::libwpe
WPEToolingBackends
WebKit
@@ -24,17 +25,14 @@
${WPEBACKEND_FDO_LIBRARIES}
)
-set(MiniBrowser_DEPENDENCIES
- NetworkProcess
- WebProcess
-)
-
if (DEVELOPER_MODE)
- list(APPEND MiniBrowser_PRIVATE_DEFINITIONS WEBKIT_INJECTED_BUNDLE_PATH="${CMAKE_LIBRARY_OUTPUT_DIRECTORY}")
+ add_definitions(-DWEBKIT_INJECTED_BUNDLE_PATH="${CMAKE_LIBRARY_OUTPUT_DIRECTORY}")
endif ()
-WEBKIT_EXECUTABLE_DECLARE(MiniBrowser)
-WEBKIT_EXECUTABLE(MiniBrowser)
+include_directories(${MiniBrowser_INCLUDE_DIRECTORIES})
+include_directories(SYSTEM ${MiniBrowser_SYSTEM_INCLUDE_DIRECTORIES})
+add_executable(MiniBrowser ${MiniBrowser_SOURCES})
+target_link_libraries(MiniBrowser ${MiniBrowser_LIBRARIES})
install(TARGETS MiniBrowser DESTINATION "${LIBEXEC_INSTALL_DIR}")
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
