Changeset 161068 in webkit


Ignore:
Timestamp:
Dec 25, 2013 11:07:36 AM (10 years ago)
Author:
Martin Robinson
Message:

[GTK] [CMake] Clean up generated sources directories
​https://bugs.webkit.org/show_bug.cgi?id=126216

Reviewed by Gustavo Noronha Silva.

.:

  • Source/cmake/OptionsGTK.cmake: Pre-define the main derived sources directories

so that they definitions can be shared easily throughout the build system.

Source/WebCore:

  • PlatformGTK.cmake: Use the new directory variables.

Source/WebKit:

  • PlatformGTK.cmake: Use the new derived source variables.

Source/WebKit2:

  • PlatformGTK.cmake: Use the new derived sources variables.
  • UIProcess/API/gtk/tests/CMakeLists.txt: Ditto.

Tools:

  • DumpRenderTree/PlatformGTK.cmake: Use the new derived sources variables.
  • GtkLauncher/CMakeLists.txt: Ditto.
  • MiniBrowser/gtk/CMakeLists.txt: Ditto.
  • TestWebKitAPI/CMakeLists.txt: Now that the EFL and GTK+ forwarding header locations differ,

move the platform-specific includes to the EFL and GTK platform files. Also clean up forwarding
header generation into on target.

  • TestWebKitAPI/PlatformEfl.cmake: Added EFL-specific locations to the include list.
  • TestWebKitAPI/PlatformGTK.cmake: Added GTK-specific locations to the include list.
  • WebKitTestRunner/CMakeLists.txt: Same as for TestWebKitAPI.
  • WebKitTestRunner/PlatformEfl.cmake: Ditto.
  • WebKitTestRunner/PlatformGTK.cmake: Ditto.
  • gtk/generate-gtkdoc: Update to select the appropriate derived sources locations for

the cmake build.

Location:
trunk
Files:
20 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r161047 r161068  
     12013-12-25  Martin Robinson  <mrobinson@igalia.com>
     2
     3        [GTK] [CMake] Clean up generated sources directories
     4        https://bugs.webkit.org/show_bug.cgi?id=126216
     5
     6        Reviewed by Gustavo Noronha Silva.
     7
     8        * Source/cmake/OptionsGTK.cmake: Pre-define the main derived sources directories
     9        so that they definitions can be shared easily throughout the build system.
     10
    1112013-12-23  Jinwoo Song  <jinwoo7.song@samsung.com>
    212

  • trunk/Source/WebCore/ChangeLog

    r161067 r161068  
     12013-12-25  Martin Robinson  <mrobinson@igalia.com>
     2
     3        [GTK] [CMake] Clean up generated sources directories
     4        https://bugs.webkit.org/show_bug.cgi?id=126216
     5
     6        Reviewed by Gustavo Noronha Silva.
     7
     8        * PlatformGTK.cmake: Use the new directory variables.
     9
    1102013-12-25  Dirk Schulze  <krit@webkit.org>
    211

  • trunk/Source/WebCore/PlatformGTK.cmake

    r160804 r161068  
    438438
    439439if (ENABLE_WEBKIT2)
    440     set(DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR ${DERIVED_SOURCES_DIR}/webkitdom)
    441 
    442440    include_directories(
    443441        "${WebCore_INCLUDE_DIRECTORIES}"

  • trunk/Source/WebKit/ChangeLog

    r161049 r161068  
     12013-12-25  Martin Robinson  <mrobinson@igalia.com>
     2
     3        [GTK] [CMake] Clean up generated sources directories
     4        https://bugs.webkit.org/show_bug.cgi?id=126216
     5
     6        Reviewed by Gustavo Noronha Silva.
     7
     8        * PlatformGTK.cmake: Use the new derived source variables.
     9
    1102013-12-23  Andy Estes  <aestes@apple.com>
    211

  • trunk/Source/WebKit/PlatformGTK.cmake

    r160993 r161068  
    1 set(DERIVED_SOURCES_WEBKITGTK_DIR ${DERIVED_SOURCES_DIR}/webkit)
    21file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBKITGTK_DIR})
    3 configure_file(gtk/webkit/webkitversion.h.in ${DERIVED_SOURCES_WEBKITGTK_DIR}/webkitversion.h)
     2file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBKITGTK_API_DIR})
     3configure_file(gtk/webkit/webkitversion.h.in ${DERIVED_SOURCES_WEBKITGTK_API_DIR}/webkitversion.h)
    44configure_file(gtk/webkit.pc.in ${CMAKE_BINARY_DIR}/Source/WebKit/gtk/webkitgtk-3.0.pc @ONLY)
    55
    … …  
    88list(APPEND WebKit_INCLUDE_DIRECTORIES
    99    ${DERIVED_SOURCES_DIR}
    10     ${DERIVED_SOURCES_DIR}/webkitdom
    1110    ${DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR}
    1211    ${DERIVED_SOURCES_WEBKITGTK_DIR}
     12    ${DERIVED_SOURCES_WEBKITGTK_API_DIR}
    1313    ${THIRDPARTY_DIR}/ANGLE/include/GLSLANG
    1414    ${THIRDPARTY_DIR}/ANGLE/src
    … …  
    3535
    3636list(APPEND WebKit_SOURCES
    37     ${DERIVED_SOURCES_WEBKITGTK_DIR}/webkitenumtypes.cpp
    38     ${DERIVED_SOURCES_WEBKITGTK_DIR}/webkitmarshal.cpp
     37    ${DERIVED_SOURCES_WEBKITGTK_API_DIR}/webkitenumtypes.cpp
     38    ${DERIVED_SOURCES_WEBKITGTK_API_DIR}/webkitmarshal.cpp
    3939
    4040    gtk/WebCoreSupport/AcceleratedCompositingContextGL.cpp
    … …  
    138138
    139139add_custom_command(
    140     OUTPUT ${DERIVED_SOURCES_WEBKITGTK_DIR}/webkitmarshal.cpp
    141            ${DERIVED_SOURCES_WEBKITGTK_DIR}/webkitmarshal.h
     140    OUTPUT ${DERIVED_SOURCES_WEBKITGTK_API_DIR}/webkitmarshal.cpp
     141           ${DERIVED_SOURCES_WEBKITGTK_API_DIR}/webkitmarshal.h
    142142    MAIN_DEPENDENCY ${WebKit_MARSHAL_LIST}
    143143
    144     COMMAND echo extern \"C\" { > ${DERIVED_SOURCES_WEBKITGTK_DIR}/webkitmarshal.cpp
    145     COMMAND glib-genmarshal --prefix=webkit_marshal ${WebKit_MARSHAL_LIST} --body >> ${DERIVED_SOURCES_WEBKITGTK_DIR}/webkitmarshal.cpp
    146     COMMAND echo } >> ${DERIVED_SOURCES_WEBKITGTK_DIR}/webkitmarshal.cpp
     144    COMMAND echo extern \"C\" { > ${DERIVED_SOURCES_WEBKITGTK_API_DIR}/webkitmarshal.cpp
     145    COMMAND glib-genmarshal --prefix=webkit_marshal ${WebKit_MARSHAL_LIST} --body >> ${DERIVED_SOURCES_WEBKITGTK_API_DIR}/webkitmarshal.cpp
     146    COMMAND echo } >> ${DERIVED_SOURCES_WEBKITGTK_API_DIR}/webkitmarshal.cpp
    147147
    148     COMMAND glib-genmarshal --prefix=webkit_marshal ${WebKit_MARSHAL_LIST} --header > ${DERIVED_SOURCES_WEBKITGTK_DIR}/webkitmarshal.h
     148    COMMAND glib-genmarshal --prefix=webkit_marshal ${WebKit_MARSHAL_LIST} --header > ${DERIVED_SOURCES_WEBKITGTK_API_DIR}/webkitmarshal.h
    149149    VERBATIM
    150150)
    151151
    152152add_custom_command(
    153     OUTPUT ${DERIVED_SOURCES_WEBKITGTK_DIR}/webkitenumtypes.h
    154            ${DERIVED_SOURCES_WEBKITGTK_DIR}/webkitenumtypes.cpp
     153    OUTPUT ${DERIVED_SOURCES_WEBKITGTK_API_DIR}/webkitenumtypes.h
     154           ${DERIVED_SOURCES_WEBKITGTK_API_DIR}/webkitenumtypes.cpp
    155155    DEPENDS ${WebKitGTK_INSTALLED_HEADERS}
    156156
    157     COMMAND glib-mkenums --template ${WEBKIT_DIR}/gtk/webkit/webkitenumtypes.h.template ${WebKitGTK_INSTALLED_HEADERS} | sed s/web_kit/webkit/ | sed s/WEBKIT_TYPE_KIT/WEBKIT_TYPE/ > ${DERIVED_SOURCES_WEBKITGTK_DIR}/webkitenumtypes.h
     157    COMMAND glib-mkenums --template ${WEBKIT_DIR}/gtk/webkit/webkitenumtypes.h.template ${WebKitGTK_INSTALLED_HEADERS} | sed s/web_kit/webkit/ | sed s/WEBKIT_TYPE_KIT/WEBKIT_TYPE/ > ${DERIVED_SOURCES_WEBKITGTK_API_DIR}/webkitenumtypes.h
    158158
    159     COMMAND glib-mkenums --template ${WEBKIT_DIR}/gtk/webkit/webkitenumtypes.cpp.template ${WebKitGTK_INSTALLED_HEADERS} | sed s/web_kit/webkit/ > ${DERIVED_SOURCES_WEBKITGTK_DIR}/webkitenumtypes.cpp
     159    COMMAND glib-mkenums --template ${WEBKIT_DIR}/gtk/webkit/webkitenumtypes.cpp.template ${WebKitGTK_INSTALLED_HEADERS} | sed s/web_kit/webkit/ > ${DERIVED_SOURCES_WEBKITGTK_API_DIR}/webkitenumtypes.cpp
    160160    VERBATIM
    161161)

  • trunk/Source/WebKit2/ChangeLog

    r161065 r161068  
     12013-12-25  Martin Robinson  <mrobinson@igalia.com>
     2
     3        [GTK] [CMake] Clean up generated sources directories
     4        https://bugs.webkit.org/show_bug.cgi?id=126216
     5
     6        Reviewed by Gustavo Noronha Silva.
     7
     8        * PlatformGTK.cmake: Use the new derived sources variables.
     9        * UIProcess/API/gtk/tests/CMakeLists.txt: Ditto.
     10
    1112013-12-25  Philippe Normand  <pnormand@igalia.com>
    212

  • trunk/Source/WebKit2/PlatformGTK.cmake

    r161017 r161068  
    1 set(DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR ${DERIVED_SOURCES_DIR}/webkitdom)
    2 set(DERIVED_SOURCES_WEBKIT2GTK_DIR ${DERIVED_SOURCES_DIR}/WebKit2/webkit2gtk)
    3 set(WEBKIT2_BUILT_API_DIR ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/webkit2)
    4 set(WEBKIT2_FORWARDING_HEADERS_DIR ${DERIVED_SOURCES_DIR}/ForwardingHeaders/webkit2gtk)
    5 
    61file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBKIT2_DIR})
    7 file(MAKE_DIRECTORY ${WEBKIT2_BUILT_API_DIR})
    8 file(MAKE_DIRECTORY ${WEBKIT2_FORWARDING_HEADERS_DIR})
    9 
    10 configure_file(UIProcess/API/gtk/WebKitVersion.h.in ${WEBKIT2_BUILT_API_DIR}/WebKitVersion.h)
     2file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBKIT2GTK_API_DIR})
     3file(MAKE_DIRECTORY ${FORWARDING_HEADERS_WEBKIT2GTK_DIR})
     4file(MAKE_DIRECTORY ${FORWARDING_HEADERS_WEBKIT2GTK_EXTENSION_DIR})
     5
     6configure_file(UIProcess/API/gtk/WebKitVersion.h.in ${DERIVED_SOURCES_WEBKIT2GTK_API_DIR}/WebKitVersion.h)
    117configure_file(webkit2gtk.pc.in ${CMAKE_BINARY_DIR}/Source/WebKit2/webkit2gtk-3.0.pc @ONLY)
    128
    … …  
    2016    ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/InspectorGResourceBundle.c
    2117
    22     ${WEBKIT2_BUILT_API_DIR}/WebKitEnumTypes.cpp
    23     ${WEBKIT2_BUILT_API_DIR}/WebKitMarshal.cpp
     18    ${DERIVED_SOURCES_WEBKIT2GTK_API_DIR}/WebKitEnumTypes.cpp
     19    ${DERIVED_SOURCES_WEBKIT2GTK_API_DIR}/WebKitMarshal.cpp
    2420
    2521    Platform/CoreIPC/unix/AttachmentUnix.cpp
    … …  
    377373# This is necessary because of a conflict between the GTK+ API WebKitVersion.h and one generated by WebCore.
    378374list(INSERT WebKit2_INCLUDE_DIRECTORIES 0
    379     "${WEBKIT2_FORWARDING_HEADERS_DIR}"
    380     "${WEBKIT2_FORWARDING_HEADERS_DIR}/webkit2extension"
    381     "${WEBKIT2_BUILT_API_DIR}"
     375    "${FORWARDING_HEADERS_WEBKIT2GTK_DIR}"
     376    "${FORWARDING_HEADERS_WEBKIT2GTK_EXTENSION_DIR}"
     377    "${DERIVED_SOURCES_WEBKIT2GTK_API_DIR}"
    382378    "${DERIVED_SOURCES_WEBKIT2GTK_DIR}"
    383379)
    … …  
    438434set(WebKit2_MARSHAL_LIST ${WEBKIT2_DIR}/UIProcess/API/gtk/webkit2marshal.list)
    439435add_custom_command(
    440     OUTPUT ${WEBKIT2_BUILT_API_DIR}/WebKitMarshal.cpp
    441            ${WEBKIT2_BUILT_API_DIR}/WebKitMarshal.h
     436    OUTPUT ${DERIVED_SOURCES_WEBKIT2GTK_API_DIR}/WebKitMarshal.cpp
     437           ${DERIVED_SOURCES_WEBKIT2GTK_API_DIR}/WebKitMarshal.h
    442438    MAIN_DEPENDENCY ${WebKit2_MARSHAL_LIST}
    443439
    444     COMMAND echo extern \"C\" { > ${WEBKIT2_BUILT_API_DIR}/WebKitMarshal.cpp
    445     COMMAND glib-genmarshal --prefix=webkit_marshal ${WebKit2_MARSHAL_LIST} --body >> ${WEBKIT2_BUILT_API_DIR}/WebKitMarshal.cpp
    446     COMMAND echo } >> ${WEBKIT2_BUILT_API_DIR}/WebKitMarshal.cpp
    447 
    448     COMMAND glib-genmarshal --prefix=webkit_marshal ${WebKit2_MARSHAL_LIST} --header > ${WEBKIT2_BUILT_API_DIR}/WebKitMarshal.h
     440    COMMAND echo extern \"C\" { > ${DERIVED_SOURCES_WEBKIT2GTK_API_DIR}/WebKitMarshal.cpp
     441    COMMAND glib-genmarshal --prefix=webkit_marshal ${WebKit2_MARSHAL_LIST} --body >> ${DERIVED_SOURCES_WEBKIT2GTK_API_DIR}/WebKitMarshal.cpp
     442    COMMAND echo } >> ${DERIVED_SOURCES_WEBKIT2GTK_API_DIR}/WebKitMarshal.cpp
     443
     444    COMMAND glib-genmarshal --prefix=webkit_marshal ${WebKit2_MARSHAL_LIST} --header > ${DERIVED_SOURCES_WEBKIT2GTK_API_DIR}/WebKitMarshal.h
    449445    VERBATIM)
    450446
    451447add_custom_command(
    452     OUTPUT ${WEBKIT2_BUILT_API_DIR}/WebKitEnumTypes.h
    453            ${WEBKIT2_BUILT_API_DIR}/WebKitEnumTypes.cpp
     448    OUTPUT ${DERIVED_SOURCES_WEBKIT2GTK_API_DIR}/WebKitEnumTypes.h
     449           ${DERIVED_SOURCES_WEBKIT2GTK_API_DIR}/WebKitEnumTypes.cpp
    454450    DEPENDS ${WebKit2_INSTALLED_HEADERS}
    455451
    456     COMMAND glib-mkenums --template ${WEBKIT2_DIR}/UIProcess/API/gtk/WebKitEnumTypes.h.template ${WebKit2_INSTALLED_HEADERS} | sed s/web_kit/webkit/ | sed s/WEBKIT_TYPE_KIT/WEBKIT_TYPE/ > ${WEBKIT2_BUILT_API_DIR}/WebKitEnumTypes.h
    457 
    458     COMMAND glib-mkenums --template ${WEBKIT2_DIR}/UIProcess/API/gtk/WebKitEnumTypes.cpp.template ${WebKit2_INSTALLED_HEADERS} | sed s/web_kit/webkit/ > ${WEBKIT2_BUILT_API_DIR}/WebKitEnumTypes.cpp
     452    COMMAND glib-mkenums --template ${WEBKIT2_DIR}/UIProcess/API/gtk/WebKitEnumTypes.h.template ${WebKit2_INSTALLED_HEADERS} | sed s/web_kit/webkit/ | sed s/WEBKIT_TYPE_KIT/WEBKIT_TYPE/ > ${DERIVED_SOURCES_WEBKIT2GTK_API_DIR}/WebKitEnumTypes.h
     453
     454    COMMAND glib-mkenums --template ${WEBKIT2_DIR}/UIProcess/API/gtk/WebKitEnumTypes.cpp.template ${WebKit2_INSTALLED_HEADERS} | sed s/web_kit/webkit/ > ${DERIVED_SOURCES_WEBKIT2GTK_API_DIR}/WebKitEnumTypes.cpp
    459455    VERBATIM)
    460456
    … …  
    483479)
    484480
    485 # This symbolic link allows includes like #include <webkit2/WebkitWebView.h> which simulates installed headers.
    486 add_custom_target(fake-installed-headers
    487     mkdir -p ${DERIVED_SOURCES_WEBKIT2_DIR}/webkit2gtk/include
    488     COMMAND ln -n -s -f ${WEBKIT2_DIR}/UIProcess/API/gtk ${WEBKIT2_FORWARDING_HEADERS_DIR}/webkit2
    489 )
    490 
    491 add_custom_target(fake-installed-webextension-headers
    492     mkdir -p ${WEBKIT2_FORWARDING_HEADERS_DIR}/webkit2extension
    493     COMMAND ln -n -s -f ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk ${WEBKIT2_FORWARDING_HEADERS_DIR}/webkit2extension/webkit2
    494 )
    495 
    496 add_custom_target(gtk-forwarding-headers
    497     COMMAND ${PERL_EXECUTABLE} ${WEBKIT2_DIR}/Scripts/generate-forwarding-headers.pl ${WEBKIT2_DIR} ${DERIVED_SOURCES_WEBKIT2_DIR}/include gtk
    498 )
    499 
    500 add_custom_target(soup-forwarding-headers
    501     COMMAND ${PERL_EXECUTABLE} ${WEBKIT2_DIR}/Scripts/generate-forwarding-headers.pl ${WEBKIT2_DIR} ${DERIVED_SOURCES_WEBKIT2_DIR}/include soup
     481add_custom_target(webkit2gtk-forwarding-headers
     482    COMMAND ${PERL_EXECUTABLE} ${WEBKIT2_DIR}/Scripts/generate-forwarding-headers.pl ${WEBKIT2_DIR} ${FORWARDING_HEADERS_DIR} gtk
     483    COMMAND ${PERL_EXECUTABLE} ${WEBKIT2_DIR}/Scripts/generate-forwarding-headers.pl ${WEBKIT2_DIR} ${FORWARDING_HEADERS_DIR} soup
     484
     485    # These symbolic link allows includes like #include <webkit2/WebkitWebView.h> which simulates installed headers.
     486    COMMAND ln -n -s -f ${WEBKIT2_DIR}/UIProcess/API/gtk ${FORWARDING_HEADERS_WEBKIT2GTK_DIR}/webkit2
     487    COMMAND ln -n -s -f ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk ${FORWARDING_HEADERS_WEBKIT2GTK_EXTENSION_DIR}/webkit2
    502488)
    503489
    504490set(WEBKIT2_EXTRA_DEPENDENCIES
    505      fake-installed-headers
    506      gtk-forwarding-headers
    507      soup-forwarding-headers
    508      fake-installed-webextension-headers
     491     webkit2gtk-forwarding-headers
    509492)
    510493
    … …  
    658641    "${DERIVED_SOURCES_DIR}/InjectedBundle"
    659642    "${DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR}"
    660     "${DERIVED_SOURCES_WEBKIT2_DIR}/include"
     643    "${FORWARDING_HEADERS_DIR}"
     644    "${FORWARDING_HEADERS_WEBKIT2GTK_DIR}"
    661645)
    662646

  • trunk/Source/WebKit2/UIProcess/API/gtk/tests/CMakeLists.txt

    r161016 r161068  
    1 set(WEBKIT2_FORWARDING_HEADERS_DIR ${DERIVED_SOURCES_DIR}/ForwardingHeaders/webkit2gtk)
    21set(TEST_BINARY_DIR ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/WebKit2GObjectAPITests)
    32set(TEST_LIBRARY_DIR ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/WebKit2GObjectAPITests)
    … …  
    1817    ${CMAKE_SOURCE_DIR}/Source/WTF
    1918    ${DERIVED_SOURCES_DIR}
    20     ${DERIVED_SOURCES_DIR}/ForwardingHeaders
    21     ${DERIVED_SOURCES_DIR}/webkit2gtk
    22     ${DERIVED_SOURCES_DIR}/WebKit2/include
    23     ${WEBKIT2_FORWARDING_HEADERS_DIR}
    24     ${WEBKIT2_FORWARDING_HEADERS_DIR}/webkit2extension
     19    ${DERIVED_SOURCES_WEBKIT2GTK_DIR}
     20    ${FORWARDING_HEADERS_DIR}
     21    ${FORWARDING_HEADERS_WEBKIT2GTK_DIR}
     22    ${FORWARDING_HEADERS_WEBKIT2GTK_EXTENSION_DIR}
    2523    ${ATSPI_INCLUDE_DIRS}
    2624    ${GLIB_INCLUDE_DIRS}

  • trunk/Source/cmake/OptionsGTK.cmake

    r161016 r161068  
    196196
    197197set(CPACK_SOURCE_GENERATOR TBZ2)
     198
     199set(DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR ${DERIVED_SOURCES_DIR}/webkitdom)
     200set(DERIVED_SOURCES_WEBKITGTK_DIR ${DERIVED_SOURCES_DIR}/webkitgtk)
     201set(DERIVED_SOURCES_WEBKITGTK_API_DIR ${DERIVED_SOURCES_WEBKITGTK_DIR}/webkit)
     202set(DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR ${DERIVED_SOURCES_DIR}/webkitdom)
     203set(DERIVED_SOURCES_WEBKIT2GTK_DIR ${DERIVED_SOURCES_DIR}/webkit2gtk)
     204set(DERIVED_SOURCES_WEBKIT2GTK_API_DIR ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/webkit2)
     205set(FORWARDING_HEADERS_DIR ${DERIVED_SOURCES_DIR}/ForwardingHeaders)
     206set(FORWARDING_HEADERS_WEBKIT2GTK_DIR ${FORWARDING_HEADERS_DIR}/webkit2gtk)
     207set(FORWARDING_HEADERS_WEBKIT2GTK_EXTENSION_DIR ${FORWARDING_HEADERS_DIR}/webkit2gtk-webextension)

  • trunk/Tools/ChangeLog

    r161062 r161068  
     12013-12-25  Martin Robinson  <mrobinson@igalia.com>
     2
     3        [GTK] [CMake] Clean up generated sources directories
     4        https://bugs.webkit.org/show_bug.cgi?id=126216
     5
     6        Reviewed by Gustavo Noronha Silva.
     7
     8        * DumpRenderTree/PlatformGTK.cmake: Use the new derived sources variables.
     9        * GtkLauncher/CMakeLists.txt: Ditto.
     10        * MiniBrowser/gtk/CMakeLists.txt: Ditto.
     11        * TestWebKitAPI/CMakeLists.txt: Now that the EFL and GTK+ forwarding header locations differ,
     12        move the platform-specific includes to the EFL and GTK platform files. Also clean up forwarding
     13        header generation into on target.
     14        * TestWebKitAPI/PlatformEfl.cmake: Added EFL-specific locations to the include list.
     15        * TestWebKitAPI/PlatformGTK.cmake: Added GTK-specific locations to the include list.
     16        * WebKitTestRunner/CMakeLists.txt: Same as for TestWebKitAPI.
     17        * WebKitTestRunner/PlatformEfl.cmake: Ditto.
     18        * WebKitTestRunner/PlatformGTK.cmake: Ditto.
     19        * gtk/generate-gtkdoc: Update to select the appropriate derived sources locations for
     20        the cmake build.
     21
    1222013-12-23  Alexey Proskuryakov  <ap@apple.com>
    223

  • trunk/Tools/DumpRenderTree/PlatformGTK.cmake

    r160937 r161068  
    3131list(APPEND DumpRenderTree_INCLUDE_DIRECTORIES
    3232    ${DERIVED_SOURCES_DIR}
     33    ${DERIVED_SOURCES_WEBKITGTK_DIR}
    3334    ${WEBKIT_DIR}/gtk
    3435    ${WEBCORE_DIR}/platform/gtk

  • trunk/Tools/GtkLauncher/CMakeLists.txt

    r160805 r161068  
    77    ${CMAKE_SOURCE_DIR}/Source/WebKit/gtk
    88    ${DERIVED_SOURCES_DIR}
    9     ${DERIVED_SOURCES_DIR}/webkit
     9    ${DERIVED_SOURCES_WEBKITGTK_DIR}
    1010    ${GLIB_INCLUDE_DIRS}
    1111    ${GTK3_INCLUDE_DIRS}

  • trunk/Tools/MiniBrowser/gtk/CMakeLists.txt

    r160361 r161068  
    2121set(MiniBrowser_INCLUDE_DIRECTORIES
    2222    ${DERIVED_SOURCES_MINIBROWSER_DIR}
    23     ${DERIVED_SOURCES_DIR}/webkit2gtk
    24     ${DERIVED_SOURCES_DIR}/ForwardingHeaders/webkit2gtk
    25     ${DERIVED_SOURCES_DIR}/ForwardingHeaders
     23    ${DERIVED_SOURCES_WEBKIT2GTK_DIR}
     24    ${FORWARDING_HEADERS_WEBKIT2GTK_DIR}
     25    ${FORWARDING_HEADERS_DIR}
    2626    ${CMAKE_SOURCE_DIR}/Source
    2727    ${GTK3_INCLUDE_DIRS}

  • trunk/Tools/TestWebKitAPI/CMakeLists.txt

    r160404 r161068  
    66    ${CMAKE_SOURCE_DIR}/Source
    77    ${DERIVED_SOURCES_WEBCORE_DIR}
    8     ${DERIVED_SOURCES_WEBKIT2_DIR}/include
    98    ${JAVASCRIPTCORE_DIR}
    109    ${JAVASCRIPTCORE_DIR}/API
    … …  
    8382
    8483target_link_libraries(TestWebKitAPIInjectedBundle ${TestWebKitAPI_LIBRARIES})
    85 add_dependencies(TestWebKitAPIInjectedBundle ${ForwardingHeadersForTestWebKitAPI_NAME} ${ForwardingNetworkHeadersForTestWebKitAPI_NAME})
     84add_dependencies(TestWebKitAPIInjectedBundle ${ForwardingHeadersForTestWebKitAPI_NAME})
    8685
    8786get_property(TestWebKitAPIInjectedBundle_PATH TARGET TestWebKitAPIInjectedBundle PROPERTY LOCATION)

  • trunk/Tools/TestWebKitAPI/PlatformEfl.cmake

    r158689 r161068  
    33    COMMAND ${PERL_EXECUTABLE} ${WEBKIT2_DIR}/Scripts/generate-forwarding-headers.pl ${WEBKIT2_DIR} ${DERIVED_SOURCES_WEBKIT2_DIR}/include CoordinatedGraphics
    44    COMMAND ${PERL_EXECUTABLE} ${WEBKIT2_DIR}/Scripts/generate-forwarding-headers.pl ${TESTWEBKITAPI_DIR} ${DERIVED_SOURCES_WEBKIT2_DIR}/include efl
     5    COMMAND ${PERL_EXECUTABLE} ${WEBKIT2_DIR}/Scripts/generate-forwarding-headers.pl ${WEBKIT2_DIR} ${DERIVED_SOURCES_WEBKIT2_DIR}/include soup
     6    COMMAND ${PERL_EXECUTABLE} ${WEBKIT2_DIR}/Scripts/generate-forwarding-headers.pl ${TESTWEBKITAPI_DIR} ${DERIVED_SOURCES_WEBKIT2_DIR}/include soup
    57)
    68set(ForwardingHeadersForTestWebKitAPI_NAME forwarding-headersEflForTestWebKitAPI)
    79
    8 add_custom_target(forwarding-headersSoupForTestWebKitAPI
    9     COMMAND ${PERL_EXECUTABLE} ${WEBKIT2_DIR}/Scripts/generate-forwarding-headers.pl ${WEBKIT2_DIR} ${DERIVED_SOURCES_WEBKIT2_DIR}/include soup
    10     COMMAND ${PERL_EXECUTABLE} ${WEBKIT2_DIR}/Scripts/generate-forwarding-headers.pl ${TESTWEBKITAPI_DIR} ${DERIVED_SOURCES_WEBKIT2_DIR}/include soup
    11 )
    12 set(ForwardingNetworkHeadersForTestWebKitAPI_NAME forwarding-headersSoupForTestWebKitAPI)
    13 
    1410include_directories(
     11    ${DERIVED_SOURCES_WEBKIT2_DIR}/include
    1512    ${WEBKIT2_DIR}/UIProcess/API/C/CoordinatedGraphics
    1613    ${WEBKIT2_DIR}/UIProcess/API/C/soup

  • trunk/Tools/TestWebKitAPI/PlatformGTK.cmake

    r160728 r161068  
    44
    55add_custom_target(forwarding-headersGTKForTestWebKitAPI
    6     COMMAND ${PERL_EXECUTABLE} ${WEBKIT2_DIR}/Scripts/generate-forwarding-headers.pl ${WEBKIT2_DIR} ${DERIVED_SOURCES_WEBKIT2_DIR}/include gtk
    7     COMMAND ${PERL_EXECUTABLE} ${WEBKIT2_DIR}/Scripts/generate-forwarding-headers.pl ${TESTWEBKITAPI_DIR} ${DERIVED_SOURCES_WEBKIT2_DIR}/include gtk
     6    COMMAND ${PERL_EXECUTABLE} ${WEBKIT2_DIR}/Scripts/generate-forwarding-headers.pl ${WEBKIT2_DIR} ${FORWARDING_HEADERS_DIR} gtk
     7    COMMAND ${PERL_EXECUTABLE} ${WEBKIT2_DIR}/Scripts/generate-forwarding-headers.pl ${TESTWEBKITAPI_DIR} ${FORWARDING_HEADERS_DIR}  gtk
     8    COMMAND ${PERL_EXECUTABLE} ${WEBKIT2_DIR}/Scripts/generate-forwarding-headers.pl ${WEBKIT2_DIR} ${FORWARDING_HEADERS_DIR} soup
     9    COMMAND ${PERL_EXECUTABLE} ${WEBKIT2_DIR}/Scripts/generate-forwarding-headers.pl ${TESTWEBKITAPI_DIR} ${FORWARDING_HEADERS_DIR}  soup
    810)
    911set(ForwardingHeadersForTestWebKitAPI_NAME forwarding-headersGTKForTestWebKitAPI)
    1012
    11 add_custom_target(forwarding-headersSoupForTestWebKitAPI
    12     COMMAND ${PERL_EXECUTABLE} ${WEBKIT2_DIR}/Scripts/generate-forwarding-headers.pl ${WEBKIT2_DIR} ${DERIVED_SOURCES_WEBKIT2_DIR}/include soup
    13     COMMAND ${PERL_EXECUTABLE} ${WEBKIT2_DIR}/Scripts/generate-forwarding-headers.pl ${TESTWEBKITAPI_DIR} ${DERIVED_SOURCES_WEBKIT2_DIR}/include soup
    14 )
    15 set(ForwardingNetworkHeadersForTestWebKitAPI_NAME forwarding-headersSoupForTestWebKitAPI)
    16 
    1713include_directories(
     14    ${FORWARDING_HEADERS_DIR}
    1815    ${WEBKIT2_DIR}/UIProcess/API/C/soup
    1916    ${WEBKIT2_DIR}/UIProcess/API/C/gtk

  • trunk/Tools/WebKitTestRunner/CMakeLists.txt

    r160934 r161068  
    4646    ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/c
    4747    ${WTF_DIR}
    48     ${DERIVED_SOURCES_WEBCORE_DIR}
    49     ${DERIVED_SOURCES_WEBCORE_DIR}/include
    50     ${DERIVED_SOURCES_WEBKIT2_DIR}/include
    5148    ${DERIVED_SOURCES_DIR}/InjectedBundle
    5249    ${CMAKE_BINARY_DIR}
    … …  
    105102
    106103add_dependencies(WebKit2 ${ForwardingHeadersForWebKitTestRunner_NAME})
    107 add_dependencies(WebKit2 ${ForwardingNetworkHeadersForWebKitTestRunner_NAME})

  • trunk/Tools/WebKitTestRunner/PlatformEfl.cmake

    r160934 r161068  
    11add_custom_target(forwarding-headersEflForWebKitTestRunner
    22    COMMAND ${PERL_EXECUTABLE} ${WEBKIT2_DIR}/Scripts/generate-forwarding-headers.pl ${WEBKIT_TESTRUNNER_DIR} ${DERIVED_SOURCES_WEBKIT2_DIR}/include efl
     3    COMMAND ${PERL_EXECUTABLE} ${WEBKIT2_DIR}/Scripts/generate-forwarding-headers.pl ${WEBKIT_TESTRUNNER_DIR} ${DERIVED_SOURCES_WEBKIT2_DIR}/include soup
    34)
    45set(ForwardingHeadersForWebKitTestRunner_NAME forwarding-headersEflForWebKitTestRunner)
    5 
    6 add_custom_target(forwarding-headersSoupForWebKitTestRunner
    7     COMMAND ${PERL_EXECUTABLE} ${WEBKIT2_DIR}/Scripts/generate-forwarding-headers.pl ${WEBKIT_TESTRUNNER_DIR} ${DERIVED_SOURCES_WEBKIT2_DIR}/include soup
    8 )
    9 set(ForwardingNetworkHeadersForWebKitTestRunner_NAME forwarding-headersSoupForWebKitTestRunner)
    106
    117list(APPEND WebKitTestRunner_SOURCES
    … …  
    1915
    2016list(APPEND WebKitTestRunner_INCLUDE_DIRECTORIES
     17    ${DERIVED_SOURCES_WEBCORE_DIR}
     18    ${DERIVED_SOURCES_WEBCORE_DIR}/include
     19    ${DERIVED_SOURCES_WEBKIT2_DIR}/include
     20
    2121    ${WEBKIT2_DIR}/UIProcess/API/C/efl
    2222

  • trunk/Tools/WebKitTestRunner/PlatformGTK.cmake

    r160934 r161068  
    1 add_custom_target(gtk-forwarding-headers-for-WebKitTestRunner
    2     COMMAND ${PERL_EXECUTABLE} ${WEBKIT2_DIR}/Scripts/generate-forwarding-headers.pl ${WEBKIT_TESTRUNNER_DIR} ${DERIVED_SOURCES_WEBKIT2_DIR}/include gtk
     1add_custom_target(WebKitTestRunner-forwarding-headers
     2    COMMAND ${PERL_EXECUTABLE} ${WEBKIT2_DIR}/Scripts/generate-forwarding-headers.pl ${WEBKIT_TESTRUNNER_DIR} ${FORWARDING_HEADERS_DIR} gtk
     3    COMMAND ${PERL_EXECUTABLE} ${WEBKIT2_DIR}/Scripts/generate-forwarding-headers.pl ${WEBKIT_TESTRUNNER_DIR} ${FORWARDING_HEADERS_DIR} soup
    34)
    4 set(ForwardingHeadersForWebKitTestRunner_NAME gtk-forwarding-headers-for-WebKitTestRunner)
    5 
    6 add_custom_target(soup-forwarding-headers-for-WebKitTestRunner
    7     COMMAND ${PERL_EXECUTABLE} ${WEBKIT2_DIR}/Scripts/generate-forwarding-headers.pl ${WEBKIT_TESTRUNNER_DIR} ${DERIVED_SOURCES_WEBKIT2_DIR}/include soup
    8 )
    9 set(ForwardingNetworkHeadersForWebKitTestRunner_NAME soup-forwarding-headers-for-WebKitTestRunner)
     5set(ForwardingHeadersForWebKitTestRunner_NAME WebKitTestRunner-forwarding-headers)
    106
    117list(APPEND WebKitTestRunner_SOURCES
    … …  
    2319
    2420list(APPEND WebKitTestRunner_INCLUDE_DIRECTORIES
     21    ${FORWARDING_HEADERS_DIR}
    2522    ${WTF_DIR}/wtf/gobject
    2623    ${ATK_INCLUDE_DIRS}

  • trunk/Tools/gtk/generate-gtkdoc

    r161017 r161068  
    7777
    7878def get_webkit2_options():
    79     def derived_sources_path(*args):
    80         return common.build_path(*(('DerivedSources', 'WebKit2') + args))
    81     def src_path(*args):
    82         return common.top_level_path(*(('Source', 'WebKit2', 'UIProcess', 'API', 'gtk') + args))
    83     def injected_bundle_src_path(*args):
    84         return common.top_level_path(*(('Source', 'WebKit2', 'WebProcess', 'InjectedBundle', 'API', 'gtk') + args))
     79    api_path = common.top_level_path('Source', 'WebKit2', 'UIProcess', 'API', 'gtk')
     80    injected_bundle_api_path = common.top_level_path('Source', 'WebKit2', 'WebProcess', 'InjectedBundle', 'API', 'gtk')
     81
     82    if common.is_cmake_build():
     83        generated_api_path = common.build_path('DerivedSources', 'webkit2gtk', 'webkit2')
     84    else:
     85        generated_api_path = common.build_path('DerivedSources', 'WebKit2', 'webkit2gtk', 'webkit2')
    8586
    8687    xref_deps = get_common_xref_deps().copy()
    … …  
    8889        'gtk+-3.0' : ['gtk3', 'gdk3']
    8990    })
     91
     92    def src_path(*args):
     93        return os.path.join(api_path, *args)
    9094
    9195    options = get_common_options().copy()
    … …  
    9599        'doc_dir' : src_path('docs'),
    96100        'output_dir' : common.build_path('Documentation', 'webkit2gtk'),
    97         'source_dirs' : [src_path(), derived_sources_path('webkit2gtk', 'webkit2'), injected_bundle_src_path()],
    98         'cflags' : ' -I' + derived_sources_path('webkit2gtk', 'include') + \
    99                    ' -I' + derived_sources_path('webkit2gtk') + \
    100                    ' -I' + derived_sources_path('include') + \
    101                    ' -I' + common.top_level_path('Source') + \
    102                    ' -I' + src_path(),
     101        'source_dirs' : [src_path(), generated_api_path, injected_bundle_api_path],
     102        'cflags' :
     103            # Common paths
     104            ' -I' + common.top_level_path('Source') + \
     105            ' -I' + api_path + \
     106            # Autotools paths
     107            ' -I' + common.build_path('DerivedSources', 'webkit2gtk', 'include') + \
     108            ' -I' + common.build_path('DerivedSources', 'WebKit2', 'webkit2gtk') + \
     109            # CMake paths
     110            ' -I' + common.build_path('DerivedSources', 'ForwardingHeaders', 'webkit2gtk') + \
     111            ' -I' + common.build_path('DerivedSources', 'webkit2gtk'),
    103112        'cross_reference_deps' : get_gtkdoc_module_paths(xref_deps) + [webkitdom_docs_html_path()],
    104113        'ignored_files': glob.glob(src_path('*Private.h')) + \
    105                          glob.glob(injected_bundle_src_path('*Private.h')) + \
     114                         glob.glob(os.path.join(injected_bundle_api_path, '*Private.h')) + \
    106115                         glob.glob(src_path('*Client*')) + \
    107116                         glob.glob(src_path('WebKitAuthenticationDialog.*')) + \
    … …  
    111120                         glob.glob(src_path('WebKitWebViewBaseAccessible.*')) + \
    112121                         glob.glob(src_path('WebViewBaseInputMethodFilter.*')) + \
    113                          glob.glob(derived_sources_path('webkit2gtk', 'webkit2', 'WebKitMarshal.*')) + \
    114                          glob.glob(derived_sources_path('webkit2gtk', 'webkit2', 'WebKitEnumTypes.*')) + \
     122                         glob.glob(os.path.join(generated_api_path, 'WebKitMarshal.*')) + \
     123                         glob.glob(os.path.join(generated_api_path, 'WebKitEnumTypes.*')) + \
    115124                         glob.glob(src_path('tests/*.h'))
    116125    })
    … …  
    123132    def webkitversionh_path():
    124133        if common.is_cmake_build():
    125             return common.build_path('DerivedSources', 'webkit')
     134            return common.build_path('DerivedSources', 'webkitgtk')
    126135        else:
    127136            return common.build_path('Source', 'WebKit', 'gtk', 'webkit')
Note: See TracChangeset for help on using the changeset viewer.