diff options
Diffstat (limited to 'meta/packages')
| -rw-r--r-- | meta/packages/webkit/files/GNUmakefile.am | 883 | ||||
| -rw-r--r-- | meta/packages/webkit/files/Makefile | 14 | ||||
| -rw-r--r-- | meta/packages/webkit/files/Makefile.shared | 9 | ||||
| -rwxr-xr-x | meta/packages/webkit/files/autogen.sh | 12 | ||||
| -rw-r--r-- | meta/packages/webkit/files/configure.ac | 913 | ||||
| -rw-r--r-- | meta/packages/webkit/files/gtk-doc.make | 173 | ||||
| -rw-r--r-- | meta/packages/webkit/webkit-gtk_svn.bb | 20 |
7 files changed, 1540 insertions, 484 deletions
diff --git a/meta/packages/webkit/files/GNUmakefile.am b/meta/packages/webkit/files/GNUmakefile.am index a0aefbf50..39817f1dd 100644 --- a/meta/packages/webkit/files/GNUmakefile.am +++ b/meta/packages/webkit/files/GNUmakefile.am @@ -5,7 +5,6 @@ # _h_api = API headers that will be installed and included in the distribution # _cppflags = flags that will be passed to the C/CXX Preprocessor # _sources = sources that will be compiled and included in the distribution -# _headers = header files that will be part of the distribution # _built_sources = files that will be autogenerated by the build system and # will be part of the _SOURCES primary # _built_nosources = files that are autogenerated but are not part of the @@ -14,8 +13,9 @@ # # Sources, headers, flags, etc... should be added to the respective variables # with the above suffix, e.g, webcore-specific sources should go to -# webcore_sources, gtk port-specific flags should go to webkitgtk_cppflags, -# etc... The only exceptions are the global variables. See Global Variables below. +# webcore_sources, gtk port API and WebCoreSupport parts to webkitgtk_sources, +# etc... The only exceptions are the global variables. See Global Variables +# below. # # Global Variables # @@ -29,223 +29,290 @@ srcdir = @srcdir@ VPATH = @srcdir@ +DISTCHECK_CONFIGURE_FLAGS = \ + --enable-introspection \ + --enable-gtk-doc + # Directory for autogenerated sources GENSOURCES := $(top_builddir)/DerivedSources +GENSOURCESWEBKITDOM := $(top_builddir)/DerivedSources/webkit +GENPROGRAMS := $(top_builddir)/Programs # Script for creating hash tables -CREATE_HASH_TABLE = $(srcdir)/JavaScriptCore/kjs/create_hash_table - -# Libraries and support components -noinst_HEADERS := +CREATE_HASH_TABLE = $(srcdir)/JavaScriptCore/create_hash_table -noinst_PROGRAMS := +# Script for creating regexp tables +CREATE_REGEXP_TABLES = $(srcdir)/JavaScriptCore/create_regex_tables -lib_LIBRARIES := +# Programs to run the WebKitGtk unit tests +GTESTER = gtester +GTESTER_REPORT = gtester-report +# Libraries and support components +bin_PROGRAMS := +noinst_PROGRAMS := +noinst_HEADERS := +noinst_LTLIBRARIES := +lib_LTLIBRARIES := IDL_BINDINGS := - -# Files that will be distributed +TEST_PROGS := +POFILES := +MOFILES := +javascriptcore_h_api := +javascriptcore_cppflags:= +javascriptcore_sources := +javascriptcore_built_sources := +javascriptcore_built_nosources := +javascriptcore_dist := +webcore_cppflags := +webcore_sources := +webcore_libadd := +webcore_built_sources := +webcore_built_nosources := +webcore_dist := +webcoregtk_cppflags := +webcoregtk_sources := +IDL_BINDINGS_GDOM := +GDOM_AUTO_CLASSES := +GDOM_FIXED_CLASSES := +GDOM_CLASSES := +GDOM_HEADERS_BUILT := +GDOM_HEADERS_FIXED := +libgdom_h_api := +libgdom_cleanfiles := +webkitgtk_h_api := +webkitgtk_sources := +webkitgtk_cppflags := +webkitgtk_built_sources := +webkitgtk_built_nosources := +webkitgtk_cleanfiles := +global_cppflags := +global_cflags := +global_cxxflags := +corekit_cflags := +corekit_cppflags := +JSCORE_GIRSOURCES := +WEBKIT_GIRSOURCES := +typelibsdir := +typelibs_DATA := EXTRA_DIST := +BUILT_SOURCES := +CLEANFILES := +DISTCLEANFILES := +MAINTAINERCLEANFILES := + +webcoregtk_cppflags += \ + -I$(top_builddir)/DerivedSources/webkit \ + -I$(srcdir)/WebCore/bindings \ + -I$(srcdir)/WebCore/bindings/gobject +# CFLAGS/CXXFLAGS used by WebCore and WebKit # -# Global flags to CPP -global_cppflags := +# gtk+.pc already include glib, cairo, freetype and pango CFLAGS +# Don't include them for now to reduce the noise when compiling +# $(GLIB_CFLAGS) $(CAIRO_CFLAGS) $(PANGO_CFLAGS) $(FREETYPE_CFLAGS) +corekit_cflags += \ + -fno-strict-aliasing \ + $(COVERAGE_CFLAGS) \ + $(ENCHANT_CFLAGS) \ + $(GAIL_CFLAGS) \ + $(GEOCLUE_CFLAGS) \ + $(GLIB_CFLAGS) \ + $(GSTREAMER_CFLAGS) \ + $(GTK_CFLAGS) \ + $(HILDON_CFLAGS) \ + $(LIBSOUP_CFLAGS) \ + $(LIBXML_CFLAGS) \ + $(LIBXSLT_CFLAGS) \ + $(SQLITE3_CFLAGS) \ + $(UNICODE_CFLAGS) \ + $(XT_CFLAGS) -global_cppflags += \ - -DWTF_USE_ICU_UNICODE=1 +# When building webcore/webkit, we want WebCore/config.h and NOT +# JavaScriptCore/config.h, hence, it's important that WebCore/ should come first +# before JavaScriptCore in the include path. +corekit_cppflags += \ + $(global_cppflags) \ + $(webcore_cppflags) \ + $(webcoregtk_cppflags) \ + $(javascriptcore_cppflags) + +# For the Gtk port we want to use XP_UNIX both in X11 and Mac +if !TARGET_WIN32 +corekit_cppflags += -DXP_UNIX +endif # Default compiler flags -global_cflags := \ +global_cflags += \ -Wall -W -Wcast-align -Wchar-subscripts -Wreturn-type \ -Wformat -Wformat-security -Wno-format-y2k -Wundef \ -Wmissing-format-attribute -Wpointer-arith -Wwrite-strings \ - -Wno-unused-parameter - -global_cxxflags := \ - $(SYMBOL_VISIBILITY_INLINES) - -if !ENABLE_DEBUG -global_cflags += \ - -fno-exceptions \ - $(SYMBOL_VISIBILITY) + -Wno-unused-parameter -Wno-parentheses \ + -fno-exceptions global_cxxflags += \ + $(global_cflags) \ + $(SYMBOL_VISIBILITY_INLINES) \ -fno-rtti + +# -no-undefined required for building DLLs on Windows +# It breaks the build on other platforms, so we use it conditionally +if OS_WIN32 +no_undefined = -no-undefined +version_script = -export-symbols-regex "^(webkit_|JS).*" +endif + +if OS_GNU +version_script = -Wl,--version-script,$(srcdir)/autotools/symbols.filter endif # Shared libraries -lib_LTLIBRARIES = \ - libwebkit-1.0.la +lib_LTLIBRARIES += \ + libwebkitgtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la # Convenience libraries -noinst_LTLIBRARIES = \ - libJavaScriptCore.la \ - libWebCore.la +noinst_LTLIBRARIES += \ + libJavaScriptCore.la -# # JavaScriptCore -javascriptcore_h_api := -javascriptcore_cppflags:= -javascriptcore_sources := -javascriptcore_built_sources := -javascriptcore_built_nosources := - javascriptcore_cppflags += \ - -I$(srcdir)/JavaScriptCore \ -I$(srcdir)/JavaScriptCore/ForwardingHeaders \ + -I$(srcdir)/JavaScriptCore/parser \ -I$(srcdir)/JavaScriptCore/wtf \ - -I$(srcdir)/JavaScriptCore/kjs \ + -I$(srcdir)/JavaScriptCore/wtf/gtk \ + -I$(srcdir)/JavaScriptCore/wtf/gobject \ -I$(top_builddir)/DerivedSources -# The variables above are already included below so no need to touch -# these variables unless you really have to -libJavaScriptCore_ladir = $(prefix)/include/webkit-1.0/JavaScriptCore +nodist_EXTRA_libJavaScriptCore_la_SOURCES = \ + $(javascriptcore_built_nosources) + +nodist_libJavaScriptCore_la_SOURCES = \ + $(javascriptcore_built_sources) + +libJavaScriptCore_ladir = $(prefix)/include/webkit-@WEBKITGTK_API_VERSION@/JavaScriptCore libJavaScriptCore_la_HEADERS = $(javascriptcore_h_api) libJavaScriptCore_la_SOURCES = \ - $(javascriptcore_built_sources) \ $(javascriptcore_sources) libJavaScriptCore_la_LIBADD = \ $(UNICODE_LIBS) \ - $(GLOBALDEPS_LIBS) \ + $(GLIB_LIBS) \ -lpthread libJavaScriptCore_la_CXXFLAGS = \ $(global_cxxflags) \ - $(global_cflags) \ - $(GLOBALDEPS_CFLAGS) \ - $(UNICODE_CFLAGS) \ - -fno-strict-aliasing + $(libJavaScriptCore_la_CFLAGS) libJavaScriptCore_la_CFLAGS = \ + -fstrict-aliasing \ + -O3 \ $(global_cflags) \ - $(GLOBALDEPS_CFLAGS) \ - $(UNICODE_CFLAGS) \ - -fno-strict-aliasing + $(GLIB_CFLAGS) \ + $(UNICODE_CFLAGS) libJavaScriptCore_la_CPPFLAGS = \ $(global_cppflags) \ $(javascriptcore_cppflags) -# -# WebCore -webcore_cppflags := -webcore_sources := -webcore_headers := -webcore_libadd := -webcore_built_sources := -webcore_built_nosources := - -webcore_cppflags += $(HILDON_CPPFLAGS) - # WebKit -webkitgtk_h_api := -webkitgtk_headers := -webkitgtk_sources := -webkitgtk_cppflags := -webkitgtk_built_sources := -webkitgtk_built_nosources := -webkitgtk_cleanfiles := +nodist_EXTRA_libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_SOURCES = \ + $(webcore_built_nosources) -libWebCore_la_SOURCES = \ +nodist_libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_SOURCES = \ $(webcore_built_sources) \ - $(webcore_headers) \ - $(webcore_sources) + $(webkitgtk_built_sources) -libWebCore_la_CXXFLAGS = \ - -fno-strict-aliasing \ +libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_ladir = $(prefix)/include/webkit-@WEBKITGTK_API_VERSION@/webkit +libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_HEADERS = \ + $(webkitgtk_h_api) \ + WebKit/gtk/webkit/webkitenumtypes.h + +libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_SOURCES = \ + $(webcore_sources) \ + $(webcoregtk_sources) \ + $(webkitgtk_sources) + +libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_CXXFLAGS = \ $(global_cxxflags) \ - $(global_cflags) \ - $(GLOBALDEPS_CFLAGS) \ - $(UNICODE_CFLAGS) \ - $(WEBKITDEPS_CFLAGS) \ - $(LIBCURL_CFLAGS) \ - $(LIBSOUP_CFLAGS) \ - $(SQLITE3_CFLAGS) \ - $(GSTREAMER_CFLAGS) \ - $(LIBXSLT_CFLAGS) \ - $(COVERAGE_CFLAGS) \ - $(HILDON_CFLAGS) + $(corekit_cflags) -libWebCore_la_CFLAGS = \ - -fno-strict-aliasing \ +libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_CFLAGS = \ $(global_cflags) \ - $(GLOBALDEPS_CFLAGS) \ - $(UNICODE_CFLAGS) \ - $(WEBKITDEPS_CFLAGS) \ - $(LIBCURL_CFLAGS) \ - $(LIBSOUP_CFLAGS) \ - $(SQLITE3_CFLAGS) \ - $(GSTREAMER_CFLAGS) \ - $(LIBXSLT_CFLAGS) \ - $(COVERAGE_CFLAGS) \ - $(HILDON_CFLAGS) + $(corekit_cflags) -libWebCore_la_CPPFLAGS = \ - $(global_cppflags) \ - $(webcore_cppflags) \ - $(javascriptcore_cppflags) \ - $(webkitgtk_cppflags) +libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_CPPFLAGS = \ + $(corekit_cppflags) \ + $(webkitgtk_cppflags) \ + $(HILDON_CPPFLAGS) -libWebCore_la_LIBADD = \ +libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_LDFLAGS = \ + -version-info @LIBWEBKITGTK_VERSION@ \ + $(version_script) \ + $(no_undefined) + +libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_LIBADD = \ + -lpthread \ libJavaScriptCore.la \ - $(webcore_libadd) \ - $(GLOBALDEPS_LIBS) \ - $(WEBKITDEPS_LIBS) \ - $(LIBCURL_LIBS) \ - $(LIBSOUP_LIBS) \ - $(UNICODE_LIBS) \ - $(SQLITE3_LIBS) \ + libWebCoreJS.la \ + libgdom.la \ + $(webcore_ldflags) \ + $(CAIRO_LIBS) \ + $(COVERAGE_LDFLAGS) \ + $(ENCHANT_LIBS) \ + $(FREETYPE_LIBS) \ + $(GAIL_LIBS) \ + $(GEOCLUE_LIBS) \ + $(GLIB_LIBS) \ $(GSTREAMER_LIBS) \ - $(LIBXSLT_LIBS) \ + $(GTK_LIBS) \ $(HILDON_LIBS) \ - -lpthread \ - -ljpeg - -libwebkit_1_0_ladir = $(prefix)/include/webkit-1.0/webkit -libwebkit_1_0_la_HEADERS = $(webkitgtk_h_api) - -libwebkit_1_0_la_SOURCES = \ - $(webkitgtk_built_sources) \ - $(webkitgtk_headers) \ - $(webkitgtk_sources) - -libwebkit_1_0_la_CXXFLAGS = \ - $(libWebCore_la_CXXFLAGS) - -libwebkit_1_0_la_CFLAGS = \ - $(libWebCore_la_CFLAGS) + $(JPEG_LIBS) \ + $(LIBSOUP_LIBS) \ + $(LIBXML_LIBS) \ + $(LIBXSLT_LIBS) \ + $(PANGO_LIBS) \ + $(PNG_LIBS) \ + $(SQLITE3_LIBS) \ + $(UNICODE_LIBS) \ + $(XT_LIBS) -libwebkit_1_0_la_CPPFLAGS = \ - $(libWebCore_la_CPPFLAGS) +libgdom_ladir = $(prefix)/include/webkit-@WEBKITGTK_API_VERSION@/webkit +nodist_libgdom_la_HEADERS = \ + $(libgdom_h_api) -libwebkit_1_0_la_LDFLAGS = \ - $(COVERAGE_LDFLAGS) \ - -version-info @LIBWEBKITGTK_VERSION@ - -libwebkit_1_0_la_LIBADD = \ - libWebCore.la +libgdom_cleanfiles += \ + $(top_builddir)/WebKit/gtk/webkit/webkitdomenumtypes.h \ + $(top_builddir)/libgdom.la \ + $(top_builddir)/stamp-webkitdomenumtypes.h # # Extra checks and flags global_cppflags += \ + -DBUILDING_CAIRO__=1 \ -DBUILDING_GTK__=1 \ -DWTF_CHANGES -if !ENABLE_FAST_MALLOC +if USE_ICU_UNICODE global_cppflags += \ - -DUSE_SYSTEM_MALLOC + -DWTF_USE_ICU_UNICODE=1 +endif + +if USE_GLIB_UNICODE +global_cppflags += \ + -DWTF_USE_GLIB_UNICODE=1 endif -if TARGET_X11 -global_cppflags += -DXP_UNIX +if !ENABLE_FAST_MALLOC +global_cppflags += \ + -DUSE_SYSTEM_MALLOC endif if !ENABLE_DEBUG global_cppflags += -DNDEBUG +global_cflags += $(SYMBOL_VISIBILITY) else -webkitgtk_cppflags += \ +webcoregtk_cppflags += \ -DG_DISABLE_DEPRECATED \ -DGDK_PIXBUF_DISABLE_DEPRECATED \ -DGDK_DISABLE_DEPRECATED \ @@ -257,131 +324,533 @@ webkitgtk_cppflags += \ # -DGTK_MULTIHEAD_SAFE endif -if !ENABLE_DATABASE -global_cppflags += -DENABLE_DATABASE=0 -endif - -if !ENABLE_ICONDATABASE -global_cppflags += -DENABLE_ICONDATABASE=0 -endif - if ENABLE_COVERAGE global_cppflags += \ -DGCC_GENERATE_TEST_COVERAGE_FILES \ -DGCC_INSTRUMENT_PROGRAM_FLOW_ARCS endif -if ENABLE_VIDEO -webcore_libadd += -lgstinterfaces-0.10 -lgstvideo-0.10 -endif - -webkitgtk_cppflags += \ --I$(top_builddir)/WebKit/gtk/webkit \ --DBUILDING_CAIRO__=1 \ --DBUILD_WEBKIT - webkitgtk_h_api += \ - WebKit/gtk/webkit/webkit.h \ - WebKit/gtk/webkit/webkitdefines.h \ - WebKit/gtk/webkit/webkitnetworkrequest.h \ - WebKit/gtk/webkit/webkitwebbackforwardlist.h \ - WebKit/gtk/webkit/webkitwebframe.h \ - WebKit/gtk/webkit/webkitwebhistoryitem.h \ - WebKit/gtk/webkit/webkitwebsettings.h \ - WebKit/gtk/webkit/webkitwebview.h + $(srcdir)/WebKit/gtk/webkit/webkit.h \ + $(srcdir)/WebKit/gtk/webkit/webkitdefines.h \ + $(srcdir)/WebKit/gtk/webkit/webkitdownload.h \ + $(srcdir)/WebKit/gtk/webkit/webkiterror.h \ + $(srcdir)/WebKit/gtk/webkit/webkithittestresult.h \ + $(srcdir)/WebKit/gtk/webkit/webkitnetworkrequest.h \ + $(srcdir)/WebKit/gtk/webkit/webkitnetworkresponse.h \ + $(srcdir)/WebKit/gtk/webkit/webkitsoupauthdialog.h \ + $(srcdir)/WebKit/gtk/webkit/webkitwebbackforwardlist.h \ + $(srcdir)/WebKit/gtk/webkit/webkitwebdatasource.h \ + $(srcdir)/WebKit/gtk/webkit/webkitwebframe.h \ + $(srcdir)/WebKit/gtk/webkit/webkitwebhistoryitem.h \ + $(srcdir)/WebKit/gtk/webkit/webkitwebinspector.h \ + $(srcdir)/WebKit/gtk/webkit/webkitwebnavigationaction.h \ + $(srcdir)/WebKit/gtk/webkit/webkitwebpolicydecision.h \ + $(srcdir)/WebKit/gtk/webkit/webkitgeolocationpolicydecision.h \ + $(srcdir)/WebKit/gtk/webkit/webkitwebresource.h \ + $(srcdir)/WebKit/gtk/webkit/webkitwebsettings.h \ + $(srcdir)/WebKit/gtk/webkit/webkitwebwindowfeatures.h \ + $(srcdir)/WebKit/gtk/webkit/webkitwebview.h \ + $(srcdir)/WebKit/gtk/webkit/webkitwebdatabase.h \ + $(srcdir)/WebKit/gtk/webkit/webkitsecurityorigin.h \ + $(top_builddir)/WebKit/gtk/webkit/webkitversion.h webkitgtk_built_sources += \ - WebKit/gtk/webkit/webkit-marshal.h \ - WebKit/gtk/webkit/webkit-marshal.cpp + DerivedSources/webkitenumtypes.cpp \ + DerivedSources/webkitdomenumtypes.cpp \ + DerivedSources/webkitmarshal.cpp \ + DerivedSources/webkitmarshal.h \ + WebKit/gtk/webkit/webkitenumtypes.h -webkitgtk_headers += \ - WebKit/gtk/webkit/webkitprivate.h \ +webkitgtk_sources += \ + WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp \ WebKit/gtk/WebCoreSupport/ChromeClientGtk.h \ + WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp \ WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.h \ + WebKit/gtk/WebCoreSupport/DocumentLoaderGtk.cpp \ + WebKit/gtk/WebCoreSupport/DocumentLoaderGtk.h \ + WebKit/gtk/WebCoreSupport/DragClientGtk.cpp \ WebKit/gtk/WebCoreSupport/DragClientGtk.h \ + WebKit/gtk/WebCoreSupport/EditorClientGtk.cpp \ WebKit/gtk/WebCoreSupport/EditorClientGtk.h \ + WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp \ WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.h \ + WebKit/gtk/WebCoreSupport/InspectorClientGtk.cpp \ WebKit/gtk/WebCoreSupport/InspectorClientGtk.h \ - WebKit/gtk/WebCoreSupport/PasteboardHelperGtk.h - -webkitgtk_sources += \ + WebKit/gtk/WebCoreSupport/PasteboardHelperGtk.cpp \ + WebKit/gtk/WebCoreSupport/PasteboardHelperGtk.h \ + WebKit/gtk/webkit/webkitapplicationcache.cpp \ + WebKit/gtk/webkit/webkitdownload.cpp \ + WebKit/gtk/webkit/webkiterror.cpp \ + WebKit/gtk/webkit/webkithittestresult.cpp \ WebKit/gtk/webkit/webkitnetworkrequest.cpp \ + WebKit/gtk/webkit/webkitnetworkresponse.cpp \ WebKit/gtk/webkit/webkitprivate.cpp \ + WebKit/gtk/webkit/webkitprivate.h \ + WebKit/gtk/webkit/webkitsoupauthdialog.c \ + WebKit/gtk/webkit/webkitversion.cpp \ WebKit/gtk/webkit/webkitwebbackforwardlist.cpp \ + WebKit/gtk/webkit/webkitwebdatasource.cpp \ WebKit/gtk/webkit/webkitwebframe.cpp \ WebKit/gtk/webkit/webkitwebhistoryitem.cpp \ + WebKit/gtk/webkit/webkitwebinspector.cpp \ + WebKit/gtk/webkit/webkitwebnavigationaction.cpp \ + WebKit/gtk/webkit/webkitwebpolicydecision.cpp \ + WebKit/gtk/webkit/webkitgeolocationpolicydecision.cpp \ + WebKit/gtk/webkit/webkitwebresource.cpp \ + WebKit/gtk/webkit/webkitwebdatabase.cpp \ + WebKit/gtk/webkit/webkitsecurityorigin.cpp \ WebKit/gtk/webkit/webkitwebsettings.cpp \ WebKit/gtk/webkit/webkitwebview.cpp \ - WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp \ - WebKit/gtk/WebCoreSupport/ContextMenuClientGtk.cpp \ - WebKit/gtk/WebCoreSupport/DragClientGtk.cpp \ - WebKit/gtk/WebCoreSupport/EditorClientGtk.cpp \ - WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp \ - WebKit/gtk/WebCoreSupport/InspectorClientGtk.cpp \ - WebKit/gtk/WebCoreSupport/PasteboardHelperGtk.cpp + WebKit/gtk/webkit/webkitwebwindowfeatures.cpp \ + WebKit/gtk/webkit/webkitworkers.cpp + +webkitgtk_cppflags += \ + -DBUILDING_WEBKIT \ + -DPACKAGE_LOCALE_DIR=\"$(localedir)\" \ + -DDATA_DIR=\"${datadir}\" \ + -I$(srcdir)/WebKit/gtk \ + -I$(srcdir)/WebKit/gtk/WebCoreSupport \ + -I$(srcdir)/WebKit/gtk/webkit \ + -I$(top_builddir)/WebKit/gtk \ + -I$(top_builddir)/WebKit/gtk/webkit \ + -I$(GENSOURCESWEBKITDOM) webkitgtk_cleanfiles += \ + $(top_builddir)/stamp-webkitmarshal.cpp \ + $(top_builddir)/stamp-webkitmarshal.h \ + $(top_builddir)/stamp-webkitenumtypes.cpp \ + $(top_builddir)/stamp-webkitenumtypes.h \ $(top_builddir)/Programs/GtkLauncher \ - $(top_builddir)/WebKit/gtk/webkit-1.0.pc + $(top_builddir)/WebKit/gtk/docs/version.xml \ + $(top_builddir)/WebKit/gtk/docs/GNUmakefile \ + $(top_builddir)/WebKit/gtk/@WEBKITGTK_PC_NAME@-@WEBKITGTK_API_VERSION@.pc \ + $(top_builddir)/WebKit/gtk/webkit/webkitenumtypes.h \ + $(top_builddir)/WebKit/gtk/webkit/webkitversion.h pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = WebKit/gtk/webkit-1.0.pc +pkgconfig_DATA = WebKit/gtk/@WEBKITGTK_PC_NAME@-@WEBKITGTK_API_VERSION@.pc + +if ENABLE_INTROSPECTION + +JSCore-@WEBKITGTK_API_VERSION@.gir: $(builddir)/WebKit/gtk/JSCore-@WEBKITGTK_API_VERSION@.gir + cp $(builddir)/WebKit/gtk/JSCore-@WEBKITGTK_API_VERSION@.gir $(builddir)/ + +JSCORE_GIRSOURCES += JSCore-@WEBKITGTK_API_VERSION@.gir +WEBKIT_GIRSOURCES += WebKit-@WEBKITGTK_API_VERSION@.gir + +$(WEBKIT_GIRSOURCES): $(G_IR_SCANNER) $(JSCORE_GIRSOURCES) libwebkitgtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la + $(AM_V_GEN)$(G_IR_SCANNER) -v --namespace WebKit --nsversion=@WEBKITGTK_API_VERSION@ \ + --include=GObject-2.0 \ + --include=Gtk-@GTK_API_VERSION@ \ + --include=JSCore-@WEBKITGTK_API_VERSION@ \ + --include=Soup-2.4 \ + --library=webkitgtk-@WEBKITGTK_API_VERSION@ \ + --libtool="$(LIBTOOL)" \ + --pkg gobject-2.0 \ + --pkg gtk+-@GTK_API_VERSION@ \ + --pkg libsoup-2.4 \ + --output $@ \ + --add-include-path $(top_srcdir)/WebKit/gtk \ + --add-include-path $(builddir) \ + -I$(top_srcdir)/WebKit/gtk \ + -I$(top_builddir)/WebKit/gtk \ + -I$(top_builddir)/DerivedSources \ + -I$(top_srcdir)/JavaScriptCore/ForwardingHeaders \ + -I$(top_srcdir) \ + $(webkitgtk_h_api) \ + $(libgdom_h_api) + +girdir = $(datadir)/gir-1.0 +gir_DATA = $(WEBKIT_GIRSOURCES) $(JSCORE_GIRSOURCES) + +typelibsdir += $(libdir)/girepository-1.0 +typelibs_DATA += $(JSCORE_GIRSOURCES:.gir=.typelib) $(WEBKIT_GIRSOURCES:.gir=.typelib) + +%.typelib: %.gir $(G_IR_COMPILER) + $(AM_V_GEN)$(G_IR_COMPILER) --includedir $(top_srcdir)/WebKit/gtk --includedir $(builddir) $< -o $@ + +CLEANFILES += $(JSCORE_GIRSOURCES) $(WEBKIT_GIRSOURCES) $(typelibs_DATA) -WEBKIT_MARSHAL = $(CURDIR)/WebKit/gtk/webkit/webkit-marshal -WEBKIT_MARSHAL_LIST = $(srcdir)/WebKit/gtk/webkit/webkit-marshal.list +endif + +EXTRA_DIST += $(builddir)/WebKit/gtk/JSCore-@WEBKITGTK_API_VERSION@.gir -stamp_files := \ - stamp-webkit-marshal.cpp \ - stamp-webkit-marshal.h +WEBKIT_MARSHAL = $(GENSOURCES)/webkitmarshal +WEBKIT_MARSHAL_LIST = $(top_srcdir)/WebKit/gtk/webkitmarshal.list -WebKit/gtk/webkit/webkit-marshal.cpp: stamp-webkit-marshal.cpp +$(WEBKIT_MARSHAL).cpp: stamp-webkitmarshal.cpp @true -WebKit/gtk/webkit/webkit-marshal.h: stamp-webkit-marshal.h +$(WEBKIT_MARSHAL).h: stamp-webkitmarshal.h @true -stamp-webkit-marshal.cpp: $(WEBKIT_MARSHAL_LIST) - echo "extern \"C\" {" > $(WEBKIT_MARSHAL).cpp && \ +stamp-webkitmarshal.cpp: $(WEBKIT_MARSHAL_LIST) + $(AM_V_GEN) echo "extern \"C\" {" > $(WEBKIT_MARSHAL).cpp && \ $(GLIB_GENMARSHAL) --prefix=webkit_marshal $(WEBKIT_MARSHAL_LIST) --body >> $(WEBKIT_MARSHAL).cpp && echo '}' >> $(WEBKIT_MARSHAL).cpp && \ echo timestamp > $(@F) -stamp-webkit-marshal.h: $(WEBKIT_MARSHAL_LIST) - $(GLIB_GENMARSHAL) --prefix=webkit_marshal $(WEBKIT_MARSHAL_LIST) --header > $(WEBKIT_MARSHAL).h && \ +stamp-webkitmarshal.h: $(WEBKIT_MARSHAL_LIST) + $(AM_V_GEN)$(GLIB_GENMARSHAL) --prefix=webkit_marshal $(WEBKIT_MARSHAL_LIST) --header > $(WEBKIT_MARSHAL).h && \ echo timestamp > $(@F) -# END WEBKIT GTK+ +WebKit/gtk/webkit/webkitenumtypes.h: stamp-webkitenumtypes.h + @true +stamp-webkitenumtypes.h: $(webkitgtk_h_api) GNUmakefile + $(AM_V_GEN)glib-mkenums \ + --fhead "#ifndef WEBKIT_ENUM_TYPES_H\n" \ + --fhead "#define WEBKIT_ENUM_TYPES_H\n\n" \ + --fhead "#include <glib-object.h>\n\n" \ + --fhead "#include <webkit/webkitdefines.h>\n\n" \ + --fhead "G_BEGIN_DECLS\n\n" \ + --ftail "G_END_DECLS\n\n" \ + --ftail "#endif\n" \ + --fprod "#include <webkit/@basename@>\n\n" \ + --eprod "#define WEBKIT_TYPE_@ENUMSHORT@ @enum_name@_get_type()\n\n" \ + --eprod "WEBKIT_API GType\n@enum_name@_get_type(void);\n\n" \ + $(webkitgtk_h_api) | \ + sed 's,web_kit,webkit,' | \ + sed 's,WEBKIT_TYPE_KIT,WEBKIT_TYPE,' \ + > xgen-gth \ + && (cmp -s xgen-gth WebKit/gtk/webkit/webkitenumtypes.h || cp xgen-gth WebKit/gtk/webkit/webkitenumtypes.h) \ + && rm -f xgen-gth \ + && echo timestamp > $(@F) + +DerivedSources/webkitenumtypes.cpp: $(webkitgtk_h_api) GNUmakefile + $(AM_V_GEN)glib-mkenums \ + --fhead "#include <config.h>\n" \ + --fhead "#include <glib-object.h>\n" \ + --fhead "#include \"$(top_builddir)/WebKit/gtk/webkit/webkitenumtypes.h\"\n\n" \ + --fhead "extern \"C\" {\n\n" \ + --fprod "\n/* enumerations from \"@filename@\" */" \ + --vhead "static const G@Type@Value _@enum_name@_values[] = {" \ + --vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \ + --vtail " { 0, NULL, NULL }\n};\n\n" \ + --vtail "GType @enum_name@_get_type(void)\n{\n" \ + --vtail " static GType type = 0;\n\n" \ + --vtail " if (!type)\n" \ + --vtail " type = g_@type@_register_static(\"@EnumName@\", _@enum_name@_values);\n\n" \ + --vtail " return type;\n}\n\n" \ + --ftail "}\n" \ + $(webkitgtk_h_api) | \ + sed 's,web_kit,webkit,' \ + > xgen-gtc \ + && cp xgen-gtc $@ \ + && rm -f xgen-gtc + +WebKit/gtk/webkit/webkitdomenumtypes.h: stamp-webkitdomenumtypes.h + @true +stamp-webkitdomenumtypes.h: $(libgdom_h_api) GNUmakefile + $(AM_V_GEN)glib-mkenums \ + --fhead "#ifndef WEBKIT_DOM_ENUM_TYPES_H\n" \ + --fhead "#define WEBKIT_DOM_ENUM_TYPES_H\n\n" \ + --fhead "#include <glib-object.h>\n\n" \ + --fhead "G_BEGIN_DECLS\n\n" \ + --ftail "G_END_DECLS\n\n" \ + --ftail "#endif\n" \ + --fprod "#include <webkit/@basename@>\n\n" \ + --eprod "#define WEBKIT_DOM_TYPE_@ENUMSHORT@ @enum_name@_get_type()\n\n" \ + --eprod "WEBKIT_API GType\n@enum_name@_get_type(void);n\n" \ + $(libgdom_h_api) | \ + sed 's,web_kit,webkit_dom,' | \ + sed 's,WEBKIT_DOM_TYPE_KIT,WEBKIT_DOM_TYPE,' \ + > xgen-cgth \ + && (cmp -s xgen-cgth WebKit/gtk/webkit/webkitdomenumtypes.h || cp xgen-cgth WebKit/gtk/webkit/webkitdomenumtypes.h) \ + && rm -f xgen-cgth \ + && echo timestamp > $(@F) + +DerivedSources/webkitdomenumtypes.cpp: $(top_builddir)/WebKit/gtk/webkit/webkitdomenumtypes.h $(libgdom_h_api) GNUmakefile + $(AM_V_GEN)glib-mkenums \ + --fhead "#include <config.h>\n" \ + --fhead "#include <glib-object.h>\n" \ + --fhead "#include \"$(top_builddir)/WebKit/gtk/webkit/webkitdomenumtypes.h\"\n\n" \ + --fhead "extern \"C\" {\n\n" \ + --fprod "\n/* enumerations from \"@filename@\" */" \ + --vhead "static const G@Type@Value _@enum_name@_values] = {" \ + --vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \ + --vtail " { 0, NULL, NULL }\n};\n\n" \ + --vtail "GType @enum_name@_get_type(void)\n{\n" \ + --vtail " static GType type = 0;\n\n" \ + --vtail " if (!type)\n" \ + --vtail " type = g_@type@_register_static(\"@EnumName@\", _@enum_name@_values);\n\n" \ + --vtail " return type;\n}\n\n" \ + --ftail "}\n" \ + $(libgdom_h_api) | \ + sed 's,web_kit,webkitdom,' \ + > xgen-cgtc \ + && cp xgen-cgtc $@ \ + && rm -f xgen-cgtc -# Files that will be cleaned -MAINTAINERCLEANFILES := $(stamp_files) $(BUILT_SOURCES) -DISTCLEANFILES := $(stamp_files) $(BUILT_SOURCES) -CLEANFILES := $(stamp_files) $(BUILT_SOURCES) +# Files that will be distributed +EXTRA_DIST += \ + $(srcdir)/gtk-doc.make \ + WebKit/LICENSE \ + $(javascriptcore_dist) \ + $(webcore_dist) \ + $(srcdir)/autotools/symbols.filter \ + $(srcdir)/WebKit/gtk/ChangeLog \ + $(srcdir)/WebKit/gtk/NEWS \ + $(srcdir)/WebKit/gtk/webkitmarshal.list \ + $(srcdir)/WebKit/gtk/docs/GNUmakefile.* \ + $(srcdir)/WebKit/gtk/docs/webkitenvironment.xml \ + $(srcdir)/WebKit/gtk/docs/webkitgtk-docs.sgml \ + $(srcdir)/WebKit/gtk/docs/webkitgtk-sections.txt \ + $(srcdir)/WebKit/gtk/docs/version.xml.in \ + $(srcdir)/WebKit/gtk/po/* \ + $(srcdir)/WebKit/gtk/resources/* \ + $(srcdir)/WebKit/gtk/tests/resources/* \ + $(srcdir)/WebKit/gtk/tests/test_utils.h + +# extra resource files +resourcesdir = ${datadir}/webkit-@WEBKITGTK_API_VERSION@/resources +dist_resources_DATA = \ + $(shell ls $(srcdir)/WebKit/gtk/resources/*.html) + +# END WEBKIT GTK+ # Include module makefiles include JavaScriptCore/GNUmakefile.am include WebCore/GNUmakefile.am include WebKitTools/GNUmakefile.am +include WebKit/gtk/po/GNUmakefile.am + +# Build unit tests +noinst_PROGRAMS += $(TEST_PROGS) +webkit_tests_cflags = \ + -fno-strict-aliasing \ + -I$(srcdir)/JavaScriptCore/ForwardingHeaders \ + -I$(srcdir)/WebKit/gtk \ + -I$(top_builddir)/WebKit/gtk \ + -I$(top_builddir)/DerivedSources \ + -I$(top_srcdir)/WebCore/bindings \ + -I$(top_srcdir)/WebCore/bindings/gobject \ + $(global_cflags) \ + $(GLIB_CFLAGS) \ + $(GTK_CFLAGS) \ + $(LIBSOUP_CFLAGS) + +webkit_tests_ldadd = \ + libwebkitgtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la \ + $(GTK_LIBS) \ + $(GLIB_LIBS) \ + $(LIBSOUP_LIBS) + +webkit_tests_ldflags = \ + -no-install \ + -no-fast-install + +TEST_PROGS += \ + Programs/unittests/testdomdocument \ + Programs/unittests/testdomdomwindow \ + Programs/unittests/testdomnode \ + Programs/unittests/testhttpbackend \ + Programs/unittests/testloading \ + Programs/unittests/testglobals \ + Programs/unittests/testmimehandling \ + Programs/unittests/testnetworkrequest \ + Programs/unittests/testnetworkresponse \ + Programs/unittests/testwebframe \ + Programs/unittests/testwebbackforwardlist \ + Programs/unittests/testwebhistoryitem \ + Programs/unittests/testwindow \ + Programs/unittests/testdownload \ + Programs/unittests/testatk \ + Programs/unittests/testatkroles \ + Programs/unittests/testhittestresult \ + Programs/unittests/testwebsettings \ + Programs/unittests/testwebresource \ + Programs/unittests/testwebdatasource \ + Programs/unittests/testwebview \ + Programs/unittests/testkeyevents \ + Programs/unittests/testcopyandpaste + +# Add additional tests here +Programs_unittests_testdomdocument_SOURCES = WebKit/gtk/tests/testdomdocument.c +Programs_unittests_testdomdocument_CFLAGS = $(webkit_tests_cflags) +Programs_unittests_testdomdocument_LDADD = $(webkit_tests_ldadd) +Programs_unittests_testdomdocument_LDFLAGS = $(webkit_tests_ldflags) + +Programs_unittests_testdomdomwindow_SOURCES = WebKit/gtk/tests/testdomdomwindow.c +Programs_unittests_testdomdomwindow_CFLAGS = $(webkit_tests_cflags) +Programs_unittests_testdomdomwindow_LDADD = $(webkit_tests_ldadd) +Programs_unittests_testdomdomwindow_LDFLAGS = $(webkit_tests_ldflags) + +Programs_unittests_testdomnode_SOURCES = WebKit/gtk/tests/testdomnode.c +Programs_unittests_testdomnode_CFLAGS = $(webkit_tests_cflags) +Programs_unittests_testdomnode_LDADD = $(webkit_tests_ldadd) +Programs_unittests_testdomnode_LDFLAGS = $(webkit_tests_ldflags) + +Programs_unittests_testhttpbackend_SOURCES = WebKit/gtk/tests/testhttpbackend.c +Programs_unittests_testhttpbackend_CFLAGS = $(webkit_tests_cflags) +Programs_unittests_testhttpbackend_LDADD = $(webkit_tests_ldadd) +Programs_unittests_testhttpbackend_LDFLAGS = $(webkit_tests_ldflags) + +Programs_unittests_testglobals_SOURCES = WebKit/gtk/tests/testglobals.c +Programs_unittests_testglobals_CFLAGS = $(webkit_tests_cflags) +Programs_unittests_testglobals_LDADD = $(webkit_tests_ldadd) +Programs_unittests_testglobals_LDFLAGS = $(webkit_tests_ldflags) + +Programs_unittests_testloading_SOURCES = WebKit/gtk/tests/testloading.c +Programs_unittests_testloading_CFLAGS = $(webkit_tests_cflags) +Programs_unittests_testloading_LDADD = $(webkit_tests_ldadd) +Programs_unittests_testloading_LDFLAGS = $(webkit_tests_ldflags) + +Programs_unittests_testmimehandling_SOURCES = WebKit/gtk/tests/testmimehandling.c WebKit/gtk/tests/test_utils.c +Programs_unittests_testmimehandling_CFLAGS = $(webkit_tests_cflags) +Programs_unittests_testmimehandling_LDADD = $(webkit_tests_ldadd) +Programs_unittests_testmimehandling_LDFLAGS = $(webkit_tests_ldflags) + +Programs_unittests_testnetworkrequest_SOURCES = WebKit/gtk/tests/testnetworkrequest.c +Programs_unittests_testnetworkrequest_CFLAGS = $(webkit_tests_cflags) +Programs_unittests_testnetworkrequest_LDADD = $(webkit_tests_ldadd) +Programs_unittests_testnetworkrequest_LDFLAGS = $(webkit_tests_ldflags) + +Programs_unittests_testnetworkresponse_SOURCES = WebKit/gtk/tests/testnetworkresponse.c +Programs_unittests_testnetworkresponse_CFLAGS = $(webkit_tests_cflags) +Programs_unittests_testnetworkresponse_LDADD = $(webkit_tests_ldadd) +Programs_unittests_testnetworkresponse_LDFLAGS = $(webkit_tests_ldflags) + +Programs_unittests_testwebframe_SOURCES = WebKit/gtk/tests/testwebframe.c +Programs_unittests_testwebframe_CFLAGS = $(webkit_tests_cflags) +Programs_unittests_testwebframe_LDADD = $(webkit_tests_ldadd) +Programs_unittests_testwebframe_LDFLAGS = $(webkit_tests_ldflags) + +Programs_unittests_testwebbackforwardlist_SOURCES = WebKit/gtk/tests/testwebbackforwardlist.c +Programs_unittests_testwebbackforwardlist_CFLAGS = $(webkit_tests_cflags) +Programs_unittests_testwebbackforwardlist_LDADD = $(webkit_tests_ldadd) +Programs_unittests_testwebbackforwardlist_LDFLAGS = $(webkit_tests_ldflags) + +Programs_unittests_testwebhistoryitem_SOURCES = WebKit/gtk/tests/testwebhistoryitem.c +Programs_unittests_testwebhistoryitem_CFLAGS = $(webkit_tests_cflags) +Programs_unittests_testwebhistoryitem_LDADD = $(webkit_tests_ldadd) +Programs_unittests_testwebhistoryitem_LDFLAGS = $(webkit_tests_ldflags) + +Programs_unittests_testwindow_SOURCES = WebKit/gtk/tests/testwindow.c +Programs_unittests_testwindow_CFLAGS = $(webkit_tests_cflags) +Programs_unittests_testwindow_LDADD = $(webkit_tests_ldadd) +Programs_unittests_testwindow_LDFLAGS = $(webkit_tests_ldflags) + +Programs_unittests_testdownload_SOURCES = WebKit/gtk/tests/testdownload.c +Programs_unittests_testdownload_CFLAGS = $(webkit_tests_cflags) +Programs_unittests_testdownload_LDADD = $(webkit_tests_ldadd) +Programs_unittests_testdownload_LDFLAGS = $(webkit_tests_ldflags) + +Programs_unittests_testatk_SOURCES = WebKit/gtk/tests/testatk.c +Programs_unittests_testatk_CFLAGS = $(webkit_tests_cflags) +Programs_unittests_testatk_LDADD = $(webkit_tests_ldadd) +Programs_unittests_testatk_LDFLAGS = $(webkit_tests_ldflags) + +Programs_unittests_testatkroles_SOURCES = WebKit/gtk/tests/testatkroles.c +Programs_unittests_testatkroles_CFLAGS = $(webkit_tests_cflags) +Programs_unittests_testatkroles_LDADD = $(webkit_tests_ldadd) +Programs_unittests_testatkroles_LDFLAGS = $(webkit_tests_ldflags) + +Programs_unittests_testwebsettings_SOURCES = WebKit/gtk/tests/testwebsettings.c +Programs_unittests_testwebsettings_CFLAGS = $(webkit_tests_cflags) +Programs_unittests_testwebsettings_LDADD = $(webkit_tests_ldadd) +Programs_unittests_testwebsettings_LDFLAGS = $(webkit_tests_ldflags) + +Programs_unittests_testwebresource_SOURCES = WebKit/gtk/tests/testwebresource.c +Programs_unittests_testwebresource_CFLAGS = $(webkit_tests_cflags) +Programs_unittests_testwebresource_LDADD = $(webkit_tests_ldadd) + +Programs_unittests_testwebdatasource_SOURCES = WebKit/gtk/tests/testwebdatasource.c +Programs_unittests_testwebdatasource_CFLAGS = $(webkit_tests_cflags) +Programs_unittests_testwebdatasource_LDADD = $(webkit_tests_ldadd) + +Programs_unittests_testwebview_SOURCES = WebKit/gtk/tests/testwebview.c WebKit/gtk/tests/test_utils.c +Programs_unittests_testwebview_CFLAGS = $(webkit_tests_cflags) +Programs_unittests_testwebview_LDADD = $(webkit_tests_ldadd) +Programs_unittests_testwebview_LDFLAGS = $(webkit_tests_ldflags) + +Programs_unittests_testhittestresult_SOURCES = WebKit/gtk/tests/testhittestresult.c +Programs_unittests_testhittestresult_CFLAGS = $(webkit_tests_cflags) +Programs_unittests_testhittestresult_LDADD = $(webkit_tests_ldadd) + +Programs_unittests_testkeyevents_SOURCES = WebKit/gtk/tests/testkeyevents.c +Programs_unittests_testkeyevents_CFLAGS = $(webkit_tests_cflags) +Programs_unittests_testkeyevents_LDADD = $(webkit_tests_ldadd) +Programs_unittests_testkeyevents_LDFLAGS = $(webkit_tests_ldflags) + +Programs_unittests_testcopyandpaste_SOURCES = WebKit/gtk/tests/testcopyandpaste.c +Programs_unittests_testcopyandpaste_CFLAGS = $(webkit_tests_cflags) +Programs_unittests_testcopyandpaste_LDADD = $(webkit_tests_ldadd) +Programs_unittests_testcopyandpaste_LDFLAGS = $(webkit_tests_ldflags) # Autogenerated sources -BUILT_SOURCES = \ +BUILT_SOURCES += \ $(javascriptcore_built_sources) \ $(javascriptcore_built_nosources) \ $(webcore_built_sources) \ $(webcore_built_nosources) \ $(webkitgtk_built_sources) \ - $(webkitgtk_built_nosources) + $(webkitgtk_built_nosources) \ + $(gdom_built_nosources) # Project-wide clean rules +# Files that will be cleaned CLEANFILES += \ + $(BUILT_SOURCES) \ $(webkitgtk_cleanfiles) \ - $(top_builddir)/Programs/DumpRenderTree \ - $(top_builddir)/Programs/testkjs \ - $(GENSOURCES) + $(libgdom_cleanfiles) + +DISTCLEANFILES += \ + $(CLEANFILES) MAINTAINERCLEANFILES += \ + $(CLEANFILES) \ $(srcdir)/aconfig.h.in \ - configure \ - config.* \ - GNUmakefile.in \ - INSTALL \ - README + $(srcdir)/autotools/config.* \ + $(srcdir)/autotools/compile \ + $(srcdir)/autotools/depcomp \ + $(srcdir)/autotools/install-sh \ + $(srcdir)/autotools/missing \ + $(srcdir)/configure \ + $(srcdir)/GNUmakefile.in \ + $(srcdir)/INSTALL \ + $(srcdir)/README \ + $(top_builddir)/config.* + +# Older automake versions (1.7) place Plo files in a different place so we need +# to create the output directory manually. +all-local: stamp-po + $(mkdir_p) $(top_builddir)/$(DEPDIR)/DerivedSources + +# remove built sources and program directories +clean-local: + -rm -rf $(GENPROGRAMS) + +maintainer-clean-local: distclean-local + +distclean-local: + -rm -rf $(GENSOURCES) $(GENPROGRAMS) + +dist-hook: + cp $(srcdir)/WebKit/gtk/NEWS $(distdir)/ + +install-data-local: po-install-data-local + +installdirs-data-local: po-installdirs-data-local + +uninstall-local: po-uninstall-local + +# Run all tests in cwd +# FIXME: we should run this under xvfb +test: $(TEST_PROGS) + $(GTESTER) --verbose $(TEST_PROGS); + +# test-report: run tests in cwd and generate report +# full-report: run tests in cwd with -m perf and -m slow and generate report +# perf-report: run tests in cwd with -m perf and generate report +test-report full-report perf-report: $(TEST_PROGS) + @ case $@ in \ + test-report) test_options="-k";; \ + full-report) test_options="-k -m=perf";; \ + perf-report) test_options="-k -m=perf -m=slow";; \ + esac ; \ + $(GTESTER) --verbose $$test_options -o test-report.xml $(TEST_PROGS); \ + $(GTESTER_REPORT) test-report.xml > test-report.html ; + +.PHONY: test test-report perf-report full-report +check-local: test diff --git a/meta/packages/webkit/files/Makefile b/meta/packages/webkit/files/Makefile index fa7ea0242..1e50d1d35 100644 --- a/meta/packages/webkit/files/Makefile +++ b/meta/packages/webkit/files/Makefile @@ -1,4 +1,4 @@ -MODULES = JavaScriptCore JavaScriptGlue WebCore WebKit WebKitTools +MODULES = JavaScriptCore JavaScriptGlue WebCore WebKit WebKit2 WebKitTools all: @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \ @@ -12,18 +12,6 @@ release r deployment dep deploy: @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \ if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done -universal u: - @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \ - if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done - -64: - @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \ - if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done - -64u: - @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \ - if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done - clean: @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \ if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done diff --git a/meta/packages/webkit/files/Makefile.shared b/meta/packages/webkit/files/Makefile.shared index 096d32e94..aa9fa728d 100644 --- a/meta/packages/webkit/files/Makefile.shared +++ b/meta/packages/webkit/files/Makefile.shared @@ -12,15 +12,6 @@ release r deployment dep deploy: force $(SCRIPTS_PATH)/set-webkit-configuration --release ( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) | grep -v setenv && exit $${PIPESTATUS[0]} ) -universal u: force - ( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) 'ARCHS=ppc i386' | grep -v setenv && exit $${PIPESTATUS[0]} ) - -64: force - ( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) 'ARCHS=i386 x86_64' | grep -v setenv && exit $${PIPESTATUS[0]} ) - -64u: force - ( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) 'ARCHS=ppc ppc64 i386 x86_64' | grep -v setenv && exit $${PIPESTATUS[0]} ) - clean: ( xcodebuild $(OTHER_OPTIONS) -alltargets clean $(XCODE_OPTIONS) | grep -v setenv && exit $${PIPESTATUS[0]} ) diff --git a/meta/packages/webkit/files/autogen.sh b/meta/packages/webkit/files/autogen.sh index a929538d2..97beb209d 100755 --- a/meta/packages/webkit/files/autogen.sh +++ b/meta/packages/webkit/files/autogen.sh @@ -8,6 +8,11 @@ test -z "$srcdir" && srcdir=. ORIGDIR=`pwd` cd $srcdir +GTKDOCIZE_FLAGS="--copy" +LIBTOOLIZE_FLAGS="--force --automake" +ACLOCAL_FLAGS="-I autotools" +AUTOMAKE_FLAGS="--foreign --add-missing" + DIE=0 (autoconf --version) < /dev/null > /dev/null 2>&1 || { @@ -46,10 +51,11 @@ rm -rf $top_srcdir/autom4te.cache touch README INSTALL -aclocal || exit $? -$LIBTOOLIZE --force || exit $? +gtkdocize $GTKDOCIZE_FLAGS > /dev/null 2>&1 || echo "Warning: not running gtk-docize." +aclocal $ACLOCAL_FLAGS || exit $? +$LIBTOOLIZE $LIBTOOLIZE_FLAGS || exit $? autoheader || exit $? -automake --foreign --add-missing || exit $? +automake $AUTOMAKE_FLAGS || exit $? autoconf || exit $? cd $ORIGDIR || exit 1 diff --git a/meta/packages/webkit/files/configure.ac b/meta/packages/webkit/files/configure.ac index 3ab2baffb..d4f3e749f 100644 --- a/meta/packages/webkit/files/configure.ac +++ b/meta/packages/webkit/files/configure.ac @@ -1,20 +1,50 @@ -AC_INIT([WebKit],[0.1],[http://bugs.webkit.org/]) - AC_PREREQ(2.59) -AC_CONFIG_HEADERS([aconfig.h]) +m4_define([webkit_major_version], [1]) +m4_define([webkit_minor_version], [3]) +m4_define([webkit_micro_version], [2]) + +# This is the version we'll be using as part of our User-Agent string +# e.g., AppleWebKit/$(webkit_user_agent_version) ... +# +# Sourced from WebCore/Configurations/Version.xcconfig +m4_define([webkit_user_agent_major_version], [531]) +m4_define([webkit_user_agent_minor_version], [2]) + +AC_INIT([WebKit],[webkit_major_version.webkit_minor_version.webkit_micro_version],[http://bugs.webkit.org/]) + +AC_CONFIG_MACRO_DIR([autotools]) +AC_CONFIG_AUX_DIR([autotools]) +AC_SUBST(ACLOCAL_AMFLAGS, "-I autotools") + +AC_CONFIG_HEADERS([autotoolsconfig.h]) +AC_CANONICAL_HOST + +WEBKIT_MAJOR_VERSION=webkit_major_version +WEBKIT_MINOR_VERSION=webkit_minor_version +WEBKIT_MICRO_VERSION=webkit_micro_version +WEBKIT_USER_AGENT_MAJOR_VERSION=webkit_user_agent_major_version +WEBKIT_USER_AGENT_MINOR_VERSION=webkit_user_agent_minor_version +AC_SUBST(WEBKIT_MAJOR_VERSION) +AC_SUBST(WEBKIT_MINOR_VERSION) +AC_SUBST(WEBKIT_MICRO_VERSION) +AC_SUBST(WEBKIT_USER_AGENT_MAJOR_VERSION) +AC_SUBST(WEBKIT_USER_AGENT_MINOR_VERSION) + AC_CONFIG_SRCDIR([WebCore/config.h]) -# see http://www.gnu.org/software/libtool/manual.html#Versioning -LIBWEBKITGTK_VERSION=1:0:0 +dnl # Libtool library version, not to confuse with API version +dnl # see http://www.gnu.org/software/libtool/manual/html_node/Libtool-versioning.html#Libtool-versioning +LIBWEBKITGTK_VERSION=0:0:0 AC_SUBST([LIBWEBKITGTK_VERSION]) -AM_INIT_AUTOMAKE([foreign subdir-objects]) +AM_INIT_AUTOMAKE([foreign subdir-objects tar-ustar]) -AC_CANONICAL_HOST +# Use AM_SILENT_RULES if present +m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) # host checking - inspired by the GTK+ configure.in -# TODO: os_mac, os_bsd +# TODO: move these to webkit.m4? AC_MSG_CHECKING([for native Win32]) case "$host" in *-*-mingw*) @@ -38,49 +68,28 @@ case "$host" in ;; esac -# If CXXFLAGS and CFLAGS are unset, default to -O2 -# This is to tell automake not to include '-g' if CXXFLAGS is not set -# For more info - http://www.gnu.org/software/automake/manual/autoconf.html#C_002b_002b-Compiler -if test -z "$CXXFLAGS"; then - CXXFLAGS="-O2" -fi -if test -z "$CFLAGS"; then - CFLAGS="-O2" -fi +case "$host_os" in + gnu* | linux* | k*bsd*-gnu) + os_gnu=yes + ;; + *) + os_gnu=no + ;; +esac -# programs +# initialize webkit options +WEBKIT_INIT AC_DISABLE_STATIC -AM_PROG_LIBTOOL -AC_PROG_INSTALL -AM_PROG_CC_STDC -AC_PROG_CXX -AM_PROG_CC_C_O - -# check for -fvisibility=hidden compiler support (GCC >= 4) -saved_CFLAGS="$CFLAGS" -CFLAGS="$CFLAGS -fvisibility=hidden -fvisibility-inlines-hidden" -AC_MSG_CHECKING([if ${CXX} supports -fvisibility=hidden -fvisibility-inlines-hidden]) -AC_COMPILE_IFELSE([char foo;], - [ AC_MSG_RESULT([yes]) - SYMBOL_VISIBILITY="-fvisibility=hidden" SYMBOL_VISIBILITY_INLINES="-fvisibility-inlines-hidden" ], - AC_MSG_RESULT([no])) -CFLAGS="$saved_CFLAGS" -AC_SUBST(SYMBOL_VISIBILITY) -AC_SUBST(SYMBOL_VISIBILITY_INLINES) - -AC_PATH_PROG(PERL, perl) -if test -z "$PERL"; then - AC_MSG_ERROR([You need 'perl' to compile WebKit]) -fi - -AC_PATH_PROG(BISON, bison) -if test -z "$BISON"; then - AC_MSG_ERROR([You need the 'bison' parser generator to compile WebKit]) -fi +AC_LIBTOOL_WIN32_DLL +AC_PROG_LIBTOOL AC_PATH_PROG(FLEX, flex) if test -z "$FLEX"; then AC_MSG_ERROR([You need the 'flex' lexer generator to compile WebKit]) +else + FLEX_VERSION=`$FLEX --version | sed 's,.*\ \([0-9]*\.[0-9]*\.[0-9]*\)$,\1,'` + AX_COMPARE_VERSION([2.5.33],[gt],[$FLEX_VERSION], + AC_MSG_WARN([You need at least version 2.5.33 of the 'flex' lexer generator to compile WebKit correctly])) fi AC_PATH_PROG(GPERF, gperf) @@ -88,82 +97,112 @@ if test -z "$GPERF"; then AC_MSG_ERROR([You need the 'gperf' hash function generator to compile WebKit]) fi -AC_PATH_PROG(MV, mv) -if test -z "$MV"; then - AC_MSG_ERROR([You need 'mv' to compile WebKit]) -fi - -# GTK+ port only -# Check for glib-genmarshal and glib-mkenums -AC_PATH_PROG([GLIB_GENMARSHAL], [glib-genmarshal]) -AC_PATH_PROG([GLIB_MKENUMS],[glib-mkenums]) - -# Check whether a C++ was found (AC_PROG_CXX sets $CXX to "g++" even when it -# doesn't exist) -AC_LANG_PUSH([C++]) -AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])],[],[AC_MSG_ERROR([No C++ compiler found])]) -AC_LANG_POP([C++]) - -# C/C++ Language Features -AC_C_CONST -AC_C_INLINE -AC_C_VOLATILE - -# C/C++ Headers -AC_HEADER_STDC -AC_HEADER_STDBOOL - # pthread (not needed on Windows) if test "$os_win32" = "no"; then AC_CHECK_HEADERS([pthread.h], - AC_DEFINE([HAVE_PTHREAD_H],[1],[Define if pthread exist]), + AC_DEFINE([HAVE_PTHREAD_H],[1],[Define if pthread exists]), AC_MSG_ERROR([pthread support is required to build WebKit])) fi -# libjpeg headers -AC_CHECK_HEADERS([jpeglib.h]) - -# check for pkg-config -AC_PATH_PROG(PKG_CONFIG, pkg-config, no) -if test "$PKG_CONFIG" = "no"; then - AC_MSG_ERROR([Cannot find pkg-config, make sure it is installed in your PATH]) +# check for libjpeg the way Gtk does it. +AC_CHECK_LIB(jpeg, jpeg_destroy_decompress, + jpeg_ok=yes, jpeg_ok=no + AC_MSG_ERROR([JPEG library (libjpeg) not found])) +if test "$jpeg_ok" = yes; then + AC_MSG_CHECKING([for jpeglib]) + AC_TRY_CPP( +[#include <stdio.h> +#undef PACKAGE +#undef VERSION +#undef HAVE_STDLIB_H +#include <jpeglib.h>], + jpeg_ok=yes, + jpeg_ok=no) + AC_MSG_RESULT($jpeg_ok) + if test "$jpeg_ok" = yes; then + JPEG_LIBS="-ljpeg" + # should we check for progressive JPEG like GTK+ as well? + else + AC_MSG_ERROR([JPEG library (libjpeg) not found]) + fi fi - -# determine the Unicode backend -AC_MSG_CHECKING([the Unicode backend to use]) -AC_ARG_WITH(unicode_backend, - AC_HELP_STRING([--with-unicode-backend=@<:@icu@:>@], - [Select Unicode backend [default=icu]]), - [],[unicode_backend="icu"]) - -case "$unicode_backend" in - icu) ;; - *) AC_MSG_ERROR([Invalid Unicode backend: must be icu.]) ;; -esac - -AC_MSG_RESULT([$unicode_backend]) - -if test "$unicode_backend" = "icu"; then - # check for icu-config - if test "$os_darwin" = "yes"; then - UNICODE_CFLAGS="-I\$(srcdir)/JavaScriptCore/icu -I\$(srcdir)/WebCore/icu" - UNICODE_LIBS="-licucore" - else - AC_PATH_PROG(icu_config, icu-config, no) - if test "$icu_config" = "no"; then - AC_MSG_ERROR([Cannot find icu-config. The ICU library is needed.]) - fi - - # We don't use --cflags as this gives us a lot of things that we don't - # necessarily want, like debugging and optimization flags - # See man (1) icu-config for more info. - UNICODE_CFLAGS=`$icu_config --cppflags` - UNICODE_LIBS=`$icu_config --ldflags` - fi +AC_SUBST([JPEG_LIBS]) + +# Check for libpng the way Gtk+ does it +for l in libpng libpng14 libpng12; do + AC_MSG_CHECKING(for $l) + if $PKG_CONFIG --exists $l ; then + AC_MSG_RESULT(yes) + PNG_LIBS=`$PKG_CONFIG --libs $l` + png_ok=yes + break + else + AC_MSG_RESULT(no) + png_ok=no + fi +done +if test "$png_ok" != yes; then + AC_CHECK_LIB(png, png_read_info, + [AC_CHECK_HEADER(png.h, + png_ok=yes, + png_ok=no)], + AC_MSG_ERROR([PNG library (libpng) not found]), -lz -lm) + if test "$png_ok" = yes; then + AC_MSG_CHECKING([for png_structp in png.h]) + AC_TRY_COMPILE([#include <png.h>], + [png_structp pp; png_infop info; png_colorp cmap; png_create_read_struct;], + png_ok=yes, + png_ok=no) + AC_MSG_RESULT($png_ok) + if test "$png_ok" = yes; then + PNG_LIBS='-lpng -lz' + else + AC_MSG_ERROR([PNG library (libpng) not found]) + fi + else + AC_MSG_ERROR([PNG library (libpng) not found]) + fi fi +AC_SUBST([PNG_LIBS]) + +# determine the GTK+ version to use +AC_MSG_CHECKING([the GTK+ version to use]) +AC_ARG_WITH([gtk], + [AS_HELP_STRING([--with-gtk=2.0|3.0], [the GTK+ version to use (default: 2.0)])], + [case "$with_gtk" in + 2.0|3.0) ;; + *) AC_MSG_ERROR([invalid GTK+ version specified]) ;; + esac], + [with_gtk=2.0]) +AC_MSG_RESULT([$with_gtk]) + +case "$with_gtk" in + 2.0) GTK_REQUIRED_VERSION=2.10 + GTK_API_VERSION=2.0 + WEBKITGTK_API_MAJOR_VERSION=1 + WEBKITGTK_API_MINOR_VERSION=0 + WEBKITGTK_API_VERSION=1.0 + WEBKITGTK_PC_NAME=webkit + GAIL_PC_NAME=gail + GAIL_REQUIRED_VERSION=1.8 + ;; + 3.0) GTK_REQUIRED_VERSION=2.90 + GTK_API_VERSION=3.0 + WEBKITGTK_API_MAJOR_VERSION=3 + WEBKITGTK_API_MINOR_VERSION=0 + WEBKITGTK_API_VERSION=3.0 + WEBKITGTK_PC_NAME=webkitgtk + GAIL_PC_NAME=gail-3.0 + GAIL_REQUIRED_VERSION=2.90.4 + ;; +esac -AC_SUBST([UNICODE_CFLAGS]) -AC_SUBST([UNICODE_LIBS]) +AC_SUBST([WEBKITGTK_API_MAJOR_VERSION]) +AC_SUBST([WEBKITGTK_API_MINOR_VERSION]) +AC_SUBST([WEBKITGTK_API_VERSION]) +AC_SUBST([WEBKITGTK_PC_NAME]) +AC_SUBST([GTK_API_VERSION]) +AM_CONDITIONAL([GTK_API_VERSION_2],[test "$GTK_API_VERSION" = "2.0"]) # determine the GDK/GTK+ target AC_MSG_CHECKING([the target windowing system]) @@ -194,58 +233,88 @@ if test "$with_hildon" = "yes"; then AC_SUBST([HILDON_LIBS]) fi -# determine the http backend -AC_MSG_CHECKING([the HTTP backend to use]) -AC_ARG_WITH(http_backend, - AC_HELP_STRING([--with-http-backend=@<:@curl/soup@:>@], - [Select HTTP backend [default=curl]]), - [],[with_http_backend="curl"]) - -case "$with_http_backend" in - curl|soup) ;; - *) AC_MSG_ERROR([Invalid HTTP backend: must be curl, soup.]) ;; -esac - -AC_MSG_RESULT([$with_http_backend]) - # minimum base dependencies -CAIRO_REQUIRED_VERSION=1.4 +LIBSOUP_REQUIRED_VERSION=2.28.2 +CAIRO_REQUIRED_VERSION=1.6 FONTCONFIG_REQUIRED_VERSION=2.4 FREETYPE2_REQUIRED_VERSION=9.0 LIBXML_REQUIRED_VERSION=2.6 # minimum GTK+ base dependencies -GLIB_REQUIRED_VERSION=2.0 -GOBJECT_REQUIRED_VERSION=2.0 -GTHREAD_REQUIRED_VERSION=2.0 -PANGO_REQUIRED_VERSION=1.0 -GTK_REQUIRED_VERSION=2.8 +PANGO_REQUIRED_VERSION=1.12 # optional modules -LIBCURL_REQUIRED_VERSION=7.15 -LIBSOUP_REQUIRED_VERSION=2.4 LIBXSLT_REQUIRED_VERSION=1.1.7 SQLITE_REQUIRED_VERSION=3.0 GSTREAMER_REQUIRED_VERSION=0.10 -GNOME_VFS_REQUIRED_VERSION=2.0 - -PKG_CHECK_MODULES([GLOBALDEPS], - [glib-2.0 >= $GLIB_REQUIRED_VERSION - gobject-2.0 >= $GOBJECT_REQUIRED_VERSION - gthread-2.0 >= $GTHREAD_REQUIRED_VERSION]) -AC_SUBST([GLOBALDEPS_CFLAGS]) -AC_SUBST([GLOBALDEPS_LIBS]) - -PKG_CHECK_MODULES([WEBKITDEPS], - [gtk+-2.0 >= $GTK_REQUIRED_VERSION - pango >= $PANGO_REQUIRED_VERSION - cairo >= $CAIRO_REQUIRED_VERSION - cairo-ft, - fontconfig >= $FONTCONFIG_REQUIRED_VERSION - freetype2 >= $FREETYPE2_REQUIRED_VERSION - libxml-2.0 >= $LIBXML_REQUIRED_VERSION]) -AC_SUBST([WEBKITDEPS_CFLAGS]) -AC_SUBST([WEBKITDEPS_LIBS]) +GSTREAMER_PLUGINS_BASE_REQUIRED_VERSION=0.10.25 +ENCHANT_REQUIRED_VERSION=0.22 + +# Available modules +# +# glib - glib and includes gthread +# unicode - check and identify which unicode backend to use +# +# todo: webcore gtk +WEBKIT_CHECK_DEPENDENCIES([glib unicode]) + +GETTEXT_PACKAGE=$PACKAGE +AC_SUBST(GETTEXT_PACKAGE) +AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", + [The gettext catalog name]) + +PKG_CHECK_MODULES(LIBXML, libxml-2.0 >= $LIBXML_REQUIRED_VERSION) +AC_SUBST(LIBXML_CFLAGS) +AC_SUBST(LIBXML_LIBS) + +PKG_CHECK_MODULES(PANGO, + [pango >= $PANGO_REQUIRED_VERSION + pangoft2]) +AC_SUBST(PANGO_CFLAGS) +AC_SUBST(PANGO_LIBS) + +PKG_CHECK_MODULES(ENCHANT, enchant >= $ENCHANT_REQUIRED_VERSION) +AC_SUBST(ENCHANT_CFLAGS) +AC_SUBST(ENCHANT_LIBS) + +PKG_CHECK_MODULES(GAIL, $GAIL_PC_NAME >= $GAIL_REQUIRED_VERSION) +AC_SUBST(GAIL_CFLAGS) +AC_SUBST(GAIL_LIBS) + +# check for target-specific dependencies +if test "$with_target" = "directfb"; then + PKG_CHECK_MODULES(CAIRO, cairo-directfb >= $CAIRO_REQUIRED_VERSION) + PKG_CHECK_MODULES(GTK, gtk+-directfb-2.0 >= $GTK_REQUIRED_VERSION) + AC_DEFINE([WTF_PLATFORM_DIRECTFB],[1],[Define if target is DirectFB]) +else + PKG_CHECK_MODULES(CAIRO, cairo >= $CAIRO_REQUIRED_VERSION) + PKG_CHECK_MODULES(GTK, gtk+-$GTK_API_VERSION >= $GTK_REQUIRED_VERSION) + + if test "$with_target" = "x11" && test "$os_win32" = "no"; then + # check for XT + PKG_CHECK_MODULES([XT], + [xt], + [xt_has_pkg_config=yes], + [xt_has_pkg_config=no]) + # some old versions of Xt do not provide xt.pc, so try to link against Xt + # and if it's installed fall back to just adding -lXt + if test "$xt_has_pkg_config" = "no"; then + # using AC_CHECK_LIB instead of AC_SEARCH_LIB is fine in this case as + # we don't care about the XtOpenDisplay symbol but only about the + # existence of libXt + AC_CHECK_LIB([Xt], [XtOpenDisplay], + [XT_CFLAGS=""; XT_LIBS="-lXt"], + [AC_MSG_ERROR([X Toolkit Intrinsics library (libXt) not found])]) + fi + AC_SUBST([XT_CFLAGS]) + AC_SUBST([XT_LIBS]) + AC_DEFINE([WTF_PLATFORM_X11],[1],[Define if target is X11]) + fi +fi +AC_SUBST(GTK_CFLAGS) +AC_SUBST(GTK_LIBS) +AC_SUBST(CAIRO_CFLAGS) +AC_SUBST(CAIRO_LIBS) # check whether to build with debugging enabled AC_MSG_CHECKING([whether to do a debug build]) @@ -255,22 +324,72 @@ AC_ARG_ENABLE(debug, [],[enable_debug="no"]) AC_MSG_RESULT([$enable_debug]) -# check whether to build with cross-document messaging support -AC_MSG_CHECKING([whether to enable HTML5 cross-document messaging support]) -AC_ARG_ENABLE(cross_document_messaging, - AC_HELP_STRING([--enable-cross-document-messaging], - [enable HTML5 cross-document messaging support [default=yes]]), - [],[enable_cross_document_messaging="yes"]) -AC_MSG_RESULT([$enable_cross_document_messaging]) +# check whether to enable optimized builds +AC_MSG_CHECKING([whether to enable optimized builds]) +AC_ARG_ENABLE(optimizations, + AC_HELP_STRING([--enable-optimizations], + [turn on optimize builds (GCC only) + [default=yes]]), + [enable_optimizations=$enableval], + [if test "$enable_debug" = "yes"; then enable_optimizations="no"; else enable_optimizations="yes"; fi]) +AC_MSG_RESULT([$enable_optimizations]) + +# check whether to enable 3D transforms support +AC_MSG_CHECKING([whether to enable support for 3D Transforms]) +AC_ARG_ENABLE(3D_transforms, + AC_HELP_STRING([--enable-3D-transforms], + [enable support for 3D transforms [default=no]]), + [],[enable_3D_transforms="no"]) +AC_MSG_RESULT([$enable_3D_transforms]) + +# check whether to enable channel messaging support +AC_MSG_CHECKING([whether to enable HTML5 Channel Messaging support]) +AC_ARG_ENABLE(channel_messaging, + AC_HELP_STRING([--enable-channel-messaging], + [enable HTML5 channel messaging support [default=yes]]), + [],[enable_channel_messaging="yes"]) +AC_MSG_RESULT([$enable_channel_messaging]) + +# check whether to enable JavaScript debugger/profiler support +AC_MSG_CHECKING([whether to enable JavaScript debugger/profiler support]) +AC_ARG_ENABLE(javascript_debugger, + AC_HELP_STRING([--enable-javascript-debugger], + [enable JavaScript debugger/profiler support [default=yes]]), + [],[enable_javascript_debugger="yes"]) +AC_MSG_RESULT([$enable_javascript_debugger]) + +# check whether to enable HTML5 Offline Web Applications support +AC_MSG_CHECKING([whether to enable HTML5 offline web applications support]) +AC_ARG_ENABLE(offline_web_applications, + AC_HELP_STRING([--enable-offline-web-applications], + [enable HTML5 offline web applications support [default=yes]]), + [],[enable_offline_web_applications="yes"]) +AC_MSG_RESULT([$enable_offline_web_applications]) # check whether to enable HTML5 client-side session and persitent storage support AC_MSG_CHECKING([whether to enable HTML5 client-side session and persistent storage support]) AC_ARG_ENABLE(dom_storage, AC_HELP_STRING([--enable-dom-storage], - [enable HTML5 client-side session and persistent storage support [default=no]]), - [],[enable_dom_storage="no"]) + [enable HTML5 client-side session and persistent storage support [default=yes]]), + [],[enable_dom_storage="yes"]) AC_MSG_RESULT([$enable_dom_storage]) +# check whether to enable the indexed database API +AC_MSG_CHECKING([whether to enable the indexed database API]) +AC_ARG_ENABLE(indexed_database, + AC_HELP_STRING([--enable-indexeddb], + [enable the indexed database API [default=no]]), + [],[enable_indexed_database="no"]) +AC_MSG_RESULT([$enable_indexed_database]) + +# check whether to enable the speech input API +AC_MSG_CHECKING([whether to enable the speech input API]) +AC_ARG_ENABLE(input_speech, + AC_HELP_STRING([--enable-input-speech], + [enable the speech input API [default=no]]), + [],[enable_input_speech="no"]) +AC_MSG_RESULT([$enable_input_speech]) + # check whether to build with database support AC_MSG_CHECKING([whether to enable HTML5 client-side database storage support]) AC_ARG_ENABLE(database, @@ -279,22 +398,70 @@ AC_ARG_ENABLE(database, [],[enable_database="yes"]) AC_MSG_RESULT([$enable_database]) +# check whether to build with server-sent events support +AC_MSG_CHECKING([whether to enable HTML5 server-sent events support]) +AC_ARG_ENABLE(eventsource, + AC_HELP_STRING([--enable-eventsource], + [enable HTML5 server-sent events support [default=yes]]), + [],[enable_eventsource="yes"]) +AC_MSG_RESULT([$enable_eventsource]) + # check whether to build with icon database support AC_MSG_CHECKING([whether to enable icon database support]) AC_ARG_ENABLE(icon_database, AC_HELP_STRING([--enable-icon-database], - [enable icon database [default=no]]), - [],[enable_icon_database="no"]) + [enable icon database [default=yes]]), + [],[enable_icon_database="yes"]) AC_MSG_RESULT([$enable_icon_database]) +# check whether to build with image resizer API support +AC_MSG_CHECKING([whether to enable image resizer API support]) +AC_ARG_ENABLE(image_resizer, + AC_HELP_STRING([--enable-image-resizer], + [enable image resizer [default=no]]), + [],[enable_image_resizer="no"]) +AC_MSG_RESULT([$enable_image_resizer]) + +# check whether to enable HTML5 datalist support +AC_MSG_CHECKING([whether to enable HTML5 datalist support]) +AC_ARG_ENABLE(datalist, + AC_HELP_STRING([--enable-datalist], + [enable HTML5 datalist support [default=yes]]), + [],[enable_datalist="yes"]) +AC_MSG_RESULT([$enable_datalist]) + +# check whether to enable HTML5 ruby support +AC_MSG_CHECKING([whether to enable HTML5 ruby support]) +AC_ARG_ENABLE(ruby, + AC_HELP_STRING([--enable-ruby], + [enable HTML5 ruby support [default=yes]]), + [],[enable_ruby="yes"]) +AC_MSG_RESULT([$enable_ruby]) + +# check whether to enable HTML5 sandbox iframe support +AC_MSG_CHECKING([whether to enable HTML5 sandboxed iframe support]) +AC_ARG_ENABLE(sandbox, + AC_HELP_STRING([--enable-sandbox], + [enable HTML5 sandboxed iframe support [default=yes]]), + [],[enable_sandbox="yes"]) +AC_MSG_RESULT([$enable_sandbox]) + # check whether to enable HTML5 audio/video support AC_MSG_CHECKING([whether to enable HTML5 video support]) AC_ARG_ENABLE(video, AC_HELP_STRING([--enable-video], - [enable HTML5 video support [default=no]]), - [],[enable_video="no"]) + [enable HTML5 video support [default=yes]]), + [],[enable_video="yes"]) AC_MSG_RESULT([$enable_video]) +# check whether to enable XHTML-MP support +AC_MSG_CHECKING([whether to enable XHTML-MP support]) +AC_ARG_ENABLE(xhtmlmp, + AC_HELP_STRING([--enable-xhtmlmp], + [enable support for XHTML-MP [default=no]]), + [],[enable_xhtmlmp="no"]) +AC_MSG_RESULT([$enable_xhtmlmp]) + # check whether to enable XPath support AC_MSG_CHECKING([whether to enable XPath support]) AC_ARG_ENABLE(xpath, @@ -311,80 +478,171 @@ AC_ARG_ENABLE(xslt, [],[enable_xslt="yes"]) AC_MSG_RESULT([$enable_xslt]) -# check whether to enable SVG experimental features -# Enable all SVG if it is -AC_MSG_CHECKING([whether to enable SVG experimental features]) -AC_ARG_ENABLE(svg_experimental, - AC_HELP_STRING([--enable-svg-experimental], - [enable support for SVG experimental features [default=no]]), - [],[enable_svg_experimental="no"]) -AC_MSG_RESULT([$enable_svg_experimental]) - -if test "$enable_svg_experimental" = "yes"; then - enable_svg=yes - enable_svg_animation=yes -# enable_svg_filters=yes - enable_svg_fonts=yes - enable_svg_foreign_object=yes - enable_svg_as_image=yes - enable_svg_use_element=yes -fi +# check whether to enable geolocation support +AC_MSG_CHECKING([whether to enable geolocation support]) +AC_ARG_ENABLE(geolocation, + AC_HELP_STRING([--enable-geolocation], + [enable support for geolocation [default=no]]), + [],[enable_geolocation="no"]) +AC_MSG_RESULT([$enable_geolocation]) + +# check whether to enable MathML support +AC_MSG_CHECKING([whether to enable MathML support]) +AC_ARG_ENABLE(mathml, + AC_HELP_STRING([--enable-mathml], + [enable support for MathML [default=no]]), + [],[enable_mathml="no"]) +AC_MSG_RESULT([$enable_mathml]) # check whether to enable SVG support AC_MSG_CHECKING([whether to enable SVG support]) AC_ARG_ENABLE(svg, AC_HELP_STRING([--enable-svg], - [enable support for SVG [default=no]]), - [],[enable_svg="no"]) + [enable support for SVG [default=yes]]), + [],[enable_svg="yes"]) AC_MSG_RESULT([$enable_svg]) +# check whether to enable WML support +AC_MSG_CHECKING([whether to enable WML support]) +AC_ARG_ENABLE(wml, + AC_HELP_STRING([--enable-wml], + [enable support for WML [default=no]]), + [],[enable_wml="no"]) +AC_MSG_RESULT([$enable_wml]) + +# check whether to enable SharedWorkers support +AC_MSG_CHECKING([whether to enable SharedWorkers support]) +AC_ARG_ENABLE(shared_workers, + AC_HELP_STRING([--enable-shared-workers], + [enable support for SharedWorkers [default=yes]]), + [],[enable_shared_workers="yes"]) +AC_MSG_RESULT([$enable_shared_workers]) + +# check whether to enable Web Workers support +AC_MSG_CHECKING([whether to enable Web Workers support]) +AC_ARG_ENABLE(workers, + AC_HELP_STRING([--enable-workers], + [enable support for Web Workers [default=yes]]), + [],[enable_workers="yes"]) +AC_MSG_RESULT([$enable_workers]) + +# turn off svg features if --disable-svg is requested +if test "$enable_svg" = "no"; then + enable_svg_animation=no + enable_svg_fonts=no + enable_svg_foreign_object=no + enable_svg_as_image=no + enable_svg_use=no +fi + # check whether to enable support for SVG animation AC_MSG_CHECKING([whether to enable support for SVG animation]) AC_ARG_ENABLE(svg_animation, AC_HELP_STRING([--enable-svg-animation], - [enable support for SVG animation (experimental) [default=no]]), - [],[enable_svg_animation="no"]) + [enable support for SVG animation (experimental) [default=yes]]), + [],[enable_svg_animation="yes"]) AC_MSG_RESULT([$enable_svg_animation]) -# check whether to enable support for SVG filters -AC_MSG_CHECKING([whether to enable support for SVG filters]) -AC_ARG_ENABLE(svg_filters, - AC_HELP_STRING([--enable-svg-filters], - [enable support for SVG filters (experimental) [default=no]]), - [],[enable_svg_filters="no"]) -AC_MSG_RESULT([$enable_svg_filters]) +# check whether to enable support for filters +AC_MSG_CHECKING([whether to enable support for filters]) +AC_ARG_ENABLE(filters, + AC_HELP_STRING([--enable-filters], + [enable support for filters (experimental) [default=yes]]), + [],[enable_filters="yes"]) +AC_MSG_RESULT([$enable_filters]) # check whether to enable support for SVG fonts AC_MSG_CHECKING([whether to enable support for SVG fonts]) AC_ARG_ENABLE(svg_fonts, AC_HELP_STRING([--enable-svg-fonts], - [enable support for SVG fonts (experimental) [default=no]]), - [],[enable_svg_fonts="no"]) + [enable support for SVG fonts (experimental) [default=yes]]), + [],[enable_svg_fonts="yes"]) AC_MSG_RESULT([$enable_svg_fonts]) # check whether to enable foreign objects support for SVG AC_MSG_CHECKING([whether to enable support for SVG foreign objects]) AC_ARG_ENABLE(svg_foreign_object, AC_HELP_STRING([--enable-svg-foreign-object], - [enable support for SVG foreign objects (experimental) [default=no]]), - [],[enable_svg_foreign_object="no"]) + [enable support for SVG foreign objects (experimental) [default=yes]]), + [],[enable_svg_foreign_object="yes"]) AC_MSG_RESULT([$enable_svg_foreign_object]) # check whether to enable SVG As Image support AC_MSG_CHECKING([whether to enable SVG as Image support]) AC_ARG_ENABLE(svg_as_image, AC_HELP_STRING([--enable-svg-as-image], - [enable SVG as Image support (experimental) [default=no]]), - [],[enable_svg_as_image="no"]) + [enable SVG as Image support (experimental) [default=yes]]), + [],[enable_svg_as_image="yes"]) AC_MSG_RESULT([$enable_svg_as_image]) # check whether to enable SVG USE element support AC_MSG_CHECKING([whether to enable support for SVG use element]) -AC_ARG_ENABLE(svg_use_element, - AC_HELP_STRING([--enable-svg-use-element], - [enable SVG use element support (experimental) [default=no]]), - [],[enable_svg_use_element="no"]) -AC_MSG_RESULT([$enable_svg_use_element]) +AC_ARG_ENABLE(svg_use, + AC_HELP_STRING([--enable-svg-use], + [enable SVG use element support (experimental) [default=yes]]), + [],[enable_svg_use="yes"]) +AC_MSG_RESULT([$enable_svg_use]) + +# check for SVG features, enabling SVG if necessary +if test "$enable_svg_animation" = "yes" || \ + test "$enable_svg_fonts" = "yes" || \ + test "$enable_svg_foreign_object" = "yes" || \ + test "$enable_svg_as_image" = "yes" || \ + test "$enable_svg_use" = "yes"; then + svg_flags=yes + if test "$enable_svg" = "no"; then + AC_MSG_WARN([SVG feature(s) requested but SVG is disabled.. Enabling SVG support]) + enable_svg=yes + fi +fi + +# check whether to enable Web Socket support +AC_MSG_CHECKING([whether to enable Web Sockets support]) +AC_ARG_ENABLE(web_sockets, + AC_HELP_STRING([--enable-web-sockets], + [enable support for Web Sockets [default=no]]), + [],[enable_web_sockets="no"]) +AC_MSG_RESULT([$enable_web_sockets]) + +# check whether to enable Web Timing support +AC_MSG_CHECKING([whether to enable Web Timing support]) +AC_ARG_ENABLE(web_timing, + AC_HELP_STRING([--enable-web-timing], + [enable support for Web Timing [default=no]]), + [],[enable_web_timing="no"]) +AC_MSG_RESULT([$enable_web_timing]) + +# check whether to enable Blob.slice support +AC_MSG_CHECKING([whether to enable Blob.slice support]) +AC_ARG_ENABLE(blob_slice, + AC_HELP_STRING([--enable-blob-slice], + [enable support for Blob.slice [default=no]]), + [],[enable_blob_slice="no"]) +AC_MSG_RESULT([$enable_blob_slice]) + +# check whether to enable Fast Mobile Scrolling support +AC_MSG_CHECKING([whether to enable Fast Mobile Scrolling]) +AC_ARG_ENABLE(fast_mobile_scrolling, + AC_HELP_STRING([--enable-fast-mobile-scrolling], + [enable support for Fast Mobile Scrolling [default=no]]), + [],[enable_fast_mobile_scrolling="no"]) +AC_MSG_RESULT([$enable_fast_mobile_scrolling]) + +# check whether to enable FileReader support +AC_MSG_CHECKING([whether to enable FileReader support]) +AC_ARG_ENABLE(file_reader, + AC_HELP_STRING([--enable-file-reader], + [enable support for FileReader [default=no]]), + [],[enable_file_reader="no"]) +AC_MSG_RESULT([$enable_file_reader]) + +# check whether to enable FileWriter support +AC_MSG_CHECKING([whether to enable FileWriter support]) +AC_ARG_ENABLE(file_writer, + AC_HELP_STRING([--enable-file-writer], + [enable support for FileWriter [default=no]]), + [],[enable_file_writer="no"]) +AC_MSG_RESULT([$enable_file_writer]) # check whether to enable code coverage AC_MSG_CHECKING([whether to enable code coverage support]) @@ -402,6 +660,64 @@ AC_ARG_ENABLE(fast_malloc, [],[if test "$enable_debug" = "yes"; then enable_fast_malloc="no"; else enable_fast_malloc="yes"; fi]) AC_MSG_RESULT([$enable_fast_malloc]) +AC_MSG_CHECKING([whether to enable JIT compilation]) +AC_ARG_ENABLE([jit], + AC_HELP_STRING([--enable-jit], + [Enable JIT compilation default=yes]), + [],[enable_jit="yes"]) +if test "$enable_jit" = "yes"; then + case "$host_cpu" in + i*86|x86_64) + AC_DEFINE([ENABLE_JIT], [1], [Define to enable JIT]) + AC_DEFINE([ENABLE_YARR], [1], [Define to enable YARR]) + AC_DEFINE([ENABLE_YARR_JIT], [1], [Define to enable YARR JIT]) + AC_DEFINE([ENABLE_JIT_OPTIMIZE_CALL], [1], [Define to enable optimizing calls]) + AC_DEFINE([ENABLE_JIT_OPTIMIZE_PROPERTY_ACCESS], [1], [Define to enable optimized property access]) + AC_DEFINE([ENABLE_JIT_OPTIMIZE_ARITHMETIC], [1], [Define to enable optimized arithmetic]) + case "$host_cpu" in + i*86) + AC_DEFINE([WTF_USE_JIT_STUB_ARGUMENT_VA_LIST], [1], [Use stub va_list]) + ;; + x86_64) + AC_DEFINE([WTF_USE_JIT_STUB_ARGUMENT_REGISTER], [1], [Use stub register]) + AC_DEFINE([WTF_USE_ALTERNATE_JSIMMEDIATE], [1], [Use alternate JSImmediate]) + ;; + esac + ;; + *) + enable_jit="no (CPU '$host_cpu' not supported)" + ;; + esac +fi +AC_MSG_RESULT([$enable_jit]) + +# GObject Introspection +AC_MSG_CHECKING([whether to enable GObject introspection support]) +AC_ARG_ENABLE([introspection], + [AS_HELP_STRING([--enable-introspection],[Enable GObject introspection (default: disabled)])], + [],[enable_introspection=no]) +AC_MSG_RESULT([$enable_introspection]) + +G_IR_SCANNER= +G_IR_COMPILER= +G_IR_GENERATE= +GIRDIR= +GIRTYPELIBDIR= + +if test "$enable_introspection" = "yes"; then + GOBJECT_INTROSPECTION_REQUIRED=0.6.15 + PKG_CHECK_MODULES([INTROSPECTION],[gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_REQUIRED]) + + G_IR_SCANNER="$($PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0)" + G_IR_COMPILER="$($PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0)" + G_IR_GENERATE="$($PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0)" + AC_DEFINE([ENABLE_INTROSPECTION],[1],[Define to enable GObject introspection support]) +fi + +AC_SUBST([G_IR_SCANNER]) +AC_SUBST([G_IR_COMPILER]) +AC_SUBST([G_IR_GENERATE]) + # determine the font backend AC_MSG_CHECKING([the font backend to use]) AC_ARG_WITH(font_backend, @@ -419,26 +735,63 @@ AC_MSG_RESULT([$with_font_backend]) if test "$enable_debug" = "yes"; then CXXFLAGS="$CXXFLAGS -g" CFLAGS="$CFLAGS -g" +else + AC_DEFINE([NDEBUG], [1], [Define to disable debugging features]) fi -# check if curl is available -if test "$with_http_backend" = "curl"; then - PKG_CHECK_MODULES([LIBCURL], - [libcurl >= $LIBCURL_REQUIRED_VERSION]) - AC_SUBST([LIBCURL_CFLAGS]) - AC_SUBST([LIBCURL_LIBS]) +# Add the appropriate 'O' level for optimized builds +if test "$enable_optimizations" = "yes"; then + CXXFLAGS="$CXXFLAGS -O2" + CFLAGS="$CFLAGS -O2" +else + CXXFLAGS="$CXXFLAGS -O0" + CFLAGS="$CFLAGS -O0" fi -if test "$with_http_backend" = "soup"; then - PKG_CHECK_MODULES([LIBSOUP], - [libsoup-2.4 >= $LIBSOUP_REQUIRED_VERSION]) - AC_SUBST([LIBSOUP_CFLAGS]) - AC_SUBST([LIBSOUP_LIBS]) +PKG_CHECK_MODULES([LIBSOUP], + [libsoup-2.4 >= $LIBSOUP_REQUIRED_VERSION]) +AC_SUBST([LIBSOUP_CFLAGS]) +AC_SUBST([LIBSOUP_LIBS]) + +# check if we can use libSoup 2.29.90 features +PKG_CHECK_MODULES([LIBSOUP_2_29_90], + [libsoup-2.4 >= 2.29.90], + [have_libsoup_2_29_90=yes], + [have_libsoup_2_29_90=no]) +if test "$have_libsoup_2_29_90" = "yes"; then + AC_DEFINE([HAVE_LIBSOUP_2_29_90], 1, [Whether libSoup 2.29.90 features are available]) +fi + +# check if FreeType/FontConfig are available +if test "$with_font_backend" = "freetype"; then + if test "$with_target" = "directfb"; then + PKG_CHECK_MODULES([FREETYPE], + [fontconfig >= $FONTCONFIG_REQUIRED_VERSION + freetype2 >= $FREETYPE2_REQUIRED_VERSION]) + else + PKG_CHECK_MODULES([FREETYPE], + [cairo-ft + fontconfig >= $FONTCONFIG_REQUIRED_VERSION + freetype2 >= $FREETYPE2_REQUIRED_VERSION]) + fi + AC_SUBST([FREETYPE_CFLAGS]) + AC_SUBST([FREETYPE_LIBS]) fi # check if sqlite 3 is available -if test "$enable_icon_database" = "yes" || test "$enable_database" = "yes"; then - PKG_CHECK_MODULES([SQLITE3], [sqlite3 >= $SQLITE_REQUIRED_VERSION]) +if test "$enable_icon_database" = "yes" || \ + test "$enable_database" = "yes" || \ + test "$enable_offline_web_applications" = "yes" || \ + test "$enable_dom_storage" = "yes"; then + PKG_CHECK_MODULES([SQLITE3], + [sqlite3 >= $SQLITE_REQUIRED_VERSION], + [sqlite3_has_pkg_config=yes], + [sqlite3_has_pkg_config=no]) + if test "$sqlite3_has_pkg_config" = "no"; then + AC_SEARCH_LIBS([sqlite3_open16], [sqlite3], + [SQLITE3_LIBS="$LIBS";SQLITE3_CFLAGS="-I $srcdir/WebKitLibraries/WebCoreSQLite3"], + [AC_MSG_ERROR([SQLite3 is required to enable Database support])]) + fi AC_SUBST([SQLITE3_CFLAGS]) AC_SUBST([SQLITE3_LIBS]) fi @@ -450,13 +803,22 @@ if test "$enable_xslt" = "yes"; then AC_SUBST([LIBXSLT_LIBS]) fi +# check if geoclue is available +if test "$enable_geolocation" = "yes"; then + PKG_CHECK_MODULES([GEOCLUE], [geoclue]) + AC_SUBST([GEOCLUE_CFLAGS]) + AC_SUBST([GEOCLUE_LIBS]) +fi + # check if gstreamer is available if test "$enable_video" = "yes"; then PKG_CHECK_MODULES([GSTREAMER], [gstreamer-0.10 >= $GSTREAMER_REQUIRED_VERSION - gstreamer-base-0.10, - gstreamer-plugins-base-0.10, - gnome-vfs-2.0 >= $GNOME_VFS_REQUIRED_VERSION]) + gstreamer-app-0.10 + gstreamer-base-0.10 + gstreamer-pbutils-0.10 + gstreamer-plugins-base-0.10 >= $GSTREAMER_PLUGINS_BASE_REQUIRED_VERSION + gstreamer-video-0.10]) AC_SUBST([GSTREAMER_CFLAGS]) AC_SUBST([GSTREAMER_LIBS]) fi @@ -469,24 +831,18 @@ if test "$enable_coverage" = "yes"; then AC_SUBST([COVERAGE_LDFLAGS]) fi -# check for SVG features, enabling SVG if necessary -if test "$enable_svg_animation" = "yes" || \ - test "$enable_svg_filters" = "yes" || \ - test "$enable_svg_fonts" = "yes" || \ - test "$enable_svg_foreign_object" = "yes" || \ - test "$enable_svg_as_image" = "yes" || \ - test "$enable_svg_use_element" = "yes"; then - svg_flags=yes - if test "$enable_svg" = "no"; then - AC_MSG_WARN([SVG feature(s) requested but SVG is disabled.. Enabling SVG support]) - enable_svg=yes - fi +# check for HTML features +if test "$enable_video" = "yes"; then + html_flags=yes fi +GTK_DOC_CHECK([1.10]) + # OS conditionals AM_CONDITIONAL([OS_WIN32],[test "$os_win32" = "yes"]) AM_CONDITIONAL([OS_UNIX],[test "$os_win32" = "no"]) AM_CONDITIONAL([OS_LINUX],[test "$os_linux" = "yes"]) +AM_CONDITIONAL([OS_GNU],[test "$os_gnu" = "yes"]) AM_CONDITIONAL([OS_FREEBSD],[test "$os_freebsd" = "yes"]) # target conditionals @@ -495,9 +851,9 @@ AM_CONDITIONAL([TARGET_WIN32], [test "$with_target" = "win32"]) AM_CONDITIONAL([TARGET_QUARTZ], [test "$with_target" = "quartz"]) AM_CONDITIONAL([TARGET_DIRECTFB], [test "$with_target" = "directfb"]) -# HTTP backend conditionals -AM_CONDITIONAL([USE_CURL], [test "$with_http_backend" = "curl"]) -AM_CONDITIONAL([USE_SOUP], [test "$with_http_backend" = "soup"]) +# Unicode backend conditionals +AM_CONDITIONAL([USE_ICU_UNICODE], [test "$with_unicode_backend" = "icu"]) +AM_CONDITIONAL([USE_GLIB_UNICODE], [test "$with_unicode_backend" = "glib"]) # Font backend conditionals AM_CONDITIONAL([USE_FREETYPE], [test "$with_font_backend" = "freetype"]) @@ -505,30 +861,67 @@ AM_CONDITIONAL([USE_PANGO], [test "$with_font_backend" = "pango"]) # WebKit feature conditionals AM_CONDITIONAL([ENABLE_DEBUG],[test "$enable_debug" = "yes"]) -AM_CONDITIONAL([ENABLE_CROSS_DOCUMENT_MESSAGING],[test "$enable_cross_document_messaging" = "yes"]) +AM_CONDITIONAL([ENABLE_3D_TRANSFORMS],[test "$enable_3D_transforms" = "yes"]) +AM_CONDITIONAL([ENABLE_BLOB_SLICE],[test "$enable_blob_slice" = "yes"]) +AM_CONDITIONAL([ENABLE_CHANNEL_MESSAGING],[test "$enable_channel_messaging" = "yes"]) +AM_CONDITIONAL([ENABLE_JAVASCRIPT_DEBUGGER],[test "$enable_javascript_debugger" = "yes"]) +AM_CONDITIONAL([ENABLE_OFFLINE_WEB_APPLICATIONS],[test "$enable_offline_web_applications" = "yes"]) AM_CONDITIONAL([ENABLE_DOM_STORAGE],[test "$enable_dom_storage" = "yes"]) AM_CONDITIONAL([ENABLE_DATABASE],[test "$enable_database" = "yes"]) +AM_CONDITIONAL([ENABLE_DATALIST],[test "$enable_datalist" = "yes"]) +AM_CONDITIONAL([ENABLE_EVENTSOURCE],[test "$enable_eventsource" = "yes"]) +AM_CONDITIONAL([ENABLE_FAST_MOBILE_SCROLLING],[test "$enable_fast_mobile_scrolling" = "yes"]) AM_CONDITIONAL([ENABLE_ICONDATABASE],[test "$enable_icon_database" = "yes"]) +AM_CONDITIONAL([ENABLE_IMAGE_RESIZER],[test "$enable_image_resizer" = "yes"]) +AM_CONDITIONAL([ENABLE_INDEXED_DATABASE],[test "$enable_indexed_database" = "yes"]) +AM_CONDITIONAL([ENABLE_INPUT_SPEECH],[test "$enable_input_speech" = "yes"]) +AM_CONDITIONAL([ENABLE_XHTMLMP],[test "$enable_xhtmlmp" = "yes"]) AM_CONDITIONAL([ENABLE_XPATH],[test "$enable_xpath" = "yes"]) AM_CONDITIONAL([ENABLE_XSLT],[test "$enable_xslt" = "yes"]) +AM_CONDITIONAL([ENABLE_FILTERS],[test "$enable_filters" = "yes"]) +AM_CONDITIONAL([ENABLE_FILE_READER],[test "$enable_file_reader" = "yes"]) +AM_CONDITIONAL([ENABLE_FILE_WRITER],[test "$enable_file_writer" = "yes"]) +AM_CONDITIONAL([ENABLE_GEOLOCATION], [test "$enable_geolocation" = "yes"]) +AM_CONDITIONAL([ENABLE_MATHML], [test "$enable_mathml" = "yes"]) +AM_CONDITIONAL([ENABLE_RUBY],[test "$enable_ruby" = "yes"]) +AM_CONDITIONAL([ENABLE_SANDBOX],[test "$enable_sandbox" = "yes"]) AM_CONDITIONAL([ENABLE_VIDEO],[test "$enable_video" = "yes"]) +AM_CONDITIONAL([ENABLE_NOTIFICATIONS],[test "$enable_notifications" = "yes"]) +AM_CONDITIONAL([ENABLE_ORIENTATION_EVENTS],[test "$enable_orientation_events" = "yes"]) AM_CONDITIONAL([ENABLE_SVG],[test "$enable_svg" = "yes"]) AM_CONDITIONAL([ENABLE_SVG_ANIMATION],[test "$enable_svg_animation" = "yes"]) -AM_CONDITIONAL([ENABLE_SVG_FILTERS],[test "$enable_svg_filters" = "yes"]) AM_CONDITIONAL([ENABLE_SVG_FONTS],[test "$enable_svg_fonts" = "yes"]) AM_CONDITIONAL([ENABLE_SVG_FOREIGN_OBJECT],[test "$enable_svg_foreign_object" = "yes"]) AM_CONDITIONAL([ENABLE_SVG_AS_IMAGE],[test "$enable_svg_as_image" = "yes"]) -AM_CONDITIONAL([ENABLE_SVG_USE],[test "$enable_svg_use_element" = "yes"]) +AM_CONDITIONAL([ENABLE_SVG_USE],[test "$enable_svg_use" = "yes"]) AM_CONDITIONAL([ENABLE_COVERAGE],[test "$enable_coverage" = "yes"]) AM_CONDITIONAL([ENABLE_FAST_MALLOC],[test "$enable_fast_malloc" = "yes"]) +AM_CONDITIONAL([ENABLE_WML],[test "$enable_wml" = "yes"]) +AM_CONDITIONAL([ENABLE_WORKERS],[test "$enable_workers" = "yes"]) +AM_CONDITIONAL([ENABLE_SHARED_WORKERS],[test "$enable_shared_workers" = "yes"]) AM_CONDITIONAL([SVG_FLAGS],[test "$svg_flags" = "yes"]) +AM_CONDITIONAL([HTML_FLAGS],[test "$html_flags" = "yes"]) +AM_CONDITIONAL([ENABLE_WEB_SOCKETS],[test "$enable_web_sockets" = "yes"]) +AM_CONDITIONAL([ENABLE_WEB_TIMING],[test "$enable_web_timing" = "yes"]) + +# Gtk conditionals +AM_CONDITIONAL([ENABLE_INTROSPECTION],[test "$enable_introspection" = "yes"]) + AC_CONFIG_FILES([ GNUmakefile -WebKit/gtk/webkit-1.0.pc:WebKit/gtk/webkit.pc.in +WebKit/gtk/webkit/webkitversion.h +WebKit/gtk/docs/GNUmakefile +WebKit/gtk/docs/version.xml ] ) +AC_CONFIG_FILES([ +WebKit/gtk/${WEBKITGTK_PC_NAME}-${WEBKITGTK_API_VERSION}.pc:WebKit/gtk/webkit.pc.in +WebKit/gtk/JSCore-${WEBKITGTK_API_VERSION}.gir:WebKit/gtk/JSCore.gir.in] +,[WEBKITGTK_API_VERSION=$WEBKITGTK_API_VERSION,WEBKITGTK_PC_NAME=$WEBKITGTK_PC_NAME] +) + AC_OUTPUT echo " @@ -536,27 +929,55 @@ WebKit was configured with the following options: Build configuration: Enable debugging (slow) : $enable_debug + Enable GCC build optimization : $enable_optimizations Code coverage support : $enable_coverage - Unicode backend : $unicode_backend - HTTP backend : $with_http_backend + Unicode backend : $with_unicode_backend Font backend : $with_font_backend Optimized memory allocator : $enable_fast_malloc Features: - HTML5 cross-document messaging : $enable_cross_document_messaging + 3D Transforms : $enable_3D_transforms + Blob.slice support : $enable_blob_slice + Fast Mobile Scrolling : $enable_fast_mobile_scrolling + JIT compilation : $enable_jit + Filters support : $enable_filters + FileReader support : $enable_file_reader + FileWriter support : $enable_file_writer + Geolocation support : $enable_geolocation + JavaScript debugger/profiler support : $enable_javascript_debugger + MathML support : $enable_mathml + HTML5 offline web applications support : $enable_offline_web_applications + HTML5 channel messaging support : $enable_channel_messaging HTML5 client-side session and persistent storage support : $enable_dom_storage HTML5 client-side database storage support : $enable_database + HTML5 ruby support : $enable_ruby + HTML5 sandboxed iframe support : $enable_sandbox + HTML5 server-sent events support : $enable_eventsource HTML5 video element support : $enable_video Icon database support : $enable_icon_database + Image resizer support : $enable_image_resizer + SharedWorkers support : $enable_shared_workers + Speech input support : $enable_input_speech SVG support : $enable_svg SVG animation support : $enable_svg_animation - SVG filters support : $enable_svg_filters SVG fonts support : $enable_svg_fonts SVG foreign object support : $enable_svg_foreign_object SVG as image support : $enable_svg_as_image - SVG use element support : $enable_svg_use_element + SVG use element support : $enable_svg_use + WML support : $enable_wml + Web Sockets support : $enable_web_sockets + Web Timing support : $enable_web_timing + Web Workers support : $enable_workers + XHTML-MP support : $enable_xhtmlmp XPATH support : $enable_xpath XSLT support : $enable_xslt GTK+ configuration: + GTK+ version : $with_gtk GDK target : $with_target Hildon UI extensions : $with_hildon + Introspection support : $enable_introspection " +if test "$with_unicode_backend" = "glib"; then + echo " >> WARNING: the glib-based unicode backend is slow and incomplete <<" + echo + echo +fi diff --git a/meta/packages/webkit/files/gtk-doc.make b/meta/packages/webkit/files/gtk-doc.make new file mode 100644 index 000000000..354ffb7c6 --- /dev/null +++ b/meta/packages/webkit/files/gtk-doc.make @@ -0,0 +1,173 @@ +# -*- mode: makefile -*- + +#################################### +# Everything below here is generic # +#################################### + +if GTK_DOC_USE_LIBTOOL +GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) +else +GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) +endif + +# We set GPATH here; this gives us semantics for GNU make +# which are more like other make's VPATH, when it comes to +# whether a source that is a target of one rule is then +# searched for in VPATH/GPATH. +# +GPATH = $(srcdir) + +TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE) + +EXTRA_DIST = \ + $(content_files) \ + $(HTML_IMAGES) \ + $(DOC_MAIN_SGML_FILE) \ + $(DOC_MODULE)-sections.txt \ + $(DOC_MODULE)-overrides.txt + +DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \ + $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp + +SCANOBJ_FILES = \ + $(DOC_MODULE).args \ + $(DOC_MODULE).hierarchy \ + $(DOC_MODULE).interfaces \ + $(DOC_MODULE).prerequisites \ + $(DOC_MODULE).signals + +REPORT_FILES = \ + $(DOC_MODULE)-undocumented.txt \ + $(DOC_MODULE)-undeclared.txt \ + $(DOC_MODULE)-unused.txt + +CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) + +if ENABLE_GTK_DOC +all-local: html-build.stamp +else +all-local: +endif + +docs: html-build.stamp + +#### scan #### + +scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) + @echo 'gtk-doc: Scanning header files' + @-chmod -R u+w $(srcdir) + cd $(srcdir) && \ + gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES) + if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \ + CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \ + else \ + cd $(srcdir) ; \ + for i in $(SCANOBJ_FILES) ; do \ + test -f $$i || touch $$i ; \ + done \ + fi + touch scan-build.stamp + +$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp + @true + +#### templates #### + +tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt + @echo 'gtk-doc: Rebuilding template files' + @-chmod -R u+w $(srcdir) + cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) + touch tmpl-build.stamp + +tmpl.stamp: tmpl-build.stamp + @true + +tmpl/*.sgml: + @true + + +#### xml #### + +sgml-build.stamp: tmpl.stamp $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files) + @echo 'gtk-doc: Building XML' + @-chmod -R u+w $(srcdir) + cd $(srcdir) && \ + gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $(MKDB_OPTIONS) + touch sgml-build.stamp + +sgml.stamp: sgml-build.stamp + @true + +#### html #### + +html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) + @echo 'gtk-doc: Building HTML' + @-chmod -R u+w $(srcdir) + rm -rf $(srcdir)/html + mkdir $(srcdir)/html + cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) + test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html ) + @echo 'gtk-doc: Fixing cross-references' + cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) + touch html-build.stamp + +############## + +clean-local: + rm -f *~ *.bak + rm -rf .libs + +distclean-local: + cd $(srcdir) && \ + rm -rf xml $(REPORT_FILES) \ + $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt + +maintainer-clean-local: clean + cd $(srcdir) && rm -rf xml html + +install-data-local: + -installfiles=`echo $(srcdir)/html/*`; \ + if test "$$installfiles" = '$(srcdir)/html/*'; \ + then echo '-- Nothing to install' ; \ + else \ + $(mkinstalldirs) $(DESTDIR)$(TARGET_DIR); \ + for i in $$installfiles; do \ + echo '-- Installing '$$i ; \ + $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \ + done; \ + echo '-- Installing $(srcdir)/html/index.sgml' ; \ + $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) || :; \ + which gtkdoc-rebase >/dev/null && \ + gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR) ; \ + fi + + +uninstall-local: + rm -f $(DESTDIR)$(TARGET_DIR)/* + +# +# Require gtk-doc when making dist +# +if ENABLE_GTK_DOC +dist-check-gtkdoc: +else +dist-check-gtkdoc: + @echo "*** gtk-doc must be installed and enabled in order to make dist" + @false +endif + +dist-hook: dist-check-gtkdoc dist-hook-local + mkdir $(distdir)/tmpl + mkdir $(distdir)/xml + mkdir $(distdir)/html + -cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl + -cp $(srcdir)/xml/*.xml $(distdir)/xml + cp $(srcdir)/html/* $(distdir)/html + -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/ + -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/ + cd $(distdir) && rm -f $(DISTCLEANFILES) + -gtkdoc-rebase --online --relative --html-dir=$(distdir)/html + +.PHONY : dist-hook-local docs diff --git a/meta/packages/webkit/webkit-gtk_svn.bb b/meta/packages/webkit/webkit-gtk_svn.bb index 85846f260..fe31b9c24 100644 --- a/meta/packages/webkit/webkit-gtk_svn.bb +++ b/meta/packages/webkit/webkit-gtk_svn.bb @@ -3,15 +3,17 @@ HOMEPAGE = "http://www.webkitgtk.org/" BUGTRACKER = "http://bugs.webkit.org/" LICENSE = "BSD & LGPLv2+" +LIC_FILES_CHKSUM = "file://WebCore/rendering/RenderApplet.h;endline=22;md5=fb9694013ad71b78f8913af7a5959680 \ + file://WebKit/gtk/webkit/webkit.h;endline=21;md5=b4fbe9f4a944f1d071dba1d2c76b3351 \ + file://JavaScriptCore/parser/Parser.h;endline=23;md5=2f3cff0ad0a9c486da5a376928973a90" -DEPENDS = "curl icu libxml2 cairo libxslt libidn gnutls gtk+ gstreamer gst-plugins-base gnome-vfs flex-native gperf-native perl-native sqlite3" +DEPENDS = "enchant gnome-keyring libsoup-2.4 curl icu libxml2 cairo libxslt libxt libidn gnutls gtk+ gstreamer gst-plugins-base gnome-vfs flex-native gperf-native perl-native sqlite3" DEPENDS_darwin8 = "curl icu libxml2 cairo libxslt libidn gnutls gtk+ gstreamer flex-native gperf-native perl-native sqlite3" SRCREV_FORMAT = "webcore-rwebkit" -# Yes, this is wrong... -PV = "0.1+svnr${SRCREV}" -PR = "r7" +PV = "1.3.2+svnr${SRCREV}" +PR = "r0" SRC_URI = "\ svn://svn.webkit.org/repository/webkit/trunk/;module=JavaScriptCore;proto=http \ @@ -20,16 +22,18 @@ SRC_URI = "\ svn://svn.webkit.org/repository/webkit/trunk/;module=WebKit;proto=http;name=webkit \ svn://svn.webkit.org/repository/webkit/trunk/;module=WebKitLibraries;proto=http \ svn://svn.webkit.org/repository/webkit/trunk/;module=WebKitTools;proto=http \ + svn://svn.webkit.org/repository/webkit/trunk/;module=autotools;proto=http \ file://Makefile \ file://Makefile.shared \ file://autogen.sh \ file://configure.ac \ file://GNUmakefile.am \ + file://gtk-doc.make \ " S = "${WORKDIR}/" -inherit autotools pkgconfig +inherit autotools lib_package pkgconfig EXTRA_OECONF = "\ --enable-debug=no \ @@ -38,6 +42,8 @@ EXTRA_OECONF = "\ --disable-fast-malloc \ " +EXTRA_AUTORECONF = " -I autotools " + do_compile_prepend() { mkdir -p ${S}/WebKitBuilds/Debug/JavaScriptCore/pcre/tmp/ mkdir -p ${S}/Programs/ @@ -54,10 +60,12 @@ do_compile_prepend() { cd ${S} } -PACKAGES =+ "${PN}launcher-dbg ${PN}launcher libjavascriptcore" +PACKAGES =+ "${PN}-webinspector ${PN}launcher-dbg ${PN}launcher libjavascriptcore" FILES_${PN}launcher = "${bindir}/GtkLauncher" FILES_${PN}launcher-dbg = "${bindir}/.debug/GtkLauncher" FILES_libjavascriptcore = "${libdir}/libJavaScriptCore.so.*" +FILES_${PN}-webinspector = "${datadir}/webkit-1.0/webinspector/" +FILES_${PN} += "${datadir}/webkit-1.0/resources/error.html ${datadir}/webkit-1.0/images" |