Attachment #391809 for bug #206894

View Details Raw Unified Return to Bug 206894

| Differences between



2020-02-26  Don Olmstead  <don.olmstead@sony.com>

        [CMake] Use WEBKIT_EXECUTABLE in MiniBrowser
        https://bugs.webkit.org/show_bug.cgi?id=206894

        Reviewed by NOBODY (OOPS!).

        Add a MiniBrowser derived sources directory.

        * Source/cmake/WebKitFS.cmake:

2020-02-26  Carlos Garcia Campos  <cgarcia@igalia.com>

        Unreviewed. Bump GTK version numbers

Lines 47-52 set(WebDriver_DERIVED_SOURCES_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebDriver" a/Source/cmake/WebKitFS.cmake_sec1
- a/Source/cmake/WebKitFS.cmake +1 lines
47	set(WebKitLegacy_DERIVED_SOURCES_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebKitLegacy")	47	set(WebKitLegacy_DERIVED_SOURCES_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebKitLegacy")
48	set(WebKit_DERIVED_SOURCES_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebKit")	48	set(WebKit_DERIVED_SOURCES_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebKit")
49	set(WebInspectorUI_DERIVED_SOURCES_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebInspectorUI")	49	set(WebInspectorUI_DERIVED_SOURCES_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebInspectorUI")
		50	set(MiniBrowser_DERIVED_SOURCES_DIR "${CMAKE_BINARY_DIR}/DerivedSources/MiniBrowser")
50		51
51	set(FORWARDING_HEADERS_DIR ${DERIVED_SOURCES_DIR}/ForwardingHeaders)	52	set(FORWARDING_HEADERS_DIR ${DERIVED_SOURCES_DIR}/ForwardingHeaders)
52		53



2020-02-26  Don Olmstead  <don.olmstead@sony.com>

        [CMake] Use WEBKIT_EXECUTABLE in MiniBrowser
        https://bugs.webkit.org/show_bug.cgi?id=206894

        Reviewed by NOBODY (OOPS!).

        Modify CMake ports to use WEBKIT_EXECUTABLE when creating their respective
        MiniBrowsers.

        * MiniBrowser/gtk/CMakeLists.txt:
        * MiniBrowser/win/CMakeLists.txt:
        * MiniBrowser/wpe/CMakeLists.txt:

2020-02-26  Aakash Jain  <aakash_jain@apple.com>

        [ews] commit-queue should verify patch committer and reviewer



set(MiniBrowser_DIR "${TOOLS_DIR}/MiniBrowser/gtk")
set(DERIVED_SOURCES_MINIBROWSER_DIR "${CMAKE_BINARY_DIR}/DerivedSources/MiniBrowser")

file(MAKE_DIRECTORY ${MiniBrowser_DERIVED_SOURCES_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
)

set(MiniBrowser_PRIVATE_INCLUDE_DIRECTORIES
    ${CMAKE_BINRARY_DIR}
    ${MiniBrowser_DERIVED_SOURCES_DIR}
    ${DERIVED_SOURCES_WEBKIT2GTK_DIR}
    ${FORWARDING_HEADERS_WEBKIT2GTK_DIR}
    ${FORWARDING_HEADERS_DIR}

    ${GSTREAMER_INCLUDE_DIRS}
)

set(MiniBrowser_PRIVATE_LIBRARIES
    ${JavaScriptCore_LIBRARY_NAME}
    WebKit
    ${GTK3_LIBRARIES}

    ${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
    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}")
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})

WEBKIT_ADD_TARGET_CXX_FLAGS(MiniBrowser -Wno-unused-parameter)

install(TARGETS MiniBrowser DESTINATION "${LIBEXEC_INSTALL_DIR}")



set(MiniBrowser_PRIVATE_INCLUDE_DIRECTORIES
    ${CMAKE_BINARY_DIR}
    ${WebCore_PRIVATE_FRAMEWORK_HEADERS_DIR}
)

set(MiniBrowser_SOURCES

    stdafx.cpp
)

set(MiniBrowser_PRIVATE_DEFINITIONS _UNICODE)
set(MiniBrowser_PRIVATE_LIBRARIES
    WebKit::WTF
    comctl32
    comsupp
    comsuppw
    shlwapi
)

if (${WTF_PLATFORM_WIN_CAIRO})
    list(APPEND MiniBrowser_PRIVATE_DEFINITIONS WIN_CAIRO)
endif ()

if (USE_CF)
    list(APPEND MiniBrowser_PRIVATE_LIBRARIES
        ${COREFOUNDATION_LIBRARY}
    )
endif ()

if (ENABLE_WEBKIT_LEGACY)
    list(APPEND MiniBrowser_PRIVATE_DEFINITIONS ENABLE_WEBKIT_LEGACY)
    list(APPEND MiniBrowser_INCLUDE_DIRECTORIES
        ${WebKitLegacy_FRAMEWORK_HEADERS_DIR}
    )

        WebDownloadDelegate.cpp
        WebKitLegacyBrowserWindow.cpp
    )
    list(APPEND MiniBrowser_PRIVATE_LIBRARIES
        WebKitLegacy
        WebKitLegacyGUID
    )
