Commit 6e0b8076 authored by zandobersek@gmail.com's avatar zandobersek@gmail.com

[GTK] Set up the libPlatformGtk.la library

https://bugs.webkit.org/show_bug.cgi?id=111738

Reviewed by Martin Robinson.

.: 

* GNUmakefile.am: Define the two variables that will hold sources list and cppflags as required for the new library.
Include the new GNUmakefile.am that's now available under Source/Platform.

Source/Platform: 

* GNUmakefile.am: Added. Set up the rules for building the new libPlatformGtk.la. For now it will be built in
the same way as libWebCoreGtk.la and in parallel with it while the sources are moved from Source/WebCore/platform
to Source/Platform/gtk and each migrated source file moves to be built in libPlatformGtk.la instead of libWebCoreGtk.la.
* GNUmakefile.list.am: Added. Lists the build targets for the libPlatformGtk.la.
* gtk/GtkVersioning.c: Renamed from Source/WebCore/platform/gtk/GtkVersioning.c. This file is independent of WebCore and can be moved
and changed to be built into libPlatformGtk.la right away.
* gtk/GtkVersioning.h: Renamed from Source/WebCore/platform/gtk/GtkVersioning.h. Ditto.

Source/WebCore: 

No new tests - no new functionality.

* GNUmakefile.am: Reference platformgtk_cppflags, platformgtk_sources variables along with webcoregtk_cppflags, webcoregtk_sources variables.
* GNUmakefile.list.am: Removing GtkVersioning.c and GtkVersioning.h from the sources list, these files have been moved under Source/Platform.
* bindings/gobject/GNUmakefile.am: Ditto on the platformgtk_* variables.

Source/WebKit/gtk: 

* GNUmakefile.am: Reference platformgtk_cppflags variable, libPlatformGtk.la along with webcoregtk_cppflags variable, libWebCoreGtk.la.
Adjust the path to GtkVersioning.c, the file has moved under Source/Platform.

Source/WebKit2: 

* GNUmakefile.am: Reference platformgtk_cppflags variable, libPlatformGtk.la along with webcoregtk_cppflags variable, libWebCoreGtk.la.
Adjust the path to GtkVersioning.c, the file has moved under Source/Platform.

Tools: 

