Changeset 160804 in webkit


Ignore:
Timestamp:
Dec 18, 2013 4:04:47 PM (10 years ago)
Author:
Martin Robinson
Message:

[GTK] [CMake] Add support for building WebKit1
https://bugs.webkit.org/show_bug.cgi?id=116377

Reviewed by Gustavo Noronha Silva.

.:

  • Source/cmake/OptionsGTK.cmake: Turn off some features that do not build properly

for WebKit1 and stop using the version script which we haven't implemented yet. Turn
on WebKit1.

Source/WebCore:

  • PlatformGTK.cmake: Add a missing source required by WebKit1 to

the WebCore build.

Source/WebKit:

  • CMakeLists.txt: Updated WebCore include directory list for WebKitGTK+ and

added BUILDING_WEBKIT to the list of defines.

  • PlatformGTK.cmake: Added.

Source/WebKit/gtk:

  • GNUmakefile.am: Switch to using the templates for building the GObject enums.
  • webkit/webkitenumtypes.cpp.template: Added.
  • webkit/webkitenumtypes.h.template: Added.
Location:
trunk
Files:
3 added
8 edited

Legend:

Unmodified
Added
Removed
  • trunk/ChangeLog

    r160799 r160804  
     12013-12-16  Martin Robinson  <mrobinson@igalia.com>
     2
     3        [GTK] [CMake] Add support for building WebKit1
     4        https://bugs.webkit.org/show_bug.cgi?id=116377
     5
     6        Reviewed by Gustavo Noronha Silva.
     7
     8        * Source/cmake/OptionsGTK.cmake: Turn off some features that do not build properly
     9        for WebKit1 and stop using the version script which we haven't implemented yet. Turn
     10        on WebKit1.
     11
    1122013-12-18  Gustavo Noronha Silva  <gns@gnome.org>
    213
  • trunk/Source/WebCore/ChangeLog

    r160802 r160804  
     12013-12-16  Martin Robinson  <mrobinson@igalia.com>
     2
     3        [GTK] [CMake] Add support for building WebKit1
     4        https://bugs.webkit.org/show_bug.cgi?id=116377
     5
     6        Reviewed by Gustavo Noronha Silva.
     7
     8        * PlatformGTK.cmake: Add a missing source required by WebKit1 to
     9        the WebCore build.
     10
    1112013-12-18  Hans Muller  <hmuller@adobe.com>
    212
  • trunk/Source/WebCore/PlatformGTK.cmake

    r160728 r160804  
    4545    platform/graphics/cairo/CairoUtilities.cpp
    4646    platform/graphics/cairo/DrawingBufferCairo.cpp
     47    platform/graphics/cairo/FloatRectCairo.cpp
    4748    platform/graphics/cairo/FontCairo.cpp
    4849    platform/graphics/cairo/FontCairoHarfbuzzNG.cpp
  • trunk/Source/WebKit/CMakeLists.txt

    r159852 r160804  
    44    "${WEBKIT_DIR}"
    55    "${WEBCORE_DIR}"
     6    "${WEBCORE_DIR}/Modules/geolocation"
    67    "${WEBCORE_DIR}/Modules/filesystem"
    78    "${WEBCORE_DIR}/Modules/mediastream"
     9    "${WEBCORE_DIR}/Modules/navigatorcontentutils"
    810    "${WEBCORE_DIR}/Modules/networkinfo"
    911    "${WEBCORE_DIR}/Modules/webdatabase"
     12    "${WEBCORE_DIR}/Modules/websockets"
    1013    "${WEBCORE_DIR}/accessibility"
    1114    "${WEBCORE_DIR}/bindings/generic"
     
    1922    "${WEBCORE_DIR}/dom/default"
    2023    "${WEBCORE_DIR}/editing"
     24    "${WEBCORE_DIR}/fileapi"
    2125    "${WEBCORE_DIR}/history"
    2226    "${WEBCORE_DIR}/html"
     
    2529    "${WEBCORE_DIR}/inspector"
    2630    "${WEBCORE_DIR}/loader"
     31    "${WEBCORE_DIR}/loader/archive"
    2732    "${WEBCORE_DIR}/loader/appcache"
    2833    "${WEBCORE_DIR}/loader/icon"
     
    3944    "${WEBCORE_DIR}/platform/graphics/transforms"
    4045    "${WEBCORE_DIR}/platform/mediastream"
     46    "${WEBCORE_DIR}/platform/mock"
    4147    "${WEBCORE_DIR}/platform/network"
    4248    "${WEBCORE_DIR}/platform/sql"
     
    4450    "${WEBCORE_DIR}/plugins"
    4551    "${WEBCORE_DIR}/rendering"
     52    "${WEBCORE_DIR}/rendering/line"
    4653    "${WEBCORE_DIR}/rendering/shapes"
    4754    "${WEBCORE_DIR}/rendering/style"
     
    4956    "${WEBCORE_DIR}/style"
    5057    "${WEBCORE_DIR}/svg"
     58    "${WEBCORE_DIR}/svg/animation"
    5159    "${WEBCORE_DIR}/svg/graphics"
    5260    "${WEBCORE_DIR}/svg/properties"
     
    93101add_dependencies(WebKit WebCore)
    94102target_link_libraries(WebKit ${WebKit_LIBRARIES})
    95 set_target_properties(WebKit PROPERTIES COMPILE_DEFINITIONS "BUILDING_WebKit")
     103set_target_properties(WebKit PROPERTIES COMPILE_DEFINITIONS "BUILDING_WebKit;BUILDING_WEBKIT")
    96104set_target_properties(WebKit PROPERTIES FOLDER "WebKit")
    97105set_target_properties(WebKit PROPERTIES LINK_INTERFACE_LIBRARIES "")
  • trunk/Source/WebKit/ChangeLog

    r160798 r160804  
     12013-12-16  Martin Robinson  <mrobinson@igalia.com>
     2
     3        [GTK] [CMake] Add support for building WebKit1
     4        https://bugs.webkit.org/show_bug.cgi?id=116377
     5
     6        Reviewed by Gustavo Noronha Silva.
     7
     8        * CMakeLists.txt: Updated WebCore include directory list for WebKitGTK+ and
     9        added BUILDING_WEBKIT to the list of defines.
     10        * PlatformGTK.cmake: Added.
     11
    1122013-12-18  Alex Christensen  <achristensen@webkit.org>
    213
  • trunk/Source/WebKit/gtk/ChangeLog

    r160759 r160804  
     12013-12-16  Martin Robinson  <mrobinson@igalia.com>
     2
     3        [GTK] [CMake] Add support for building WebKit1
     4        https://bugs.webkit.org/show_bug.cgi?id=116377
     5
     6        Reviewed by Gustavo Noronha Silva.
     7
     8        * GNUmakefile.am: Switch to using the templates for building the GObject enums.
     9        * webkit/webkitenumtypes.cpp.template: Added.
     10        * webkit/webkitenumtypes.h.template: Added.
     11
    1122013-12-18  Carlos Garcia Campos  <cgarcia@igalia.com>
    213
  • trunk/Source/WebKit/gtk/GNUmakefile.am

    r160444 r160804  
    363363        @true
    364364stamp-webkitenumtypes.h: $(webkitgtk_h_api) $(WebKit)/GNUmakefile.am
    365         $(AM_V_GEN)glib-mkenums \
    366                         --fhead "#ifndef WEBKIT_ENUM_TYPES_H\n" \
    367                         --fhead "#define WEBKIT_ENUM_TYPES_H\n\n" \
    368                         --fhead "#include <glib-object.h>\n\n" \
    369                         --fhead "#include <webkit/webkitdefines.h>\n\n" \
    370                         --fhead "G_BEGIN_DECLS\n\n" \
    371                         --ftail "G_END_DECLS\n\n" \
    372                         --ftail "#endif\n" \
    373                         --fprod "#include <webkit/@basename@>\n\n" \
    374                         --eprod "#define WEBKIT_TYPE_@ENUMSHORT@ @enum_name@_get_type()\n\n" \
    375                         --eprod "WEBKIT_API GType\n@enum_name@_get_type(void);\n\n" \
    376                 $(webkitgtk_h_api) | \
     365        $(AM_V_GEN)glib-mkenums --template $(srcdir)/Source/WebKit/gtk/webkit/webkitenumtypes.h.template $(webkitgtk_h_api) | \
    377366                sed 's,web_kit,webkit,' | \
    378367                sed 's,WEBKIT_TYPE_KIT,WEBKIT_TYPE,' \
     
    383372
    384373$(GENSOURCES_WEBKIT)/webkitenumtypes.cpp: $(webkitgtk_h_api) $(WebKit)/GNUmakefile.am
    385         $(AM_V_GEN)glib-mkenums \
    386                         --fhead "#include <config.h>\n" \
    387                         --fhead "#include <glib-object.h>\n" \
    388                         --fhead "#include \"$(GENSOURCES_WEBKIT)/webkitenumtypes.h\"\n\n" \
    389                         --fhead "extern \"C\" {\n\n" \
    390                         --fprod "\n/* enumerations from \"@filename@\" */" \
    391                         --vhead "static const G@Type@Value _@enum_name@_values[] = {" \
    392                         --vprod "    { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
    393                         --vtail "    { 0, NULL, NULL }\n};\n\n" \
    394                         --vtail "GType @enum_name@_get_type(void)\n{\n" \
    395                         --vtail "    static GType type = 0;\n\n" \
    396                         --vtail "    if (!type)\n" \
    397                         --vtail "        type = g_@type@_register_static(\"@EnumName@\", _@enum_name@_values);\n\n" \
    398                         --vtail "    return type;\n}\n\n" \
    399                         --ftail "}\n" \
    400                 $(webkitgtk_h_api) | \
     374        $(AM_V_GEN)glib-mkenums --template $(srcdir)/Source/WebKit/gtk/webkit/webkitenumtypes.cpp.template $(webkitgtk_h_api) | \
    401375                sed 's,web_kit,webkit,' \
    402376                > xgen-gtc \
  • trunk/Source/cmake/OptionsGTK.cmake

    r160799 r160804  
    1313WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_REGIONS ON)
    1414WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_STICKY_POSITION ON)
    15 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CUSTOM_SCHEME_HANDLER ON)
     15WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CUSTOM_SCHEME_HANDLER OFF)
    1616WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DATALIST_ELEMENT ON)
    1717WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DOWNLOAD_ATTRIBUTE ON)
     
    2222WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_GAMEPAD OFF)
    2323WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INDEXED_DATABASE ON)
    24 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_COLOR ON)
     24WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_COLOR OFF)
    2525WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LINK_PREFETCH ON)
    2626WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LLINT ON)
     
    7272set(ENABLE_INSPECTOR ON)
    7373set(ENABLE_PLUGIN_PROCESS ON)
    74 set(ENABLE_WEBKIT OFF)
     74set(ENABLE_WEBKIT ON)
    7575set(ENABLE_WEBKIT2 ON)
    7676
     
    8484set(WebKit2_OUTPUT_NAME webkit2gtk-3.0)
    8585set(WebKit2_WebProcess_OUTPUT_NAME WebKitWebProcess)
    86 set(VERSION_SCRIPT "-Wl,--version-script,${CMAKE_MODULE_PATH}/gtksymbols.filter")
    8786
    8887set(DATA_BUILD_DIR "${CMAKE_BINARY_DIR}/share/${WebKit_OUTPUT_NAME}")
Note: See TracChangeset for help on using the changeset viewer.