endif ()

if (ENABLE_WEBKIT)
    list(APPEND MiniBrowser_PRIVATE_DEFINITIONS ENABLE_WEBKIT)
    list(APPEND MiniBrowser_INCLUDE_DIRECTORIES
        ${WebKit_FRAMEWORK_HEADERS_DIR}
        ${WebKit_PRIVATE_FRAMEWORK_HEADERS_DIR}

    list(APPEND MiniBrowser_SOURCES
        WebKitBrowserWindow.cpp
    )
    list(APPEND MiniBrowser_PRIVATE_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)
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)



set(MINIBROWSER_DIR "${TOOLS_DIR}/MiniBrowser/wpe")

set(MiniBrowser_SOURCES
    main.cpp
)

set(MiniBrowser_PRIVATE_INCLUDE_DIRECTORIES
    ${CMAKE_BINARY_DIR}
    ${TOOLS_DIR}/wpe/backends/
    ${DERIVED_SOURCES_WPE_API_DIR}
    ${FORWARDING_HEADERS_WPE_DIR}

    ${WPEBACKEND_FDO_INCLUDE_DIRS}
)

set(MiniBrowser_PRIVATE_LIBRARIES
    WPE::libwpe
    WPEToolingBackends
    WebKit

    ${WPEBACKEND_FDO_LIBRARIES}
)

set(MiniBrowser_DEPENDENCIES
    NetworkProcess
    WebProcess
)

if (DEVELOPER_MODE)
    list(APPEND MiniBrowser_PRIVATE_DEFINITIONS WEBKIT_INJECTED_BUNDLE_PATH="${CMAKE_LIBRARY_OUTPUT_DIRECTORY}")
endif ()

WEBKIT_EXECUTABLE_DECLARE(MiniBrowser)
WEBKIT_EXECUTABLE(MiniBrowser)
add_executable(MiniBrowser ${MiniBrowser_SOURCES})
target_link_libraries(MiniBrowser ${MiniBrowser_LIBRARIES})

install(TARGETS MiniBrowser DESTINATION "${LIBEXEC_INSTALL_DIR}")


Return to Bug 206894

