Changeset 160804 in webkit
- Timestamp:
- Dec 18, 2013 4:04:47 PM (10 years ago)
- Location:
- trunk
- Files:
-
- 3 added
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/ChangeLog
r160799 r160804 1 2013-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 1 12 2013-12-18 Gustavo Noronha Silva <gns@gnome.org> 2 13 -
trunk/Source/WebCore/ChangeLog
r160802 r160804 1 2013-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 1 11 2013-12-18 Hans Muller <hmuller@adobe.com> 2 12 -
trunk/Source/WebCore/PlatformGTK.cmake
r160728 r160804 45 45 platform/graphics/cairo/CairoUtilities.cpp 46 46 platform/graphics/cairo/DrawingBufferCairo.cpp 47 platform/graphics/cairo/FloatRectCairo.cpp 47 48 platform/graphics/cairo/FontCairo.cpp 48 49 platform/graphics/cairo/FontCairoHarfbuzzNG.cpp -
trunk/Source/WebKit/CMakeLists.txt
r159852 r160804 4 4 "${WEBKIT_DIR}" 5 5 "${WEBCORE_DIR}" 6 "${WEBCORE_DIR}/Modules/geolocation" 6 7 "${WEBCORE_DIR}/Modules/filesystem" 7 8 "${WEBCORE_DIR}/Modules/mediastream" 9 "${WEBCORE_DIR}/Modules/navigatorcontentutils" 8 10 "${WEBCORE_DIR}/Modules/networkinfo" 9 11 "${WEBCORE_DIR}/Modules/webdatabase" 12 "${WEBCORE_DIR}/Modules/websockets" 10 13 "${WEBCORE_DIR}/accessibility" 11 14 "${WEBCORE_DIR}/bindings/generic" … … 19 22 "${WEBCORE_DIR}/dom/default" 20 23 "${WEBCORE_DIR}/editing" 24 "${WEBCORE_DIR}/fileapi" 21 25 "${WEBCORE_DIR}/history" 22 26 "${WEBCORE_DIR}/html" … … 25 29 "${WEBCORE_DIR}/inspector" 26 30 "${WEBCORE_DIR}/loader" 31 "${WEBCORE_DIR}/loader/archive" 27 32 "${WEBCORE_DIR}/loader/appcache" 28 33 "${WEBCORE_DIR}/loader/icon" … … 39 44 "${WEBCORE_DIR}/platform/graphics/transforms" 40 45 "${WEBCORE_DIR}/platform/mediastream" 46 "${WEBCORE_DIR}/platform/mock" 41 47 "${WEBCORE_DIR}/platform/network" 42 48 "${WEBCORE_DIR}/platform/sql" … … 44 50 "${WEBCORE_DIR}/plugins" 45 51 "${WEBCORE_DIR}/rendering" 52 "${WEBCORE_DIR}/rendering/line" 46 53 "${WEBCORE_DIR}/rendering/shapes" 47 54 "${WEBCORE_DIR}/rendering/style" … … 49 56 "${WEBCORE_DIR}/style" 50 57 "${WEBCORE_DIR}/svg" 58 "${WEBCORE_DIR}/svg/animation" 51 59 "${WEBCORE_DIR}/svg/graphics" 52 60 "${WEBCORE_DIR}/svg/properties" … … 93 101 add_dependencies(WebKit WebCore) 94 102 target_link_libraries(WebKit ${WebKit_LIBRARIES}) 95 set_target_properties(WebKit PROPERTIES COMPILE_DEFINITIONS "BUILDING_WebKit ")103 set_target_properties(WebKit PROPERTIES COMPILE_DEFINITIONS "BUILDING_WebKit;BUILDING_WEBKIT") 96 104 set_target_properties(WebKit PROPERTIES FOLDER "WebKit") 97 105 set_target_properties(WebKit PROPERTIES LINK_INTERFACE_LIBRARIES "") -
trunk/Source/WebKit/ChangeLog
r160798 r160804 1 2013-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 1 12 2013-12-18 Alex Christensen <achristensen@webkit.org> 2 13 -
trunk/Source/WebKit/gtk/ChangeLog
r160759 r160804 1 2013-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 1 12 2013-12-18 Carlos Garcia Campos <cgarcia@igalia.com> 2 13 -
trunk/Source/WebKit/gtk/GNUmakefile.am
r160444 r160804 363 363 @true 364 364 stamp-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) | \ 377 366 sed 's,web_kit,webkit,' | \ 378 367 sed 's,WEBKIT_TYPE_KIT,WEBKIT_TYPE,' \ … … 383 372 384 373 $(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) | \ 401 375 sed 's,web_kit,webkit,' \ 402 376 > xgen-gtc \ -
trunk/Source/cmake/OptionsGTK.cmake
r160799 r160804 13 13 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_REGIONS ON) 14 14 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CSS_STICKY_POSITION ON) 15 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CUSTOM_SCHEME_HANDLER O N)15 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_CUSTOM_SCHEME_HANDLER OFF) 16 16 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DATALIST_ELEMENT ON) 17 17 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DOWNLOAD_ATTRIBUTE ON) … … 22 22 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_GAMEPAD OFF) 23 23 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INDEXED_DATABASE ON) 24 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_COLOR O N)24 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_COLOR OFF) 25 25 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LINK_PREFETCH ON) 26 26 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LLINT ON) … … 72 72 set(ENABLE_INSPECTOR ON) 73 73 set(ENABLE_PLUGIN_PROCESS ON) 74 set(ENABLE_WEBKIT O FF)74 set(ENABLE_WEBKIT ON) 75 75 set(ENABLE_WEBKIT2 ON) 76 76 … … 84 84 set(WebKit2_OUTPUT_NAME webkit2gtk-3.0) 85 85 set(WebKit2_WebProcess_OUTPUT_NAME WebKitWebProcess) 86 set(VERSION_SCRIPT "-Wl,--version-script,${CMAKE_MODULE_PATH}/gtksymbols.filter")87 86 88 87 set(DATA_BUILD_DIR "${CMAKE_BINARY_DIR}/share/${WebKit_OUTPUT_NAME}")
Note: See TracChangeset
for help on using the changeset viewer.