Changeset 74766 in webkit
- Timestamp:
- Dec 29, 2010 3:46:42 PM (13 years ago)
- Location:
- trunk
- Files:
-
- 2 added
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/GNUmakefile.am
r74677 r74766 35 35 GENSOURCES_WEBCORE := $(top_builddir)/DerivedSources/WebCore 36 36 GENSOURCES_WEBKIT := $(top_builddir)/DerivedSources/webkit 37 GENSOURCES_WEBKIT2 := $(top_builddir)/DerivedSources/WebKit2 37 38 GENPROGRAMS := $(top_builddir)/Programs 38 39 GENSOURCES_INSPECTOR := $(GENPROGRAMS)/resources/inspector 39 40 WebCore := $(srcdir)/WebCore 40 41 WebKit := $(srcdir)/WebKit/gtk 42 WebKit2 := $(srcdir)/WebKit2 41 43 42 44 # Libraries and support components … … 70 72 webkitgtk_built_sources := 71 73 webkitgtk_built_nosources := 74 webkit2_built_sources := 72 75 global_cppflags := 73 76 global_cflags := … … 204 207 include JavaScriptCore/GNUmakefile.am 205 208 include WebCore/GNUmakefile.am 209 if ENABLE_WEBKIT2 210 include WebKit2/GNUmakefile.am 211 else 206 212 include WebKit/gtk/GNUmakefile.am 207 213 include WebCore/bindings/gobject/GNUmakefile.am 208 214 include Tools/GNUmakefile.am 209 215 include WebKit/gtk/po/GNUmakefile.am 216 endif 210 217 211 218 # Autogenerated sources -
trunk/WebCore/ChangeLog
r74764 r74766 1 2010-12-27 Amruth Raj <amruthraj@motorola.com> and Ravi Kasibhatla <ravi.kasibhatla@motorola.com> 2 3 Reviewed by Martin Robinson. 4 5 [GTK] Enable building whatever already exists of WebKit2 6 https://bugs.webkit.org/show_bug.cgi?id=37369 7 8 No new functionality added or deleted. Only makefile change. Hence, no tests added. 9 10 * GNUmakefile.am: Removed bindings/gobject from webcore_sources & webcore_cppflags and 11 added them to WebKit/gtk/GNUmakefile.am 12 * platform/network/soup/cache/webkit/soup-cache.h: Remove include <webkit/webkitdefines.h> 13 and declare WEBKIT_API directly 14 1 15 2010-12-29 Eric Seidel <eric@webkit.org> 2 16 -
trunk/WebCore/GNUmakefile.am
r74761 r74766 8 8 -I$(srcdir)/WebCore \ 9 9 -I$(srcdir)/WebCore/accessibility \ 10 -I$(srcdir)/WebCore/bindings \ 10 11 -I$(srcdir)/WebCore/bindings/generic \ 11 12 -I$(srcdir)/WebCore/bindings/js \ 12 13 -I$(srcdir)/WebCore/bindings/js/specialization \ 13 -I$(srcdir)/WebCore/bindings/gobject \14 14 -I$(srcdir)/WebCore/bridge \ 15 15 -I$(srcdir)/WebCore/bridge/c \ … … 687 687 WebCore/bindings/generic/RuntimeEnabledFeatures.cpp \ 688 688 WebCore/bindings/generic/RuntimeEnabledFeatures.h \ 689 WebCore/bindings/gobject/ConvertToUTF8String.cpp \690 WebCore/bindings/gobject/ConvertToUTF8String.h \691 WebCore/bindings/gobject/DOMObjectCache.cpp \692 WebCore/bindings/gobject/DOMObjectCache.h \693 WebCore/bindings/gobject/GObjectEventListener.cpp \694 WebCore/bindings/gobject/GObjectEventListener.h \695 WebCore/bindings/gobject/WebKitDOMBinding.cpp \696 WebCore/bindings/gobject/WebKitDOMBinding.h \697 WebCore/bindings/gobject/WebKitDOMEventTarget.cpp \698 WebCore/bindings/gobject/WebKitDOMEventTarget.h \699 WebCore/bindings/gobject/WebKitDOMEventTargetPrivate.h \700 WebCore/bindings/gobject/WebKitDOMObject.cpp \701 WebCore/bindings/gobject/WebKitDOMObject.h \702 WebCore/bindings/gobject/WebKitHTMLElementWrapperFactory.cpp \703 WebCore/bindings/gobject/WebKitHTMLElementWrapperFactory.h \704 689 WebCore/bindings/js/CachedScriptSourceProvider.h \ 705 690 WebCore/bindings/js/DOMObjectHashTableMap.cpp \ -
trunk/WebCore/platform/network/soup/cache/webkit/soup-cache.h
r74555 r74766 24 24 #define WEBKIT_SOUP_CACHE_H 1 25 25 26 #ifdef BUILDING_GTK__ 27 #include <webkit/webkitdefines.h> 26 #ifdef G_OS_WIN32 27 #ifdef BUILDING_WEBKIT 28 #define WEBKIT_API __declspec(dllexport) 29 #else 30 #define WEBKIT_API __declspec(dllimport) 31 #endif 32 #define WEBKIT_OBSOLETE_API WEBKIT_API 28 33 #else 29 #ifndef WEBKIT_API 30 #define WEBKIT_API 31 #endif 34 #define WEBKIT_API __attribute__((visibility("default"))) 35 #define WEBKIT_OBSOLETE_API WEBKIT_API __attribute__((deprecated)) 32 36 #endif 33 37 -
trunk/WebKit/gtk/GNUmakefile.am
r74366 r74766 155 155 156 156 webkitgtk_sources += \ 157 WebCore/bindings/gobject/ConvertToUTF8String.cpp \ 158 WebCore/bindings/gobject/ConvertToUTF8String.h \ 159 WebCore/bindings/gobject/DOMObjectCache.cpp \ 160 WebCore/bindings/gobject/DOMObjectCache.h \ 161 WebCore/bindings/gobject/GObjectEventListener.cpp \ 162 WebCore/bindings/gobject/GObjectEventListener.h \ 163 WebCore/bindings/gobject/WebKitDOMBinding.cpp \ 164 WebCore/bindings/gobject/WebKitDOMBinding.h \ 165 WebCore/bindings/gobject/WebKitDOMEventTarget.cpp \ 166 WebCore/bindings/gobject/WebKitDOMEventTarget.h \ 167 WebCore/bindings/gobject/WebKitDOMEventTargetPrivate.h \ 168 WebCore/bindings/gobject/WebKitDOMObject.cpp \ 169 WebCore/bindings/gobject/WebKitDOMObject.h \ 170 WebCore/bindings/gobject/WebKitHTMLElementWrapperFactory.cpp \ 171 WebCore/bindings/gobject/WebKitHTMLElementWrapperFactory.h \ 157 172 WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp \ 158 173 WebKit/gtk/WebCoreSupport/ChromeClientGtk.h \ -
trunk/WebKit2/ChangeLog
r74738 r74766 1 2010-12-15 Amruth Raj <amruthraj@motorola.com> and Ravi Kasibhatla <ravi.kasibhatla@motorola.com> 2 3 Reviewed by Martin Robinson. 4 5 [GTK] Enable building whatever already exists of WebKit2 6 https://bugs.webkit.org/show_bug.cgi?id=37369 7 8 * GNUmakefile.am: Added. 9 * WebKit2Prefix.h: Included WebCore/config.h for GTK port as the first header 10 file for WebKit2 sources files. 11 * gtk: Added. 12 * gtk/webkit2.pc.in: Added. 13 1 14 2010-12-29 Juha Savolainen <juha.savolainen@weego.fi> 2 15 -
trunk/WebKit2/WebKit2Prefix.h
r74124 r74766 1 1 /* 2 2 * Copyright (C) 2010 Apple Inc. All rights reserved. 3 * Portions Copyright (c) 2010 Motorola Mobility, Inc. All rights reserved. 3 4 * 4 5 * Redistribution and use in source and binary forms, with or without … … 23 24 * THE POSSIBILITY OF SUCH DAMAGE. 24 25 */ 26 27 #if defined (BUILDING_GTK__) 28 #include <WebCore/config.h> 29 #endif /* defined (BUILDING_GTK__) */ 25 30 26 31 #include <wtf/Platform.h> -
trunk/configure.ac
r74677 r74766 901 901 if test "$enable_video" = "yes"; then 902 902 html_flags=yes 903 fi 904 905 # WebKit2 906 AC_MSG_CHECKING([whether to build Webkit2]) 907 AC_ARG_ENABLE(webkit2, 908 AC_HELP_STRING([--enable-webkit2], 909 [build webkit2 [default=no]]), 910 [], [enable_webkit2="no"]) 911 AC_MSG_RESULT([$enable_webkit2]) 912 if test "$enable_webkit2" = "yes"; then 913 # Turn on this macro by default. It is used in inttypes.h for defining macros used by webkit. 914 # In WebKit, this define is ensured by doing it before including config.h in any source file. 915 # In WebKit2, WebKit2Prefix.h is included as first header file, so we need to define this 916 # macro before actually WebKit2Prefix.h is included in any file. 917 AC_DEFINE([__STDC_FORMAT_MACROS],[1],[Turn on the __STDC_FORMAT_MACROS used in inttypes.h]), 918 WEBKITGTK_PC_NAME=${WEBKITGTK_PC_NAME}2 919 AC_SUBST([WEBKITGTK_PC_NAME]) 903 920 fi 904 921 … … 977 994 AM_CONDITIONAL([ENABLE_WEB_TIMING],[test "$enable_web_timing" = "yes"]) 978 995 AM_CONDITIONAL([ENABLE_OPCODE_STATS],[test "$enable_opcode_stats" = "yes"]) 996 AM_CONDITIONAL([ENABLE_WEBKIT2],[test "$enable_webkit2" = "yes"]) 979 997 980 998 # Gtk conditionals 981 999 AM_CONDITIONAL([ENABLE_INTROSPECTION],[test "$enable_introspection" = "yes"]) 982 1000 983 984 1001 AC_CONFIG_FILES([ 985 1002 GNUmakefile 986 WebKit/gtk/webkit/webkitversion.h 987 WebKit/gtk/docs/GNUmakefile 988 WebKit/gtk/docs/version.xml 989 ] 990 ) 991 992 AC_CONFIG_FILES([ 993 WebKit/gtk/${WEBKITGTK_PC_NAME}-${WEBKITGTK_API_VERSION}.pc:WebKit/gtk/webkit.pc.in 994 WebKit/gtk/JSCore-${WEBKITGTK_API_VERSION}.gir:WebKit/gtk/JSCore.gir.in 995 WebKit/gtk/org.webkitgtk-${WEBKITGTK_API_VERSION}.gschema.xml:WebKit/gtk/org.webkitgtk.gschema.xml.in 996 ] 997 ,[WEBKITGTK_API_VERSION=$WEBKITGTK_API_VERSION,WEBKITGTK_PC_NAME=$WEBKITGTK_PC_NAME] 998 ) 1003 ]) 1004 1005 if test "$enable_webkit2" = "no"; then 1006 AC_CONFIG_FILES([ 1007 WebKit/gtk/webkit/webkitversion.h 1008 WebKit/gtk/docs/GNUmakefile 1009 WebKit/gtk/docs/version.xml 1010 ] 1011 ) 1012 1013 AC_CONFIG_FILES([ 1014 WebKit/gtk/${WEBKITGTK_PC_NAME}-${WEBKITGTK_API_VERSION}.pc:WebKit/gtk/webkit.pc.in 1015 WebKit/gtk/JSCore-${WEBKITGTK_API_VERSION}.gir:WebKit/gtk/JSCore.gir.in 1016 WebKit/gtk/org.webkitgtk-${WEBKITGTK_API_VERSION}.gschema.xml:WebKit/gtk/org.webkitgtk.gschema.xml.in 1017 ] 1018 ,[WEBKITGTK_API_VERSION=$WEBKITGTK_API_VERSION,WEBKITGTK_PC_NAME=$WEBKITGTK_PC_NAME] 1019 ) 1020 else 1021 AC_CONFIG_FILES([ 1022 WebKit2/gtk/${WEBKITGTK_PC_NAME}-${WEBKITGTK_API_VERSION}.pc:WebKit2/gtk/webkit2.pc.in 1023 ] 1024 ,[WEBKITGTK_API_VERSION=$WEBKITGTK_API_VERSION,WEBKITGTK_PC_NAME=$WEBKITGTK_PC_NAME] 1025 ) 1026 fi 999 1027 1000 1028 AC_OUTPUT … … 1055 1083 Hildon UI extensions : $with_hildon 1056 1084 Introspection support : $enable_introspection 1085 WebKit2 support : $enable_webkit2 1057 1086 " 1058 1087 if test "$with_unicode_backend" = "glib"; then
Note: See TracChangeset
for help on using the changeset viewer.