Changeset 149759 in webkit


Ignore:
Timestamp:
May 8, 2013 12:39:49 PM (11 years ago)
Author:
zandobersek@gmail.com
Message:

[GTK] Plumb the Automake build system for the Battery Status API feature
https://bugs.webkit.org/show_bug.cgi?id=115718

Reviewed by Martin Robinson.

.:

  • Source/autotools/FindDependencies.m4: Check for the upower-glib dependency if the feature is enabled.
  • Source/autotools/PrintBuildConfiguration.m4: Print out the feature status.
  • Source/autotools/ReadCommandLineArguments.m4: Check for the --enable-battery-status option. The deafult,

when the option is not given, is to disable the feature.

  • Source/autotools/SetupWebKitFeatures.m4: Treat the ENABLE_BATTERY_STATUS define as configurable.
  • Source/autotools/symbols.filter: Export a couple of symbols that are used in the WebCore internals library.

Source/WebCore:

No new tests - no new functionality. The feature is not enabled yet, though all the relevant tests
pass when it is.

  • GNUmakefile.am: Add the Modules/battery directory to the list of search paths for header inclusions.

Include the same directory under the IDL_PATH variable so the IDL files it contains are processed.
List these IDL files using a wildcard under the EXTRA_DIST list.

  • GNUmakefile.list.am: Add the build targets for the module source files, IDLs and resulting JS bindings.
  • bindings/gobject/GNUmakefile.am: Add the build targets for the GObject DOM bindings.

Tools:

  • Scripts/webkitdirs.pm:

(buildAutotoolsProject): List battery-status as a configurable feature, meaning its value will be adjusted
through the --(enable|disable)-battery-status flag passed to configure.

Location:
trunk
Files:
12 edited

Legend:

Unmodified
Added
Removed
  • trunk/ChangeLog

    r149714 r149759  
     12013-05-08  José Dapena Paz  <jdapena@igalia.com> and Zan Dobersek  <zdobersek@igalia.com>
     2
     3        [GTK] Plumb the Automake build system for the Battery Status API feature
     4        https://bugs.webkit.org/show_bug.cgi?id=115718
     5
     6        Reviewed by Martin Robinson.
     7
     8        * Source/autotools/FindDependencies.m4: Check for the upower-glib dependency if the feature is enabled.
     9        * Source/autotools/PrintBuildConfiguration.m4: Print out the feature status.
     10        * Source/autotools/ReadCommandLineArguments.m4: Check for the --enable-battery-status option. The deafult,
     11        when the option is not given, is to disable the feature.
     12        * Source/autotools/SetupWebKitFeatures.m4: Treat the ENABLE_BATTERY_STATUS define as configurable.
     13        * Source/autotools/symbols.filter: Export a couple of symbols that are used in the WebCore internals library.
     14
    1152013-05-08  Zan Dobersek  <zdobersek@igalia.com>
    216
  • trunk/Source/WebCore/ChangeLog

    r149755 r149759  
     12013-05-08  José Dapena Paz  <jdapena@igalia.com> and Zan Dobersek  <zdobersek@igalia.com>
     2
     3        [GTK] Plumb the Automake build system for the Battery Status API feature
     4        https://bugs.webkit.org/show_bug.cgi?id=115718
     5
     6        Reviewed by Martin Robinson.
     7
     8        No new tests - no new functionality. The feature is not enabled yet, though all the relevant tests
     9        pass when it is.
     10
     11        * GNUmakefile.am: Add the Modules/battery directory to the list of search paths for header inclusions.
     12        Include the same directory under the IDL_PATH variable so the IDL files it contains are processed.
     13        List these IDL files using a wildcard under the EXTRA_DIST list.
     14        * GNUmakefile.list.am: Add the build targets for the module source files, IDLs and resulting JS bindings.
     15        * bindings/gobject/GNUmakefile.am: Add the build targets for the GObject DOM bindings.
     16
    1172013-05-08  Roger Fong  <roger_fong@apple.com>
    218
  • trunk/Source/WebCore/GNUmakefile.am

    r149588 r149759  
    1010        -I$(srcdir)/Source/ThirdParty/ANGLE/include/KHR \
    1111        -I$(srcdir)/Source/WebCore \
     12        -I$(srcdir)/Source/WebCore/Modules/battery \
    1213        -I$(srcdir)/Source/WebCore/Modules/filesystem \
    1314        -I$(srcdir)/Source/WebCore/Modules/gamepad \
     
    373374
    374375IDL_PATH := \
     376    $(WebCore)/Modules/battery \
    375377    $(WebCore)/Modules/filesystem \
    376378    $(WebCore)/Modules/gamepad \
     
    602604
    603605EXTRA_DIST += \
     606        $(wildcard $(srcdir)/Source/WebCore/Modules/battery/*.idl) \
    604607        $(wildcard $(srcdir)/Source/WebCore/Modules/filesystem/*.idl) \
    605608        $(wildcard $(srcdir)/Source/WebCore/Modules/gamepad/*.idl) \
  • trunk/Source/WebCore/GNUmakefile.list.am

    r149708 r149759  
    7272        DerivedSources/WebCore/JSBarInfo.cpp \
    7373        DerivedSources/WebCore/JSBarInfo.h \
     74        DerivedSources/WebCore/JSBatteryManager.cpp \
     75        DerivedSources/WebCore/JSBatteryManager.h \
    7476        DerivedSources/WebCore/JSBeforeLoadEvent.cpp \
    7577        DerivedSources/WebCore/JSBeforeLoadEvent.h \
     
    12151217
    12161218dom_binding_idls += \
     1219        $(WebCore)/Modules/battery/BatteryManager.idl \
     1220        $(WebCore)/Modules/battery/NavigatorBattery.idl \
    12171221        $(WebCore)/Modules/filesystem/DOMFileSystem.idl \
    12181222        $(WebCore)/Modules/filesystem/DOMFileSystemSync.idl \
     
    18151819
    18161820webcore_modules_sources += \
     1821        Source/WebCore/Modules/battery/BatteryClient.h \
     1822        Source/WebCore/Modules/battery/BatteryController.cpp \
     1823        Source/WebCore/Modules/battery/BatteryController.h \
     1824        Source/WebCore/Modules/battery/BatteryManager.cpp \
     1825        Source/WebCore/Modules/battery/BatteryManager.h \
     1826        Source/WebCore/Modules/battery/BatteryStatus.cpp \
     1827        Source/WebCore/Modules/battery/BatteryStatus.h \
     1828        Source/WebCore/Modules/battery/NavigatorBattery.cpp \
     1829        Source/WebCore/Modules/battery/NavigatorBattery.h \
    18171830        Source/WebCore/Modules/filesystem/AsyncFileWriter.h \
    18181831        Source/WebCore/Modules/filesystem/AsyncFileWriterClient.h \
  • trunk/Source/WebCore/bindings/gobject/GNUmakefile.am

    r149257 r149759  
    44        DerivedSources/webkitdom/WebKitDOMBarInfo.cpp \
    55        DerivedSources/webkitdom/WebKitDOMBarInfoPrivate.h \
     6        DerivedSources/webkitdom/WebKitDOMBatteryManager.cpp \
     7        DerivedSources/webkitdom/WebKitDOMBatteryManagerPrivate.h \
    68        DerivedSources/webkitdom/WebKitDOMBlob.cpp \
    79        DerivedSources/webkitdom/WebKitDOMBlobPrivate.h \
     
    284286
    285287webkitgtk_gdom_built_h_api += \
     288        DerivedSources/webkitdom/WebKitDOMBatteryManager.h \
    286289        DerivedSources/webkitdom/WebKitDOMCSSRule.h \
    287290        DerivedSources/webkitdom/WebKitDOMCSSRuleList.h \
  • trunk/Source/autotools/FindDependencies.m4

    r148264 r149759  
    489489fi
    490490
     491if test "$enable_battery_status" = "yes"; then
     492    PKG_CHECK_MODULES([UPOWER_GLIB], [upower-glib])
     493
     494    AC_SUBST(UPOWER_GLIB_CFLAGS)
     495    AC_SUBST(UPOWER_GLIB_LIBS)
     496fi
     497
    491498# Check whether to enable code coverage support.
    492499if test "$enable_coverage" = "yes"; then
  • trunk/Source/autotools/PrintBuildConfiguration.m4

    r148264 r149759  
    1818 Accelerated Compositing                                  : $enable_accelerated_compositing
    1919 Accelerated 2D canvas                                    : $enable_accelerated_canvas
     20 Battery API support                                      : $enable_battery_status
    2021 Gamepad support                                          : $enable_gamepad
    2122 Geolocation support                                      : $enable_geolocation
  • trunk/Source/autotools/ReadCommandLineArguments.m4

    r147499 r149759  
    125125AC_MSG_RESULT([$enable_web_audio])
    126126
     127AC_MSG_CHECKING([whether to enable Battery Status API support])
     128AC_ARG_ENABLE(battery_status,
     129    AC_HELP_STRING([--enable-battery-status], [enable support for Battery Status API [default=no]]),
     130    [],
     131    [enable_battery_status="no"])
     132AC_MSG_RESULT([$enable_battery_status])
     133
    127134AC_MSG_CHECKING([whether to enable code coverage support])
    128135AC_ARG_ENABLE(coverage,
  • trunk/Source/autotools/SetupWebKitFeatures.m4

    r149352 r149759  
    8484fi
    8585
     86if test "$enable_battery_status" = "yes"; then
     87    CONFIGURABLE_FEATURE_DEFINES="$CONFIGURABLE_FEATURE_DEFINES ENABLE_BATTERY_STATUS=1"
     88else
     89    CONFIGURABLE_FEATURE_DEFINES="$CONFIGURABLE_FEATURE_DEFINES ENABLE_BATTERY_STATUS=0"
     90fi
     91
    8692# This list of features represents those selected for release builds.  If you are
    8793# adding a new or unstable feature, you should mark it disabled here. We need to run
     
    8995# on the output file (WebKitFeatures.txt).
    9096$srcdir/Tools/gtk/generate-feature-defines-files $CONFIGURABLE_FEATURE_DEFINES \
    91     ENABLE_BATTERY_STATUS=0 \
    9297    ENABLE_BLOB=1 \
    9398    ENABLE_CANVAS_PATH=0 \
  • trunk/Source/autotools/symbols.filter

    r149576 r149759  
    316316_ZNK7WebCore14FrameSelection6boundsEb;
    317317_ZN7WebCore10ClientRectC1ERKNS_9FloatRectE;
     318_ZN7WebCore13BatteryStatus6createEbddd;
     319_ZN7WebCore17BatteryController14supplementNameEv;
     320_ZN7WebCore17BatteryController22didChangeBatteryStatusERKN3WTF12AtomicStringENS1_10PassRefPtrINS_13BatteryStatusEEE;
    318321
    319322local:
  • trunk/Tools/ChangeLog

    r149757 r149759  
     12013-05-08  José Dapena Paz  <jdapena@igalia.com> and Zan Dobersek  <zdobersek@igalia.com>
     2
     3        [GTK] Plumb the Automake build system for the Battery Status API feature
     4        https://bugs.webkit.org/show_bug.cgi?id=115718
     5
     6        Reviewed by Martin Robinson.
     7
     8        * Scripts/webkitdirs.pm:
     9        (buildAutotoolsProject): List battery-status as a configurable feature, meaning its value will be adjusted
     10        through the --(enable|disable)-battery-status flag passed to configure.
     11
    1122013-05-08  Ryosuke Niwa  <rniwa@webkit.org>
    213
  • trunk/Tools/Scripts/webkitdirs.pm

    r149347 r149759  
    19261926    # features for which there exists a configuration option in configure.ac.
    19271927    my %configurableFeatures = (
     1928        "battery-status" => 1,
    19281929        "gamepad" => 1,
    19291930        "geolocation" => 1,
Note: See TracChangeset for help on using the changeset viewer.