Lines 1-27 a/Tools/MiniBrowser/gtk/CMakeLists.txt_sec1
- a/Tools/MiniBrowser/gtk/CMakeLists.txt -33 / +34 lines
1	set(MINIBROWSER_DIR "${TOOLS_DIR}/MiniBrowser/gtk")	1	set(MiniBrowser_DIR "${TOOLS_DIR}/MiniBrowser/gtk")
2	set(DERIVED_SOURCES_MINIBROWSER_DIR "${CMAKE_BINARY_DIR}/DerivedSources/MiniBrowser")
3		2
4	file(MAKE_DIRECTORY ${DERIVED_SOURCES_MINIBROWSER_DIR})	3	file(MAKE_DIRECTORY ${MiniBrowser_DERIVED_SOURCES_DIR})
5		4
6	set(MiniBrowser_SOURCES	5	set(MiniBrowser_SOURCES
7	${DERIVED_SOURCES_MINIBROWSER_DIR}/BrowserMarshal.c	6	${MiniBrowser_DERIVED_SOURCES_DIR}/BrowserMarshal.c
8	${MINIBROWSER_DIR}/BrowserCellRendererVariant.c	7	BrowserCellRendererVariant.c
9	${MINIBROWSER_DIR}/BrowserCellRendererVariant.h	8	BrowserCellRendererVariant.h
10	${MINIBROWSER_DIR}/BrowserDownloadsBar.c	9	BrowserDownloadsBar.c
11	${MINIBROWSER_DIR}/BrowserDownloadsBar.h	10	BrowserDownloadsBar.h
12	${MINIBROWSER_DIR}/BrowserSearchBar.c	11	BrowserSearchBar.c
13	${MINIBROWSER_DIR}/BrowserSearchBar.h	12	BrowserSearchBar.h
14	${MINIBROWSER_DIR}/BrowserSettingsDialog.c	13	BrowserSettingsDialog.c
15	${MINIBROWSER_DIR}/BrowserSettingsDialog.h	14	BrowserSettingsDialog.h
16	${MINIBROWSER_DIR}/BrowserTab.c	15	BrowserTab.c
17	${MINIBROWSER_DIR}/BrowserTab.h	16	BrowserTab.h
18	${MINIBROWSER_DIR}/BrowserWindow.c	17	BrowserWindow.c
19	${MINIBROWSER_DIR}/BrowserWindow.h	18	BrowserWindow.h
20	${MINIBROWSER_DIR}/main.c	19	main.c
21	)	20	)
22		21
23	set(MiniBrowser_INCLUDE_DIRECTORIES	22	set(MiniBrowser_PRIVATE_INCLUDE_DIRECTORIES
24	${DERIVED_SOURCES_MINIBROWSER_DIR}	23	${CMAKE_BINRARY_DIR}
		24	${MiniBrowser_DERIVED_SOURCES_DIR}
25	${DERIVED_SOURCES_WEBKIT2GTK_DIR}	25	${DERIVED_SOURCES_WEBKIT2GTK_DIR}
26	${FORWARDING_HEADERS_WEBKIT2GTK_DIR}	26	${FORWARDING_HEADERS_WEBKIT2GTK_DIR}
27	${FORWARDING_HEADERS_DIR}	27	${FORWARDING_HEADERS_DIR}
Lines 35-41 set(MiniBrowser_SYSTEM_INCLUDE_DIRECTORIES a/Tools/MiniBrowser/gtk/CMakeLists.txt_sec2
35	${GSTREAMER_INCLUDE_DIRS}	35	${GSTREAMER_INCLUDE_DIRS}
36	)	36	)
37		37
38	set(MiniBrowser_LIBRARIES	38	set(MiniBrowser_PRIVATE_LIBRARIES
39	${JavaScriptCore_LIBRARY_NAME}	39	${JavaScriptCore_LIBRARY_NAME}
40	WebKit	40	WebKit
41	${GTK3_LIBRARIES}	41	${GTK3_LIBRARIES}
Lines 44-68 set(MiniBrowser_LIBRARIES a/Tools/MiniBrowser/gtk/CMakeLists.txt_sec3
44	${GSTREAMER_LIBRARIES}	44	${GSTREAMER_LIBRARIES}
45	)	45	)
46		46
		47	set(MiniBrowser_DEPENDENCIES
		48	NetworkProcess
		49	WebProcess
		50	)
		51
47	add_custom_command(	52	add_custom_command(
48	OUTPUT ${DERIVED_SOURCES_MINIBROWSER_DIR}/BrowserMarshal.c	53	OUTPUT ${MiniBrowser_DERIVED_SOURCES_DIR}/BrowserMarshal.c
49	${DERIVED_SOURCES_MINIBROWSER_DIR}/BrowserMarshal.h	54	${MiniBrowser_DERIVED_SOURCES_DIR}/BrowserMarshal.h
50	MAIN_DEPENDENCY ${MINIBROWSER_DIR}/browser-marshal.list	55	MAIN_DEPENDENCY ${MiniBrowser_DIR}/browser-marshal.list
51	COMMAND glib-genmarshal --prefix=browser_marshal ${MINIBROWSER_DIR}/browser-marshal.list --body > ${DERIVED_SOURCES_MINIBROWSER_DIR}/BrowserMarshal.c	56	COMMAND glib-genmarshal --prefix=browser_marshal ${MiniBrowser_DIR}/browser-marshal.list --body > ${MiniBrowser_DERIVED_SOURCES_DIR}/BrowserMarshal.c
52	COMMAND glib-genmarshal --prefix=browser_marshal ${MINIBROWSER_DIR}/browser-marshal.list --header > ${DERIVED_SOURCES_MINIBROWSER_DIR}/BrowserMarshal.h	57	COMMAND glib-genmarshal --prefix=browser_marshal ${MiniBrowser_DIR}/browser-marshal.list --header > ${MiniBrowser_DERIVED_SOURCES_DIR}/BrowserMarshal.h
53	VERBATIM)	58	VERBATIM)
54		59
		60	set(MiniBrowser_PRIVATE_DEFINITIONS GDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_6)
55	if (DEVELOPER_MODE)	61	if (DEVELOPER_MODE)
56	add_definitions(-DWEBKIT_INJECTED_BUNDLE_PATH="${CMAKE_LIBRARY_OUTPUT_DIRECTORY}")	62	list(APPEND MiniBrowser_PRIVATE_DEFINITIONS -DWEBKIT_INJECTED_BUNDLE_PATH="${CMAKE_LIBRARY_OUTPUT_DIRECTORY}")
57	endif ()	63	endif ()
58		64
59	add_definitions(-DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_6)	65	WEBKIT_EXECUTABLE_DECLARE(MiniBrowser)
60		66	WEBKIT_EXECUTABLE(MiniBrowser)
61	include_directories(${MiniBrowser_INCLUDE_DIRECTORIES})
62	include_directories(SYSTEM ${MiniBrowser_SYSTEM_INCLUDE_DIRECTORIES})
63	add_executable(MiniBrowser ${MiniBrowser_SOURCES})
64	target_link_libraries(MiniBrowser ${MiniBrowser_LIBRARIES})
65
66	WEBKIT_ADD_TARGET_CXX_FLAGS(MiniBrowser -Wno-unused-parameter)	67	WEBKIT_ADD_TARGET_CXX_FLAGS(MiniBrowser -Wno-unused-parameter)
67		68
68	install(TARGETS MiniBrowser DESTINATION "${LIBEXEC_INSTALL_DIR}")	69	install(TARGETS MiniBrowser DESTINATION "${LIBEXEC_INSTALL_DIR}")

Lines 1-6 a/Tools/MiniBrowser/win/CMakeLists.txt_sec1
- a/Tools/MiniBrowser/win/CMakeLists.txt -29 / +25 lines
1	set(MiniBrowser_INCLUDE_DIRECTORIES	1	set(MiniBrowser_PRIVATE_INCLUDE_DIRECTORIES
2	${PAL_FRAMEWORK_HEADERS_DIR}	2	${CMAKE_BINARY_DIR}
3	${WebCore_PRIVATE_FRAMEWORK_HEADERS_DIR}
4	)	3	)
5		4
6	set(MiniBrowser_SOURCES	5	set(MiniBrowser_SOURCES
Lines 12-34 set(MiniBrowser_SOURCES a/Tools/MiniBrowser/win/CMakeLists.txt_sec2
12	stdafx.cpp	11	stdafx.cpp
13	)	12	)
14		13
15	set(MiniBrowser_LIBRARIES	14	set(MiniBrowser_PRIVATE_DEFINITIONS _UNICODE)
16	DbgHelp	15	set(MiniBrowser_PRIVATE_LIBRARIES
17	WebKit::WTF	16	WebKit::WTF
18	comctl32
19	comsupp
20	comsuppw
21	shlwapi	17	shlwapi
22	)	18	)
23		19
		20	if (${WTF_PLATFORM_WIN_CAIRO})
		21	list(APPEND MiniBrowser_PRIVATE_DEFINITIONS WIN_CAIRO)
		22	endif ()
		23
24	if (USE_CF)	24	if (USE_CF)
25	list(APPEND MiniBrowser_LIBRARIES	25	list(APPEND MiniBrowser_PRIVATE_LIBRARIES
26	${COREFOUNDATION_LIBRARY}	26	${COREFOUNDATION_LIBRARY}
27	)	27	)
28	endif ()	28	endif ()
29		29
30	if (ENABLE_WEBKIT_LEGACY)	30	if (ENABLE_WEBKIT_LEGACY)
31	add_definitions(-DENABLE_WEBKIT_LEGACY)	31	list(APPEND MiniBrowser_PRIVATE_DEFINITIONS ENABLE_WEBKIT_LEGACY)
32	list(APPEND MiniBrowser_INCLUDE_DIRECTORIES	32	list(APPEND MiniBrowser_INCLUDE_DIRECTORIES
33	${WebKitLegacy_FRAMEWORK_HEADERS_DIR}	33	${WebKitLegacy_FRAMEWORK_HEADERS_DIR}
34	)	34	)
Lines 40-53 if (ENABLE_WEBKIT_LEGACY) a/Tools/MiniBrowser/win/CMakeLists.txt_sec3
40	WebDownloadDelegate.cpp	40	WebDownloadDelegate.cpp
41	WebKitLegacyBrowserWindow.cpp	41	WebKitLegacyBrowserWindow.cpp
42	)	42	)
43	list(APPEND MiniBrowser_LIBRARIES	43	list(APPEND MiniBrowser_PRIVATE_LIBRARIES
44	WebKitLegacy	44	WebKitLegacy
45	WebKitLegacyGUID	45	WebKitLegacyGUID
46	)	46	)
47	endif ()	47	endif ()
48		48
49	if (ENABLE_WEBKIT)	49	if (ENABLE_WEBKIT)
50	add_definitions(-DENABLE_WEBKIT)	50	list(APPEND MiniBrowser_PRIVATE_DEFINITIONS ENABLE_WEBKIT)
51	list(APPEND MiniBrowser_INCLUDE_DIRECTORIES	51	list(APPEND MiniBrowser_INCLUDE_DIRECTORIES
52	${WebKit_FRAMEWORK_HEADERS_DIR}	52	${WebKit_FRAMEWORK_HEADERS_DIR}
53	${WebKit_PRIVATE_FRAMEWORK_HEADERS_DIR}	53	${WebKit_PRIVATE_FRAMEWORK_HEADERS_DIR}
Lines 55-78 if (ENABLE_WEBKIT) a/Tools/MiniBrowser/win/CMakeLists.txt_sec4
55	list(APPEND MiniBrowser_SOURCES	55	list(APPEND MiniBrowser_SOURCES
56	WebKitBrowserWindow.cpp	56	WebKitBrowserWindow.cpp
57	)	57	)
58	list(APPEND MiniBrowser_LIBRARIES	58	list(APPEND MiniBrowser_PRIVATE_LIBRARIES
59	WebKit	59	WebKit
60	)	60	)
		61	list(APPEND MiniBrowser_DEPENDENCIES
		62	NetworkProcess
		63	WebKitFrameworkHeaders
		64	WebProcess
		65	)
61	endif ()	66	endif ()
62		67
63	set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${MSVC_RUNTIME_LINKER_FLAGS}")	68	WEBKIT_EXECUTABLE_DECLARE(MiniBrowser)
64	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /ENTRY:wWinMainCRTStartup")	69	WEBKIT_WRAP_EXECUTABLE(MiniBrowser
65		70	SOURCES ${TOOLS_DIR}/win/DLLLauncher/DLLLauncherMain.cpp MiniBrowser.rc
66	if (${WTF_PLATFORM_WIN_CAIRO})	71	LIBRARIES shlwapi
67	add_definitions(-DWIN_CAIRO)	72	)
68	endif ()	73	WEBKIT_EXECUTABLE(MiniBrowser)
69	add_definitions(-D_UNICODE)	74	set_target_properties(MiniBrowser PROPERTIES WIN32_EXECUTABLE ON)
70	include_directories(${MiniBrowser_INCLUDE_DIRECTORIES})
71	add_library(MiniBrowserLib SHARED ${MiniBrowser_SOURCES})
72	target_link_libraries(MiniBrowserLib ${MiniBrowser_LIBRARIES})
73
74	add_executable(MiniBrowser WIN32 ${TOOLS_DIR}/win/DLLLauncher/DLLLauncherMain.cpp MiniBrowser.rc)
75	target_link_libraries(MiniBrowser shlwapi)
76	set_target_properties(MiniBrowser PROPERTIES OUTPUT_NAME "MiniBrowser")
77
78	add_dependencies(MiniBrowser MiniBrowserLib)

Lines 1-3 a/ChangeLog_sec1
- a/ChangeLog +11 lines
		1	2020-02-26 Don Olmstead <don.olmstead@sony.com>
		2
		3	[CMake] Use WEBKIT_EXECUTABLE in MiniBrowser
		4	https://bugs.webkit.org/show_bug.cgi?id=206894
		5
		6	Reviewed by NOBODY (OOPS!).
		7
		8	Add a MiniBrowser derived sources directory.
		9
		10	* Source/cmake/WebKitFS.cmake:
		11
1	2020-02-26 Carlos Garcia Campos <cgarcia@igalia.com>	12	2020-02-26 Carlos Garcia Campos <cgarcia@igalia.com>
2		13
3	Unreviewed. Bump GTK version numbers	14	Unreviewed. Bump GTK version numbers

Lines 1-3 a/Tools/ChangeLog_sec1
- a/Tools/ChangeLog +14 lines
		1	2020-02-26 Don Olmstead <don.olmstead@sony.com>
		2
		3	[CMake] Use WEBKIT_EXECUTABLE in MiniBrowser
		4	https://bugs.webkit.org/show_bug.cgi?id=206894
		5
		6	Reviewed by NOBODY (OOPS!).
		7
		8	Modify CMake ports to use WEBKIT_EXECUTABLE when creating their respective
		9	MiniBrowsers.
		10
		11	* MiniBrowser/gtk/CMakeLists.txt:
		12	* MiniBrowser/win/CMakeLists.txt:
		13	* MiniBrowser/wpe/CMakeLists.txt:
		14
1	2020-02-26 Aakash Jain <aakash_jain@apple.com>	15	2020-02-26 Aakash Jain <aakash_jain@apple.com>
2		16
3	[ews] commit-queue should verify patch committer and reviewer	17	[ews] commit-queue should verify patch committer and reviewer

Lines 1-10 a/Tools/MiniBrowser/wpe/CMakeLists.txt_sec1
- a/Tools/MiniBrowser/wpe/CMakeLists.txt -10 / +12 lines
1	set(MINIBROWSER_DIR "${TOOLS_DIR}/MiniBrowser/wpe")
2
3	set(MiniBrowser_SOURCES	1	set(MiniBrowser_SOURCES
4	${MINIBROWSER_DIR}/main.cpp	2	main.cpp
5	)	3	)
6		4
7	set(MiniBrowser_INCLUDE_DIRECTORIES	5	set(MiniBrowser_PRIVATE_INCLUDE_DIRECTORIES
		6	${CMAKE_BINARY_DIR}
8	${TOOLS_DIR}/wpe/backends/	7	${TOOLS_DIR}/wpe/backends/
9	${DERIVED_SOURCES_WPE_API_DIR}	8	${DERIVED_SOURCES_WPE_API_DIR}
10	${FORWARDING_HEADERS_WPE_DIR}	9	${FORWARDING_HEADERS_WPE_DIR}
Lines 16-22 set(MiniBrowser_SYSTEM_INCLUDE_DIRECTORIES a/Tools/MiniBrowser/wpe/CMakeLists.txt_sec2
16	${WPEBACKEND_FDO_INCLUDE_DIRS}	15	${WPEBACKEND_FDO_INCLUDE_DIRS}
17	)	16	)
18		17
19	set(MiniBrowser_LIBRARIES	18	set(MiniBrowser_PRIVATE_LIBRARIES
20	WPE::libwpe	19	WPE::libwpe
21	WPEToolingBackends	20	WPEToolingBackends
22	WebKit	21	WebKit
Lines 25-38 set(MiniBrowser_LIBRARIES a/Tools/MiniBrowser/wpe/CMakeLists.txt_sec3
25	${WPEBACKEND_FDO_LIBRARIES}	24	${WPEBACKEND_FDO_LIBRARIES}
26	)	25	)
27		26
		27	set(MiniBrowser_DEPENDENCIES
		28	NetworkProcess
		29	WebProcess
		30	)
		31
28	if (DEVELOPER_MODE)	32	if (DEVELOPER_MODE)
29	add_definitions(-DWEBKIT_INJECTED_BUNDLE_PATH="${CMAKE_LIBRARY_OUTPUT_DIRECTORY}")	33	list(APPEND MiniBrowser_PRIVATE_DEFINITIONS WEBKIT_INJECTED_BUNDLE_PATH="${CMAKE_LIBRARY_OUTPUT_DIRECTORY}")
30	endif ()	34	endif ()
31		35
32	include_directories(${MiniBrowser_INCLUDE_DIRECTORIES})	36	WEBKIT_EXECUTABLE_DECLARE(MiniBrowser)
33	include_directories(SYSTEM ${MiniBrowser_SYSTEM_INCLUDE_DIRECTORIES})	37	WEBKIT_EXECUTABLE(MiniBrowser)
34	add_executable(MiniBrowser ${MiniBrowser_SOURCES})
35	target_link_libraries(MiniBrowser ${MiniBrowser_LIBRARIES})
36		38
37	install(TARGETS MiniBrowser DESTINATION "${LIBEXEC_INSTALL_DIR}")	39	install(TARGETS MiniBrowser DESTINATION "${LIBEXEC_INSTALL_DIR}")
38		40