Changeset 145552 in webkit


Ignore:
Timestamp:
Mar 12, 2013 8:54:34 AM (11 years ago)
Author:
zandobersek@gmail.com
Message:

[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.
Location:
trunk
Files:
5 added
2 deleted
19 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r145427 r145552  
     12013-03-12  Zan Dobersek  <zdobersek@igalia.com>
     2
     3        [GTK] Set up the libPlatformGtk.la library
     4        https://bugs.webkit.org/show_bug.cgi?id=111738
     5
     6        Reviewed by Martin Robinson.
     7
     8        * GNUmakefile.am: Define the two variables that will hold sources list and cppflags as required for the new library.
     9        Include the new GNUmakefile.am that's now available under Source/Platform.
     10
    1112013-03-11  Tobias Mueller  <tobiasmue@gnome.org>
    212

  • trunk/GNUmakefile.am

    r145081 r145552  
    7171llint_nosources :=
    7272offlineasm_nosources :=
     73platformgtk_cppflags :=
     74platformgtk_sources :=
    7375webcore_platform_sources :=
    7476webcore_modules_sources :=
    … …  
    177179include Source/WTF/GNUmakefile.am
    178180include Source/JavaScriptCore/GNUmakefile.am
     181include Source/Platform/GNUmakefile.am
    179182include Source/WebCore/GNUmakefile.am
    180183include Source/WebCore/bindings/gobject/GNUmakefile.am

  • trunk/Source/Platform/ChangeLog

    r145452 r145552  
     12013-03-12  Zan Dobersek  <zdobersek@igalia.com>
     2
     3        [GTK] Set up the libPlatformGtk.la library
     4        https://bugs.webkit.org/show_bug.cgi?id=111738
     5
     6        Reviewed by Martin Robinson.
     7
     8        * GNUmakefile.am: Added. Set up the rules for building the new libPlatformGtk.la. For now it will be built in
     9        the same way as libWebCoreGtk.la and in parallel with it while the sources are moved from Source/WebCore/platform
     10        to Source/Platform/gtk and each migrated source file moves to be built in libPlatformGtk.la instead of libWebCoreGtk.la.
     11        * GNUmakefile.list.am: Added. Lists the build targets for the libPlatformGtk.la.
     12        * gtk/GtkVersioning.c: Renamed from Source/WebCore/platform/gtk/GtkVersioning.c. This file is independent of WebCore and can be moved
     13        and changed to be built into libPlatformGtk.la right away.
     14        * gtk/GtkVersioning.h: Renamed from Source/WebCore/platform/gtk/GtkVersioning.h. Ditto.
     15
    1162013-03-11  Mark Pilgrim  <pilgrim@chromium.org>
    217

  • trunk/Source/WebCore/ChangeLog

    r145550 r145552  
     12013-03-12  Zan Dobersek  <zdobersek@igalia.com>
     2
     3        [GTK] Set up the libPlatformGtk.la library
     4        https://bugs.webkit.org/show_bug.cgi?id=111738
     5
     6        Reviewed by Martin Robinson.
     7
     8        No new tests - no new functionality.
     9
     10        * GNUmakefile.am: Reference platformgtk_cppflags, platformgtk_sources variables along with webcoregtk_cppflags, webcoregtk_sources variables.
     11        * GNUmakefile.list.am: Removing GtkVersioning.c and GtkVersioning.h from the sources list, these files have been moved under Source/Platform.
     12        * bindings/gobject/GNUmakefile.am: Ditto on the platformgtk_* variables.
     13
    1142013-03-12  Alberto Garcia  <agarcia@igalia.com>
    215

  • trunk/Source/WebCore/GNUmakefile.am

    r145084 r145552  
    173173        -DBUILDING_WEBKIT \
    174174        $(global_cppflags) \
     175        $(platformgtk_cppflags) \
    175176        $(webcore_cppflags) \
    176177        $(webcoregtk_cppflags) \
    … …  
    423424# which means that GNUmake will only try to build the dependencies first, but
    424425# not rebuild all the targets if the dependencies change.
    425 $(webkitgtk_sources) $(webkit2_sources) $(webkit2_plugin_process_sources) $(webcore_sources) $(webcoregtk_sources) : | $(supplemental_dependency_file) $(webcore_built_sources)
     426$(webkitgtk_sources) $(webkit2_sources) $(webkit2_plugin_process_sources) $(webcore_sources) $(webcoregtk_sources) $(platformgtk_sources) : | $(supplemental_dependency_file) $(webcore_built_sources)
    426427
    427428noinst_LTLIBRARIES += \
    … …  
    475476        -DBUILDING_WEBKIT \
    476477        $(global_cppflags) \
     478        $(platformgtk_cppflags) \
    477479        $(webcore_cppflags) \
    478480        $(webcoregtk_cppflags) \
    … …  
    538540        -DBUILDING_WEBKIT \
    539541        $(global_cppflags) \
     542        $(platformgtk_cppflags) \
    540543        $(webcore_cppflags) \
    541544        $(webcoregtk_cppflags) \
    … …  
    584587        -DBUILDING_WEBKIT \
    585588        $(global_cppflags) \
     589        $(platformgtk_cppflags) \
    586590        $(webcore_cppflags) \
    587591        $(webcoregtk_cppflags) \

  • trunk/Source/WebCore/GNUmakefile.list.am

    r145510 r145552  
    62166216        Source/WebCore/platform/gtk/GtkPopupMenu.cpp \
    62176217        Source/WebCore/platform/gtk/GtkPopupMenu.h \
    6218         Source/WebCore/platform/gtk/GtkVersioning.c \
    6219         Source/WebCore/platform/gtk/GtkVersioning.h \
    62206218        Source/WebCore/platform/gtk/KeyBindingTranslator.cpp \
    62216219        Source/WebCore/platform/gtk/KeyBindingTranslator.h \

  • trunk/Source/WebCore/bindings/gobject/GNUmakefile.am

    r145084 r145552  
    533533        -I$(GENSOURCES_WEBKITDOM) \
    534534        $(global_cppflags) \
     535        $(platformgtk_cppflags) \
    535536        $(webcore_cppflags) \
    536537        $(webcoregtk_cppflags) \

  • trunk/Source/WebKit/gtk/ChangeLog

    r145084 r145552  
     12013-03-12  Zan Dobersek  <zdobersek@igalia.com>
     2
     3        [GTK] Set up the libPlatformGtk.la library
     4        https://bugs.webkit.org/show_bug.cgi?id=111738
     5
     6        Reviewed by Martin Robinson.
     7
     8        * GNUmakefile.am: Reference platformgtk_cppflags variable, libPlatformGtk.la along with webcoregtk_cppflags variable, libWebCoreGtk.la.
     9        Adjust the path to GtkVersioning.c, the file has moved under Source/Platform.
     10
    1112013-03-07  Zan Dobersek  <zdobersek@igalia.com>
    212

  • trunk/Source/WebKit/gtk/GNUmakefile.am

    r145084 r145552  
    4848        -ISource/WebKit/gtk/webkit \
    4949        $(global_cppflags) \
     50        $(platformgtk_cppflags) \
    5051        $(webcore_cppflags) \
    5152        $(webcoregtk_cppflags) \
    … …  
    8081libwebkitgtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_LIBADD := \
    8182        -lpthread \
     83        libPlatformGtk.la \
    8284        libWebCore.la \
    8385        libWebCorePlatform.la \
    … …  
    623625
    624626Programs_unittests_testcopyandpaste_SOURCES = Source/WebKit/gtk/tests/testcopyandpaste.c \
    625         Source/WebCore/platform/gtk/GtkVersioning.c
     627        Source/Platform/gtk/GtkVersioning.c
    626628Programs_unittests_testcopyandpaste_CFLAGS = $(webkit_tests_cflags) \
    627629        -I$(srcdir)/Source/WebCore/platform/gtk \

  • trunk/Source/WebKit2/ChangeLog

    r145535 r145552  
     12013-03-12  Zan Dobersek  <zdobersek@igalia.com>
     2
     3        [GTK] Set up the libPlatformGtk.la library
     4        https://bugs.webkit.org/show_bug.cgi?id=111738
     5
     6        Reviewed by Martin Robinson.
     7
     8        * GNUmakefile.am: Reference platformgtk_cppflags variable, libPlatformGtk.la along with webcoregtk_cppflags variable, libWebCoreGtk.la.
     9        Adjust the path to GtkVersioning.c, the file has moved under Source/Platform.
     10
    1112013-03-12  Mikhail Pozdnyakov  <mikhail.pozdnyakov@intel.com>
    212

  • trunk/Source/WebKit2/GNUmakefile.am

    r145526 r145552  
    99# still use gtk2. Since webcore was built with gtk3, we need to build webcoregtk sources again with gtk2
    1010noinst_LTLIBRARIES += \
     11        libPlatformGtk2.la \
    1112        libWebCoreGtk2.la
    1213
    … …  
    126127        -DWEBKIT2_COMPILATION \
    127128        -DENABLE_PLUGIN_PROCESS=1 \
     129        $(platformgtk_cppflags) \
    128130        $(webcore_cppflags) \
    129131        $(webcoregtk_cppflags) \
    … …  
    183185libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_LIBADD += \
    184186        libjavascriptcoregtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la \
     187        libPlatformGtk.la \
    185188        libWebCoreDOM.la \
    186189        libWebCoreGtk.la \
    … …  
    466469        -DGTK_API_VERSION_2=1 \
    467470        $(global_cppflags) \
     471        $(platformgtk_cppflags) \
    468472        $(webcore_cppflags) \
    469473        $(webcoregtk_cppflags) \
    … …  
    483487        $(SQLITE3_CFLAGS) \
    484488        $(UNICODE_CFLAGS) \
     489        $(XRENDER_CFLAGS) \
     490        $(XT_CFLAGS)
     491
     492libPlatformGtk2_la_SOURCES = \
     493        $(platformgtk_sources)
     494
     495libPlatformGtk2_la_CXXFLAGS = \
     496        -fvisibility-inlines-hidden \
     497        $(global_cxxflags)
     498
     499libPlatformGtk2_la_CFLAGS = \
     500        -fvisibility=hidden \
     501        $(global_cflags)
     502
     503libPlatformGtk2_la_CPPFLAGS = \
     504        -DBUILDING_WEBKIT \
     505        -DGTK_API_VERSION_2=1 \
     506        $(global_cppflags) \
     507        $(platformgtk_cppflags) \
     508        $(javascriptcore_cppflags) \
     509        -fno-strict-aliasing \
     510        $(HILDON_CPPFLAGS) \
     511        $(CAIRO_CFLAGS) \
     512        $(CLUTTER_CFLAGS) \
     513        $(COVERAGE_CFLAGS) \
     514        $(ENCHANT_CFLAGS) \
     515        $(FREETYPE_CFLAGS) \
     516        $(GAIL_CFLAGS) \
     517        $(GAMEPAD_CFLAGS) \
     518        $(GEOCLUE_CFLAGS) \
     519        $(GLIB_CFLAGS) \
     520        $(GSTREAMER_CFLAGS) \
     521        $(GTK_CFLAGS) \
     522        $(HILDON_CFLAGS) \
     523        $(LIBSECRET_CFLAGS) \
     524        $(LIBSOUP_CFLAGS) \
     525        $(LIBXML_CFLAGS) \
     526        $(LIBXSLT_CFLAGS) \
     527        $(SQLITE3_CFLAGS) \
     528        $(UNICODE_CFLAGS) \
     529        $(XCOMPOSITE_CFLAGS) \
     530        $(XDAMAGE_CFLAGS) \
    485531        $(XRENDER_CFLAGS) \
    486532        $(XT_CFLAGS)
    … …  
    548594        -DLIBEXECDIR=\""$(libexecdir)"\" \
    549595        $(global_cppflags) \
     596        $(platformgtk_cppflags) \
    550597        $(webcore_cppflags) \
    551598        $(webcoregtk_cppflags) \
    … …  
    587634
    588635Programs_WebKitPluginProcess_LDADD += \
     636        libPlatformGtk2.la \
    589637        libWebCoreModules.la \
     638        libWebCoreGtk2.la \
    590639        libWebCorePlatform.la \
    591         libWebCoreGtk2.la \
    592640        $(CAIRO_LIBS) \
    593641        $(COVERAGE_LDFLAGS) \

  • trunk/Source/WebKit2/Scripts/generate-forwarding-headers.pl

    r101412 r145552  
    3737my $incFromRoot = abs_path($ARGV[0]);
    3838my @platformPrefixes = ("blackberry", "cf", "chromium", "curl", "efl", "gtk", "mac", "qt", "soup", "v8", "win", "wx");
    39 my @frameworks = ( "JavaScriptCore", "WebCore", "WebKit2");
     39my @frameworks = ("JavaScriptCore", "Platform", "WebCore", "WebKit2");
    4040my @skippedPrefixes;
    4141my @frameworkHeaders;

  • trunk/Source/WebKit2/Shared/gtk/ArgumentCodersGtk.cpp

    r141640 r145552  
    3030#include "ShareableBitmap.h"
    3131#include "WebCoreArgumentCoders.h"
     32#include <Platform/GtkVersioning.h>
    3233#include <WebCore/DataObjectGtk.h>
    3334#include <WebCore/DragData.h>
    3435#include <WebCore/GraphicsContext.h>
    35 #include <WebCore/GtkVersioning.h>
    3636#include <WebCore/PlatformContextCairo.h>
    3737#include <wtf/gobject/GOwnPtr.h>

  • trunk/Source/WebKit2/Shared/gtk/WebEventFactory.cpp

    r138544 r145552  
    2929#include "WebEventFactory.h"
    3030
    31 #include "GtkVersioning.h"
    3231#include "PlatformKeyboardEvent.h"
    3332#include "Scrollbar.h"
    3433#include "WindowsKeyboardCodes.h"
     34#include <Platform/GtkVersioning.h>
    3535#include <gdk/gdk.h>
    3636#include <gdk/gdkkeysyms.h>

  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp

    r138803 r145552  
    4242#include "WebPageProxy.h"
    4343#include "WebViewBaseInputMethodFilter.h"
     44#include <Platform/GtkVersioning.h>
    4445#include <WebCore/ClipboardGtk.h>
    4546#include <WebCore/ClipboardUtilitiesGtk.h>
    … …  
    5152#include <WebCore/GtkDragAndDropHelper.h>
    5253#include <WebCore/GtkUtilities.h>
    53 #include <WebCore/GtkVersioning.h>
    5454#include <WebCore/NotImplemented.h>
    5555#include <WebCore/PasteboardHelper.h>

  • trunk/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp

    r142326 r145552  
    4343#endif
    4444#include <gdk/gdkx.h>
    45 #include <WebCore/GtkVersioning.h>
     45#include <Platform/GtkVersioning.h>
    4646#elif PLATFORM(EFL) && defined(HAVE_ECORE_X)
    4747#include <Ecore_X.h>

  • trunk/Tools/ChangeLog

    r145526 r145552  
     12013-03-12  Zan Dobersek  <zdobersek@igalia.com>
     2
     3        [GTK] Set up the libPlatformGtk.la library
     4        https://bugs.webkit.org/show_bug.cgi?id=111738
     5
     6        Reviewed by Martin Robinson.
     7
     8        * GNUmakefile.am: Reference platformgtk_cppflags variable along with webcoregtk_cppflags variable.
     9        Adjust the path to GtkVersioning.c, the file has moved under Source/Platform.
     10        * TestWebKitAPI/GNUmakefile.am: Reference platformgtk_cppflags variable along with webcoregtk_cppflags variable.
     11
    1122013-03-12  Zan Dobersek  <zdobersek@igalia.com>
    213

  • trunk/Tools/GNUmakefile.am

    r145395 r145552  
    116116        -I$(top_builddir)/Source/WebKit/gtk \
    117117        $(javascriptcore_cppflags) \
     118        $(platformgtk_cppflags) \
    118119        $(webcore_cppflags)
    119120
    … …  
    169170        Tools/DumpRenderTree/gtk/TextInputController.cpp \
    170171        Tools/DumpRenderTree/gtk/WorkQueueItemGtk.cpp \
    171         Source/WebCore/platform/gtk/GtkVersioning.c
     172        Source/Platform/gtk/GtkVersioning.c
    172173
    173174Programs_DumpRenderTree_CXXFLAGS = \

  • trunk/Tools/TestWebKitAPI/GNUmakefile.am

    r145395 r145552  
    7373Programs_TestWebKitAPI_TestGtk_CPPFLAGS = \
    7474        $(Programs_TestWebKitAPI_TestWTF_CPPFLAGS) \
     75        $(platformgtk_cppflags) \
    7576        $(webcore_cppflags) \
    7677        $(webcoregtk_cppflags) \
    … …  
    8485        Libraries/libgtest.la \
    8586        libjavascriptcoregtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la \
     87        libPlatformGtk.la \
    8688        libWebCore.la \
    8789        libWebCoreGtk.la \
Note: See TracChangeset for help on using the changeset viewer.