* GNUmakefile.am: Reference platformgtk_cppflags variable along with webcoregtk_cppflags variable.
Adjust the path to GtkVersioning.c, the file has moved under Source/Platform.
* TestWebKitAPI/GNUmakefile.am: Reference platformgtk_cppflags variable along with webcoregtk_cppflags variable.


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@145552 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 7ba6eb54
2013-03-12 Zan Dobersek <zdobersek@igalia.com>
[GTK] Set up the libPlatformGtk.la library
https://bugs.webkit.org/show_bug.cgi?id=111738
Reviewed by Martin Robinson.
* GNUmakefile.am: Define the two variables that will hold sources list and cppflags as required for the new library.
Include the new GNUmakefile.am that's now available under Source/Platform.
2013-03-11 Tobias Mueller <tobiasmue@gnome.org>
[Autotools] Set ENABLE_GTK_DOC to false if gtk-doc is not installed
......
......@@ -70,6 +70,8 @@ javascriptcore_built_sources :=
javascriptcore_built_nosources :=
llint_nosources :=
offlineasm_nosources :=
platformgtk_cppflags :=
platformgtk_sources :=
webcore_platform_sources :=
webcore_modules_sources :=
webcore_svg_built_sources :=
......@@ -176,6 +178,7 @@ EXTRA_DIST += \
# Include module makefiles
include Source/WTF/GNUmakefile.am
include Source/JavaScriptCore/GNUmakefile.am
include Source/Platform/GNUmakefile.am
include Source/WebCore/GNUmakefile.am
include Source/WebCore/bindings/gobject/GNUmakefile.am
include Source/WebCore/platform/gtk/po/GNUmakefile.am
......
2013-03-12 Zan Dobersek <zdobersek@igalia.com>
[GTK] Set up the libPlatformGtk.la library
https://bugs.webkit.org/show_bug.cgi?id=111738
Reviewed by Martin Robinson.
* GNUmakefile.am: Added. Set up the rules for building the new libPlatformGtk.la. For now it will be built in
the same way as libWebCoreGtk.la and in parallel with it while the sources are moved from Source/WebCore/platform
to Source/Platform/gtk and each migrated source file moves to be built in libPlatformGtk.la instead of libWebCoreGtk.la.
* GNUmakefile.list.am: Added. Lists the build targets for the libPlatformGtk.la.
* gtk/GtkVersioning.c: Renamed from Source/WebCore/platform/gtk/GtkVersioning.c. This file is independent of WebCore and can be moved
and changed to be built into libPlatformGtk.la right away.
* gtk/GtkVersioning.h: Renamed from Source/WebCore/platform/gtk/GtkVersioning.h. Ditto.
2013-03-11 Mark Pilgrim <pilgrim@chromium.org>
[Chromium] Move WebFileSystemCallbacks to Platform/
......
# The platform layer code is built into two separate static libraries - libPlatformGtk.la
# is built from files that require GTK+ and libPlatform.la is built from all the other files.
# This makes it possible to build two separate libPlatformGtk.la libraries, one using GTK3
# and the other (named libPlatformGtk2.la) using GTK2. The latter is required by the
# WebKitPluginProcess in WebKit2 as some plugins (such as Flash) still use GTK2.
# For now we only build the libPlatformGtk library as there are no source files in place yet
# that could be built into libPlatform.
platformgtk_cppflags += \
-DWEBKITGTK_API_VERSION_STRING=\"@WEBKITGTK_API_VERSION@\" \
-I$(srcdir)/Source/Platform/gtk
noinst_LTLIBRARIES += \
libPlatformGtk.la
libPlatformGtk_la_SOURCES = \
$(platformgtk_sources)
libPlatformGtk_la_CXXFLAGS = \
-fvisibility-inlines-hidder \
$(global_cxxflags)
libPlatformGtk_la_CFLAGS = \
-fvisibility=hidden \
$(global_cflags)
libPlatformGtk_la_CPPFLAGS = \
-DBUILDING_WEBKIT \
$(global_cppflags) \
$(platformgtk_cppflags) \
$(javascriptcore_cppflags) \
-fno-strict-aliasing \
$(GTK_CFLAGS)
platformgtk_sources += \
Source/Platform/gtk/GtkVersioning.c \
Source/Platform/gtk/GtkVersioning.h
2013-03-12 Zan Dobersek <zdobersek@igalia.com>
[GTK] Set up the libPlatformGtk.la library
https://bugs.webkit.org/show_bug.cgi?id=111738
Reviewed by Martin Robinson.
No new tests - no new functionality.
* GNUmakefile.am: Reference platformgtk_cppflags, platformgtk_sources variables along with webcoregtk_cppflags, webcoregtk_sources variables.
* GNUmakefile.list.am: Removing GtkVersioning.c and GtkVersioning.h from the sources list, these files have been moved under Source/Platform.
* bindings/gobject/GNUmakefile.am: Ditto on the platformgtk_* variables.
2013-03-12 Alberto Garcia <agarcia@igalia.com>
[BlackBerry] Image,ImageBuffer: add missing parameters to methods
......@@ -172,6 +172,7 @@ libWebCoreSVG_la_CPPFLAGS = \
-DBUILDING_WebCore \
-DBUILDING_WEBKIT \
$(global_cppflags) \
$(platformgtk_cppflags) \
$(webcore_cppflags) \
$(webcoregtk_cppflags) \
$(javascriptcore_cppflags) \
......@@ -422,7 +423,7 @@ DerivedSources/WebCore/JSInternalSettingsGenerated.h: DerivedSources/WebCore/Int
# IDL generation takes a long time. The pipe represents an order-only dependency,
# which means that GNUmake will only try to build the dependencies first, but
# not rebuild all the targets if the dependencies change.
$(webkitgtk_sources) $(webkit2_sources) $(webkit2_plugin_process_sources) $(webcore_sources) $(webcoregtk_sources) : | $(supplemental_dependency_file) $(webcore_built_sources)
$(webkitgtk_sources) $(webkit2_sources) $(webkit2_plugin_process_sources) $(webcore_sources) $(webcoregtk_sources) $(platformgtk_sources) : | $(supplemental_dependency_file) $(webcore_built_sources)
noinst_LTLIBRARIES += \
libWebCorePlatform.la \
......@@ -474,6 +475,7 @@ libWebCore_la_CPPFLAGS = \
-DBUILDING_WebCore \
-DBUILDING_WEBKIT \
$(global_cppflags) \
$(platformgtk_cppflags) \
$(webcore_cppflags) \
$(webcoregtk_cppflags) \
$(javascriptcore_cppflags) \
......@@ -537,6 +539,7 @@ libWebCorePlatform_la_CFLAGS = \
libWebCorePlatform_la_CPPFLAGS = \
-DBUILDING_WEBKIT \
$(global_cppflags) \
$(platformgtk_cppflags) \
$(webcore_cppflags) \
$(webcoregtk_cppflags) \
$(javascriptcore_cppflags) \
......@@ -583,6 +586,7 @@ libWebCoreGtk_la_CPPFLAGS = \
-DBUILDING_WebCore \
-DBUILDING_WEBKIT \
$(global_cppflags) \
$(platformgtk_cppflags) \
$(webcore_cppflags) \
$(webcoregtk_cppflags) \
$(javascriptcore_cppflags) \
......
......@@ -6215,8 +6215,6 @@ webcoregtk_sources += \
Source/WebCore/platform/gtk/GtkPluginWidget.h \
Source/WebCore/platform/gtk/GtkPopupMenu.cpp \
Source/WebCore/platform/gtk/GtkPopupMenu.h \
Source/WebCore/platform/gtk/GtkVersioning.c \
Source/WebCore/platform/gtk/GtkVersioning.h \
Source/WebCore/platform/gtk/KeyBindingTranslator.cpp \
Source/WebCore/platform/gtk/KeyBindingTranslator.h \
Source/WebCore/platform/gtk/LocalizedStringsGtk.cpp \
......
......@@ -532,6 +532,7 @@ libWebCoreDOM_la_CPPFLAGS = \
-I$(WebCore)/bindings/gobject \
-I$(GENSOURCES_WEBKITDOM) \
$(global_cppflags) \
$(platformgtk_cppflags) \
$(webcore_cppflags) \
$(webcoregtk_cppflags) \
$(javascriptcore_cppflags) \
......
2013-03-12 Zan Dobersek <zdobersek@igalia.com>
[GTK] Set up the libPlatformGtk.la library
https://bugs.webkit.org/show_bug.cgi?id=111738
Reviewed by Martin Robinson.
* GNUmakefile.am: Reference platformgtk_cppflags variable, libPlatformGtk.la along with webcoregtk_cppflags variable, libWebCoreGtk.la.
Adjust the path to GtkVersioning.c, the file has moved under Source/Platform.
2013-03-07 Zan Dobersek <zdobersek@igalia.com>
[GTK] Limit the supported compilers to GCC >= 4.7 and Clang >= 3.0
......
......@@ -47,6 +47,7 @@ libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_CPPF
-I$(GENSOURCES_WEBKITDOM) \
-ISource/WebKit/gtk/webkit \
$(global_cppflags) \
$(platformgtk_cppflags) \
$(webcore_cppflags) \
$(webcoregtk_cppflags) \
$(javascriptcore_cppflags) \
......@@ -79,6 +80,7 @@ libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_LDFL
libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_LIBADD := \
-lpthread \
libPlatformGtk.la \
libWebCore.la \
libWebCorePlatform.la \
libWebCoreModules.la \
......@@ -622,7 +624,7 @@ Programs_unittests_testkeyevents_LDADD = $(webkit_tests_ldadd)
Programs_unittests_testkeyevents_LDFLAGS = $(webkit_tests_ldflags)
Programs_unittests_testcopyandpaste_SOURCES = Source/WebKit/gtk/tests/testcopyandpaste.c \
Source/WebCore/platform/gtk/GtkVersioning.c
Source/Platform/gtk/GtkVersioning.c
Programs_unittests_testcopyandpaste_CFLAGS = $(webkit_tests_cflags) \
-I$(srcdir)/Source/WebCore/platform/gtk \
-I$(srcdir)/Source/WebCore
......
2013-03-12 Zan Dobersek <zdobersek@igalia.com>
[GTK] Set up the libPlatformGtk.la library
https://bugs.webkit.org/show_bug.cgi?id=111738
Reviewed by Martin Robinson.
* GNUmakefile.am: Reference platformgtk_cppflags variable, libPlatformGtk.la along with webcoregtk_cppflags variable, libWebCoreGtk.la.
Adjust the path to GtkVersioning.c, the file has moved under Source/Platform.
2013-03-12 Mikhail Pozdnyakov <mikhail.pozdnyakov@intel.com>
[WK2][EFL] Fix EwkContext class API
......@@ -8,6 +8,7 @@ lib_LTLIBRARIES += \
# We need to make sure plugin process is always built with gtk2, because plugins like flash
# still use gtk2. Since webcore was built with gtk3, we need to build webcoregtk sources again with gtk2
noinst_LTLIBRARIES += \
libPlatformGtk2.la \
libWebCoreGtk2.la
libexec_PROGRAMS += \
......@@ -125,6 +126,7 @@ libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_CPP
-DBUILDING_WEBKIT \
-DWEBKIT2_COMPILATION \
-DENABLE_PLUGIN_PROCESS=1 \
$(platformgtk_cppflags) \
$(webcore_cppflags) \
$(webcoregtk_cppflags) \
$(javascriptcore_cppflags) \
......@@ -182,6 +184,7 @@ endif
libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_LIBADD += \
libjavascriptcoregtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la \
libPlatformGtk.la \
libWebCoreDOM.la \
libWebCoreGtk.la \
$(CAIRO_LIBS) \
......@@ -465,6 +468,7 @@ libWebCoreGtk2_la_CPPFLAGS = \
-DBUILDING_WEBKIT \
-DGTK_API_VERSION_2=1 \
$(global_cppflags) \
$(platformgtk_cppflags) \
$(webcore_cppflags) \
$(webcoregtk_cppflags) \
$(javascriptcore_cppflags) \
......@@ -485,6 +489,48 @@ libWebCoreGtk2_la_CPPFLAGS = \
$(XRENDER_CFLAGS) \
$(XT_CFLAGS)
libPlatformGtk2_la_SOURCES = \
$(platformgtk_sources)
libPlatformGtk2_la_CXXFLAGS = \
-fvisibility-inlines-hidden \
$(global_cxxflags)
libPlatformGtk2_la_CFLAGS = \
-fvisibility=hidden \
$(global_cflags)
libPlatformGtk2_la_CPPFLAGS = \
-DBUILDING_WEBKIT \
-DGTK_API_VERSION_2=1 \
$(global_cppflags) \
$(platformgtk_cppflags) \
$(javascriptcore_cppflags) \
-fno-strict-aliasing \
$(HILDON_CPPFLAGS) \
$(CAIRO_CFLAGS) \
$(CLUTTER_CFLAGS) \
$(COVERAGE_CFLAGS) \
$(ENCHANT_CFLAGS) \
$(FREETYPE_CFLAGS) \
$(GAIL_CFLAGS) \
$(GAMEPAD_CFLAGS) \
$(GEOCLUE_CFLAGS) \
$(GLIB_CFLAGS) \
$(GSTREAMER_CFLAGS) \
$(GTK_CFLAGS) \
$(HILDON_CFLAGS) \
$(LIBSECRET_CFLAGS) \
$(LIBSOUP_CFLAGS) \
$(LIBXML_CFLAGS) \
$(LIBXSLT_CFLAGS) \
$(SQLITE3_CFLAGS) \
$(UNICODE_CFLAGS) \
$(XCOMPOSITE_CFLAGS) \
$(XDAMAGE_CFLAGS) \
$(XRENDER_CFLAGS) \
$(XT_CFLAGS)
# Injected Bundle
injectedbundledir = $(libdir)/webkit2gtk-3.0/injected-bundle
if ENABLE_WEBKIT2
......@@ -547,6 +593,7 @@ Programs_WebKitPluginProcess_CPPFLAGS = \
-DENABLE_PLUGIN_PROCESS=1 \
-DLIBEXECDIR=\""$(libexecdir)"\" \
$(global_cppflags) \
$(platformgtk_cppflags) \
$(webcore_cppflags) \
$(webcoregtk_cppflags) \
$(javascriptcore_cppflags) \
......@@ -586,9 +633,10 @@ Programs_WebKitPluginProcess_LDADD += \
endif
Programs_WebKitPluginProcess_LDADD += \
libPlatformGtk2.la \
libWebCoreModules.la \
libWebCorePlatform.la \
libWebCoreGtk2.la \
libWebCorePlatform.la \
$(CAIRO_LIBS) \
$(COVERAGE_LDFLAGS) \
$(GEOCLUE_LIBS) \
......
......@@ -36,7 +36,7 @@ use File::Spec::Functions;
my $srcRoot = realpath(File::Spec->catfile(dirname(abs_path($0)), "../.."));
my $incFromRoot = abs_path($ARGV[0]);
my @platformPrefixes = ("blackberry", "cf", "chromium", "curl", "efl", "gtk", "mac", "qt", "soup", "v8", "win", "wx");
my @frameworks = ( "JavaScriptCore", "WebCore", "WebKit2");
my @frameworks = ("JavaScriptCore", "Platform", "WebCore", "WebKit2");
my @skippedPrefixes;
my @frameworkHeaders;
my $framework;
......
......@@ -29,10 +29,10 @@
#include "DataReference.h"
#include "ShareableBitmap.h"
#include "WebCoreArgumentCoders.h"
#include <Platform/GtkVersioning.h>
#include <WebCore/DataObjectGtk.h>
#include <WebCore/DragData.h>
#include <WebCore/GraphicsContext.h>
#include <WebCore/GtkVersioning.h>
#include <WebCore/PlatformContextCairo.h>
#include <wtf/gobject/GOwnPtr.h>
......
......@@ -28,10 +28,10 @@
#include "config.h"
#include "WebEventFactory.h"
#include "GtkVersioning.h"
#include "PlatformKeyboardEvent.h"
#include "Scrollbar.h"
#include "WindowsKeyboardCodes.h"
#include <Platform/GtkVersioning.h>
#include <gdk/gdk.h>
#include <gdk/gdkkeysyms.h>
#include <wtf/ASCIICType.h>
......
......@@ -41,6 +41,7 @@
#include "WebKitWebViewBasePrivate.h"
#include "WebPageProxy.h"
#include "WebViewBaseInputMethodFilter.h"
#include <Platform/GtkVersioning.h>
#include <WebCore/ClipboardGtk.h>
#include <WebCore/ClipboardUtilitiesGtk.h>
#include <WebCore/DataObjectGtk.h>
......@@ -50,7 +51,6 @@
#include <WebCore/GtkClickCounter.h>
#include <WebCore/GtkDragAndDropHelper.h>
#include <WebCore/GtkUtilities.h>
#include <WebCore/GtkVersioning.h>
#include <WebCore/NotImplemented.h>
#include <WebCore/PasteboardHelper.h>
#include <WebCore/RefPtrCairo.h>
......
......@@ -42,7 +42,7 @@
#include <gtk/gtkx.h>
#endif
#include <gdk/gdkx.h>
#include <WebCore/GtkVersioning.h>
#include <Platform/GtkVersioning.h>
#elif PLATFORM(EFL) && defined(HAVE_ECORE_X)
#include <Ecore_X.h>
#endif
......
2013-03-12 Zan Dobersek <zdobersek@igalia.com>
[GTK] Set up the libPlatformGtk.la library
https://bugs.webkit.org/show_bug.cgi?id=111738
Reviewed by Martin Robinson.
* GNUmakefile.am: Reference platformgtk_cppflags variable along with webcoregtk_cppflags variable.
Adjust the path to GtkVersioning.c, the file has moved under Source/Platform.
* TestWebKitAPI/GNUmakefile.am: Reference platformgtk_cppflags variable along with webcoregtk_cppflags variable.
2013-03-12 Zan Dobersek <zdobersek@igalia.com>
[GTK] Enable Web Audio in development builds
......@@ -115,6 +115,7 @@ Programs_DumpRenderTree_CPPFLAGS = \
-I$(top_builddir)/DerivedSources \
-I$(top_builddir)/Source/WebKit/gtk \
$(javascriptcore_cppflags) \
$(platformgtk_cppflags) \
$(webcore_cppflags)
if TARGET_X11
......@@ -168,7 +169,7 @@ Programs_DumpRenderTree_SOURCES = \
Tools/DumpRenderTree/gtk/TextInputController.h \
Tools/DumpRenderTree/gtk/TextInputController.cpp \
Tools/DumpRenderTree/gtk/WorkQueueItemGtk.cpp \
Source/WebCore/platform/gtk/GtkVersioning.c
Source/Platform/gtk/GtkVersioning.c
Programs_DumpRenderTree_CXXFLAGS = \
$(global_cxxflags) \
......
......@@ -72,6 +72,7 @@ noinst_PROGRAMS += \
Programs_TestWebKitAPI_TestGtk_CPPFLAGS = \
$(Programs_TestWebKitAPI_TestWTF_CPPFLAGS) \
$(platformgtk_cppflags) \
$(webcore_cppflags) \
$(webcoregtk_cppflags) \
$(FREETYPE_CFLAGS) \
......@@ -83,6 +84,7 @@ Programs_TestWebKitAPI_TestGtk_LDADD = \
Libraries/libTestWebKitAPIMain.la \
Libraries/libgtest.la \
libjavascriptcoregtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la \
libPlatformGtk.la \
libWebCore.la \
libWebCoreGtk.la \
$(FREETYPE_LIBS) \
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment