Changeset 119837 in webkit


Ignore:
Timestamp:
Jun 8, 2012 9:37:48 AM (12 years ago)
Author:
Carlos Garcia Campos
Message:

[GTK] Add API to get the library version to WebKit2 GTK+
​https://bugs.webkit.org/show_bug.cgi?id=88426

Reviewed by Martin Robinson.

.:

  • configure.ac: Generate WebKitVersion.h from WebKitVersion.h.in

file.

Source/WebKit2:

  • GNUmakefile.am:
  • GNUmakefile.list.am:
  • UIProcess/API/gtk/WebKitVersion.cpp: Added.

(webkit_get_major_version):
(webkit_get_minor_version):
(webkit_get_micro_version):

  • UIProcess/API/gtk/WebKitVersion.h.in: Added.
  • UIProcess/API/gtk/docs/webkit2gtk-docs.sgml: Add new symbols.
  • UIProcess/API/gtk/docs/webkit2gtk-sections.txt: Add new section

for WebKitVersion.

  • UIProcess/API/gtk/tests/GNUmakefile.am:
  • UIProcess/API/gtk/tests/TestWebKitVersion.cpp: Added.

(testWebKitVersion):
(testWebKitCheckVersion):
(beforeAll):
(afterAll):

  • UIProcess/API/gtk/webkit2.h: Include WebKitVersion.h.

Tools:

  • gtk/generate-gtkdoc:

(get_webkit2_options): Add built sources to the list of files, but
ignore enum types and marshallers.

Location:
trunk
Files:
3 added
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r119834 r119837  
     12012-06-08  Carlos Garcia Campos  <cgarcia@igalia.com>
     2
     3        [GTK] Add API to get the library version to WebKit2 GTK+
     4        https://bugs.webkit.org/show_bug.cgi?id=88426
     5
     6        Reviewed by Martin Robinson.
     7
     8        * configure.ac: Generate WebKitVersion.h from WebKitVersion.h.in
     9        file.
     10
    1112012-06-08  Ion Rosca  <rosca@adobe.com>
    212

  • trunk/Source/WebKit2/ChangeLog

    r119829 r119837  
     12012-06-08  Carlos Garcia Campos  <cgarcia@igalia.com>
     2
     3        [GTK] Add API to get the library version to WebKit2 GTK+
     4        https://bugs.webkit.org/show_bug.cgi?id=88426
     5
     6        Reviewed by Martin Robinson.
     7
     8        * GNUmakefile.am:
     9        * GNUmakefile.list.am:
     10        * UIProcess/API/gtk/WebKitVersion.cpp: Added.
     11        (webkit_get_major_version):
     12        (webkit_get_minor_version):
     13        (webkit_get_micro_version):
     14        * UIProcess/API/gtk/WebKitVersion.h.in: Added.
     15        * UIProcess/API/gtk/docs/webkit2gtk-docs.sgml: Add new symbols.
     16        * UIProcess/API/gtk/docs/webkit2gtk-sections.txt: Add new section
     17        for WebKitVersion.
     18        * UIProcess/API/gtk/tests/GNUmakefile.am:
     19        * UIProcess/API/gtk/tests/TestWebKitVersion.cpp: Added.
     20        (testWebKitVersion):
     21        (testWebKitCheckVersion):
     22        (beforeAll):
     23        (afterAll):
     24        * UIProcess/API/gtk/webkit2.h: Include WebKitVersion.h.
     25
    1262012-06-08  Dan Bernstein  <mitz@apple.com>
    227

  • trunk/Source/WebKit2/GNUmakefile.am

    r119404 r119837  
    66libwebkit2gtkincludedir = $(libwebkitgtkincludedir)/webkit2
    77nodist_libwebkit2gtkinclude_HEADERS = \
    8         DerivedSources/WebKit2/webkit2gtk/webkit2/WebKitEnumTypes.h
     8        DerivedSources/WebKit2/webkit2gtk/webkit2/WebKitEnumTypes.h \
     9        DerivedSources/WebKit2/webkit2gtk/webkit2/WebKitVersion.h
    910
    1011libwebkit2gtkinclude_HEADERS = \

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

    r119700 r119837  
    209209        DerivedSources/WebKit2/webkit2gtk/webkit2/WebKitEnumTypes.h \
    210210        DerivedSources/WebKit2/webkit2gtk/webkit2/WebKitMarshal.cpp \
    211         DerivedSources/WebKit2/webkit2gtk/webkit2/WebKitMarshal.h
     211        DerivedSources/WebKit2/webkit2gtk/webkit2/WebKitMarshal.h \
     212        DerivedSources/WebKit2/webkit2gtk/webkit2/WebKitVersion.h
    212213
    213214webkit2_sources += \
    … …  
    648649        Source/WebKit2/UIProcess/API/gtk/WebKitURISchemeRequest.h \
    649650        Source/WebKit2/UIProcess/API/gtk/WebKitURISchemeRequestPrivate.h \
     651        Source/WebKit2/UIProcess/API/gtk/WebKitVersion.cpp \
    650652        Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.h \
    651653        Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp \

  • trunk/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk-docs.sgml

    r119700 r119837  
    3737    <xi:include href="xml/WebKitWebInspector.xml"/>
    3838    <xi:include href="xml/WebKitURISchemeRequest.xml"/>
     39    <xi:include href="xml/WebKitVersion.xml"/>
    3940  </chapter>
    4041

  • trunk/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk-sections.txt

    r119716 r119837  
    731731webkit_uri_scheme_request_get_type
    732732</SECTION>
     733
     734<SECTION>
     735<FILE>WebKitVersion</FILE>
     736webkit_get_major_version
     737webkit_get_minor_version
     738webkit_get_micro_version
     739
     740<SUBSECTION>
     741WEBKIT_MAJOR_VERSION
     742WEBKIT_MINOR_VERSION
     743WEBKIT_MICRO_VERSION
     744WEBKIT_CHECK_VERSION
     745</SECTION>

  • trunk/Source/WebKit2/UIProcess/API/gtk/tests/GNUmakefile.am

    r118146 r119837  
    99        Programs/WebKit2APITests/TestPrinting \
    1010        Programs/WebKit2APITests/TestResources \
     11        Programs/WebKit2APITests/TestWebKitVersion \
    1112        Programs/WebKit2APITests/TestWebKitFindController \
    1213        Programs/WebKit2APITests/TestWebKitPolicyClient \
    … …  
    161162Programs_WebKit2APITests_TestInspector_LDFLAGS = $(webkit2_tests_ldflags)
    162163
     164Programs_WebKit2APITests_TestWebKitVersion_SOURCES = \
     165        Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitVersion.cpp
     166Programs_WebKit2APITests_TestWebKitVersion_CPPFLAGS = $(webkit2_tests_cppflags)
     167Programs_WebKit2APITests_TestWebKitVersion_LDADD = $(webkit2_tests_ldadd)
     168Programs_WebKit2APITests_TestWebKitVersion_LDFLAGS = $(webkit2_tests_ldflags)
     169
    163170endif # ENABLE_WEBKIT2

  • trunk/Source/WebKit2/UIProcess/API/gtk/webkit2.h

    r119700 r119837  
    4848#include <webkit2/WebKitURIResponse.h>
    4949#include <webkit2/WebKitURISchemeRequest.h>
     50#include <webkit2/WebKitVersion.h>
    5051#include <webkit2/WebKitWebContext.h>
    5152#include <webkit2/WebKitWebInspector.h>

  • trunk/Tools/ChangeLog

    r119832 r119837  
     12012-06-08  Carlos Garcia Campos  <cgarcia@igalia.com>
     2
     3        [GTK] Add API to get the library version to WebKit2 GTK+
     4        https://bugs.webkit.org/show_bug.cgi?id=88426
     5
     6        Reviewed by Martin Robinson.
     7
     8        * gtk/generate-gtkdoc:
     9        (get_webkit2_options): Add built sources to the list of files, but
     10        ignore enum types and marshallers.
     11
    1122012-06-07  Vincent Scheib  <scheib@chromium.org>
    213

  • trunk/Tools/gtk/generate-gtkdoc

    r119404 r119837  
    8989        'doc_dir' : src_path('docs'),
    9090        'output_dir' : common.build_path('Documentation', 'webkit2gtk'),
    91         'source_dirs' : [src_path()],
     91        'source_dirs' : [src_path(), derived_sources_path('webkit2gtk', 'webkit2')],
    9292        'cflags' : ' -I' + derived_sources_path('webkit2gtk', 'include') + \
    9393                   ' -I' + derived_sources_path('webkit2gtk') + \
    … …  
    100100                         glob.glob(src_path('WebKitWebViewBaseAccessible.*')) + \
    101101                         glob.glob(src_path('WebKitGeolocationProvider.*')) + \
     102                         glob.glob(derived_sources_path('webkit2gtk', 'webkit2', 'WebKitMarshal.*')) + \
     103                         glob.glob(derived_sources_path('webkit2gtk', 'webkit2', 'WebKitEnumTypes.*')) + \
    102104                         glob.glob(src_path('tests/*.h'))
    103105    })

  • trunk/configure.ac

    r119593 r119837  
    14391439if test "$enable_webkit2" = "yes"; then
    14401440    AC_CONFIG_FILES([
     1441    DerivedSources/WebKit2/webkit2gtk/webkit2/WebKitVersion.h:Source/WebKit2/UIProcess/API/gtk/WebKitVersion.h.in
     1442    ])
     1443
     1444    AC_CONFIG_FILES([
    14411445    Source/WebKit2/webkit2gtk-${WEBKITGTK_API_VERSION}.pc:Source/WebKit2/webkit2gtk.pc.in
    14421446    ]
Note: See TracChangeset for help on using the changeset viewer.