Commit 90142ec9 authored by zandobersek@gmail.com's avatar zandobersek@gmail.com

[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.


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@149759 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent b8bcf05d
2013-05-08 José Dapena Paz <jdapena@igalia.com> and Zan Dobersek <zdobersek@igalia.com>
[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.
2013-05-08 Zan Dobersek <zdobersek@igalia.com>
[Automake] Pass --no-demangle to the linker by default to get the mangled symbols
......
2013-05-08 José Dapena Paz <jdapena@igalia.com> and Zan Dobersek <zdobersek@igalia.com>
[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.
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.
2013-05-08 Roger Fong <roger_fong@apple.com>
Unreviewed. AppleWin VS2010 build fix.
......
......@@ -9,6 +9,7 @@ webcore_cppflags += \
-I$(srcdir)/Source/ThirdParty/ANGLE/include/GLSLANG \
-I$(srcdir)/Source/ThirdParty/ANGLE/include/KHR \
-I$(srcdir)/Source/WebCore \
-I$(srcdir)/Source/WebCore/Modules/battery \
-I$(srcdir)/Source/WebCore/Modules/filesystem \
-I$(srcdir)/Source/WebCore/Modules/gamepad \
-I$(srcdir)/Source/WebCore/Modules/geolocation \
......@@ -372,6 +373,7 @@ DerivedSources/ANGLE/glslang_tab.cpp: Source/ThirdParty/ANGLE/src/compiler/glsla
DerivedSources/ANGLE/glslang_tab.h: DerivedSources/ANGLE/glslang_tab.cpp
IDL_PATH := \
$(WebCore)/Modules/battery \
$(WebCore)/Modules/filesystem \
$(WebCore)/Modules/gamepad \
$(WebCore)/Modules/geolocation \
......@@ -601,6 +603,7 @@ libWebCoreGtk_la_CPPFLAGS = \
$(XT_CFLAGS)
EXTRA_DIST += \
$(wildcard $(srcdir)/Source/WebCore/Modules/battery/*.idl) \
$(wildcard $(srcdir)/Source/WebCore/Modules/filesystem/*.idl) \
$(wildcard $(srcdir)/Source/WebCore/Modules/gamepad/*.idl) \
$(wildcard $(srcdir)/Source/WebCore/Modules/geolocation/*.idl) \
......
......@@ -71,6 +71,8 @@ webcore_built_sources += \
DerivedSources/WebCore/JSAudioTrackList.h \
DerivedSources/WebCore/JSBarInfo.cpp \
DerivedSources/WebCore/JSBarInfo.h \
DerivedSources/WebCore/JSBatteryManager.cpp \
DerivedSources/WebCore/JSBatteryManager.h \
DerivedSources/WebCore/JSBeforeLoadEvent.cpp \
DerivedSources/WebCore/JSBeforeLoadEvent.h \
DerivedSources/WebCore/JSBiquadFilterNode.cpp \
......@@ -1214,6 +1216,8 @@ webcore_svg_built_sources += \
DerivedSources/WebCore/JSSVGZoomEvent.h
dom_binding_idls += \
$(WebCore)/Modules/battery/BatteryManager.idl \
$(WebCore)/Modules/battery/NavigatorBattery.idl \
$(WebCore)/Modules/filesystem/DOMFileSystem.idl \
$(WebCore)/Modules/filesystem/DOMFileSystemSync.idl \
$(WebCore)/Modules/filesystem/DOMWindowFileSystem.idl \
......@@ -1814,6 +1818,15 @@ dom_binding_idls += \
$(WebCore)/xml/XSLTProcessor.idl
webcore_modules_sources += \
Source/WebCore/Modules/battery/BatteryClient.h \
Source/WebCore/Modules/battery/BatteryController.cpp \
Source/WebCore/Modules/battery/BatteryController.h \
Source/WebCore/Modules/battery/BatteryManager.cpp \
Source/WebCore/Modules/battery/BatteryManager.h \
Source/WebCore/Modules/battery/BatteryStatus.cpp \
Source/WebCore/Modules/battery/BatteryStatus.h \
Source/WebCore/Modules/battery/NavigatorBattery.cpp \
Source/WebCore/Modules/battery/NavigatorBattery.h \
Source/WebCore/Modules/filesystem/AsyncFileWriter.h \
Source/WebCore/Modules/filesystem/AsyncFileWriterClient.h \
Source/WebCore/Modules/filesystem/DOMFilePath.cpp \
......
......@@ -3,6 +3,8 @@ webkitgtk_gdom_built_sources += \
DerivedSources/webkitdom/WebKitDOMAttrPrivate.h \
DerivedSources/webkitdom/WebKitDOMBarInfo.cpp \
DerivedSources/webkitdom/WebKitDOMBarInfoPrivate.h \
DerivedSources/webkitdom/WebKitDOMBatteryManager.cpp \
DerivedSources/webkitdom/WebKitDOMBatteryManagerPrivate.h \
DerivedSources/webkitdom/WebKitDOMBlob.cpp \
DerivedSources/webkitdom/WebKitDOMBlobPrivate.h \
DerivedSources/webkitdom/WebKitDOMCDATASection.cpp \
......@@ -283,6 +285,7 @@ webkitgtk_gdom_built_sources += \
DerivedSources/webkitdom/WebKitDOMXPathResultPrivate.h
webkitgtk_gdom_built_h_api += \
DerivedSources/webkitdom/WebKitDOMBatteryManager.h \
DerivedSources/webkitdom/WebKitDOMCSSRule.h \
DerivedSources/webkitdom/WebKitDOMCSSRuleList.h \
DerivedSources/webkitdom/WebKitDOMCSSStyleDeclaration.h \
......
......@@ -488,6 +488,13 @@ if test "$enable_gamepad" = "yes"; then
AC_SUBST(GAMEPAD_LIBS)
fi
if test "$enable_battery_status" = "yes"; then
PKG_CHECK_MODULES([UPOWER_GLIB], [upower-glib])
AC_SUBST(UPOWER_GLIB_CFLAGS)
AC_SUBST(UPOWER_GLIB_LIBS)
fi
# Check whether to enable code coverage support.
if test "$enable_coverage" = "yes"; then
COVERAGE_CFLAGS="-MD"
......
......@@ -17,6 +17,7 @@ Features:
WebKit2 support : $enable_webkit2
Accelerated Compositing : $enable_accelerated_compositing
Accelerated 2D canvas : $enable_accelerated_canvas
Battery API support : $enable_battery_status
Gamepad support : $enable_gamepad
Geolocation support : $enable_geolocation
HTML5 video element support : $enable_video
......
......@@ -124,6 +124,13 @@ AC_ARG_ENABLE(web_audio,
[enable_web_audio="no"])
AC_MSG_RESULT([$enable_web_audio])
AC_MSG_CHECKING([whether to enable Battery Status API support])
AC_ARG_ENABLE(battery_status,
AC_HELP_STRING([--enable-battery-status], [enable support for Battery Status API [default=no]]),
[],
[enable_battery_status="no"])
AC_MSG_RESULT([$enable_battery_status])
AC_MSG_CHECKING([whether to enable code coverage support])
AC_ARG_ENABLE(coverage,
AC_HELP_STRING([--enable-coverage], [enable code coverage support [default=no]]),
......
......@@ -83,12 +83,17 @@ else
CONFIGURABLE_FEATURE_DEFINES="$CONFIGURABLE_FEATURE_DEFINES ENABLE_WEB_AUDIO=0"
fi
if test "$enable_battery_status" = "yes"; then
CONFIGURABLE_FEATURE_DEFINES="$CONFIGURABLE_FEATURE_DEFINES ENABLE_BATTERY_STATUS=1"
else
CONFIGURABLE_FEATURE_DEFINES="$CONFIGURABLE_FEATURE_DEFINES ENABLE_BATTERY_STATUS=0"
fi
# This list of features represents those selected for release builds. If you are
# adding a new or unstable feature, you should mark it disabled here. We need to run
# this command now rather than use AC_CONFIG_COMMANDS because automake rules depend
# on the output file (WebKitFeatures.txt).
$srcdir/Tools/gtk/generate-feature-defines-files $CONFIGURABLE_FEATURE_DEFINES \
ENABLE_BATTERY_STATUS=0 \
ENABLE_BLOB=1 \
ENABLE_CANVAS_PATH=0 \
ENABLE_CANVAS_PROXY=0 \
......
......@@ -315,6 +315,9 @@ _ZTVN7WebCore14StaticNodeListE;
_ZN7WebCore6Editor26toggleOverwriteModeEnabledEv;
_ZNK7WebCore14FrameSelection6boundsEb;
_ZN7WebCore10ClientRectC1ERKNS_9FloatRectE;
_ZN7WebCore13BatteryStatus6createEbddd;
_ZN7WebCore17BatteryController14supplementNameEv;
_ZN7WebCore17BatteryController22didChangeBatteryStatusERKN3WTF12AtomicStringENS1_10PassRefPtrINS_13BatteryStatusEEE;
local:
_Z*;
......
2013-05-08 José Dapena Paz <jdapena@igalia.com> and Zan Dobersek <zdobersek@igalia.com>
[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.
* 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.
2013-05-08 Ryosuke Niwa <rniwa@webkit.org>
new-run-webkit-websocketserver doesn't work after Chromium removal
......
......@@ -1925,6 +1925,7 @@ sub buildAutotoolsProject($@)
# Configurable features listed here should be kept in sync with the
# features for which there exists a configuration option in configure.ac.
my %configurableFeatures = (
"battery-status" => 1,
"gamepad" => 1,
"geolocation" => 1,
"svg" => 1,
......
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