Title: [147967] trunk
- Revision
- 147967
- Author
- mrobin...@webkit.org
- Date
- 2013-04-08 17:31:54 -0700 (Mon, 08 Apr 2013)
Log Message
Bug 110293 uses read -d which is a non-portable bashism
https://bugs.webkit.org/show_bug.cgi?id=113349
Reviewed by Gustavo Noronha Silva.
* Source/autotools/SetupWebKitFeatures.m4: Pass the default feature set to the
feature script in a more portable way.
Modified Paths
Diff
Modified: trunk/ChangeLog (147966 => 147967)
--- trunk/ChangeLog 2013-04-09 00:22:33 UTC (rev 147966)
+++ trunk/ChangeLog 2013-04-09 00:31:54 UTC (rev 147967)
@@ -1,3 +1,13 @@
+2013-03-31 Martin Robinson <mrobin...@igalia.com>
+
+ Bug 110293 uses read -d which is a non-portable bashism
+ https://bugs.webkit.org/show_bug.cgi?id=113349
+
+ Reviewed by Gustavo Noronha Silva.
+
+ * Source/autotools/SetupWebKitFeatures.m4: Pass the default feature set to the
+ feature script in a more portable way.
+
2013-04-08 Jeff Rogers <jrog...@rim.com>
[BlackBerry] Update BlackBerry _javascript_ API
Modified: trunk/Source/autotools/SetupWebKitFeatures.m4 (147966 => 147967)
--- trunk/Source/autotools/SetupWebKitFeatures.m4 2013-04-09 00:22:33 UTC (rev 147966)
+++ trunk/Source/autotools/SetupWebKitFeatures.m4 2013-04-09 00:31:54 UTC (rev 147967)
@@ -9,177 +9,174 @@
#endif // __AUTOTOOLSCONFIG_H__
])
-# 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.
-read -d '' DEFAULT_FEATURE_DEFINES <<"EOF"
- ENABLE_ACCELERATED_2D_CANVAS=0
- ENABLE_BATTERY_STATUS=0
- ENABLE_BLOB=1
- ENABLE_CANVAS_PATH=0
- ENABLE_CANVAS_PROXY=0
- ENABLE_CHANNEL_MESSAGING=1
- ENABLE_CSP_NEXT=0
- ENABLE_CSS3_TEXT=0
- ENABLE_CSS_BOX_DECORATION_BREAK=1
- ENABLE_CSS_COMPOSITING=0
- ENABLE_CSS_DEVICE_ADAPTATION=0
- ENABLE_CSS_EXCLUSIONS=1
- ENABLE_CSS_IMAGE_ORIENTATION=0
- ENABLE_CSS_IMAGE_RESOLUTION=0
- ENABLE_CSS_IMAGE_SET=0
- ENABLE_CSS_REGIONS=0
- ENABLE_CSS_STICKY_POSITION=0
- ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED=0
- ENABLE_CSS_VARIABLES=0
- ENABLE_CSS3_CONDITIONAL_RULES=0
- ENABLE_CUSTOM_SCHEME_HANDLER=0
- ENABLE_DASHBOARD_SUPPORT=0
- ENABLE_DATALIST_ELEMENT=0
- ENABLE_DATA_TRANSFER_ITEMS=0
- ENABLE_DETAILS_ELEMENT=1
- ENABLE_DEVICE_ORIENTATION=0
- ENABLE_DIALOG_ELEMENT=0
- ENABLE_DIRECTORY_UPLOAD=0
- ENABLE_DOM4_EVENTS_CONSTRUCTOR=0
- ENABLE_DOWNLOAD_ATTRIBUTE=0
- ENABLE_FILE_SYSTEM=0
- ENABLE_FILTERS=1
- ENABLE_FTPDIR=0
- ENABLE_FONT_LOAD_EVENTS=0
- ENABLE_FULLSCREEN_API=1
- ENABLE_HIGH_DPI_CANVAS=0
- ENABLE_ICONDATABASE=1
- ENABLE_IFRAME_SEAMLESS=1
- ENABLE_INDEXED_DATABASE=0
- ENABLE_INPUT_SPEECH=0
- ENABLE_INPUT_TYPE_COLOR=0
- ENABLE_INPUT_TYPE_DATE=0
- ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE=0
- ENABLE_INPUT_TYPE_DATETIMELOCAL=0
- ENABLE_INPUT_TYPE_MONTH=0
- ENABLE_INPUT_TYPE_TIME=0
- ENABLE_INPUT_TYPE_WEEK=0
- ENABLE_INSPECTOR=1
- ENABLE_JAVASCRIPT_DEBUGGER=1
- ENABLE_LEGACY_CSS_VENDOR_PREFIXES=0
- ENABLE_LEGACY_NOTIFICATIONS=0
- ENABLE_LEGACY_VENDOR_PREFIXES=1
- ENABLE_LEGACY_WEB_AUDIO=0
- ENABLE_LINK_PREFETCH=0
- ENABLE_LINK_PRERENDER=0
- ENABLE_MATHML=0
- ENABLE_MEDIA_CAPTURE=0
- ENABLE_MEDIA_SOURCE=0
- ENABLE_MEDIA_STATISTICS=0
- ENABLE_MEDIA_STREAM=0
- ENABLE_METER_ELEMENT=1
- ENABLE_MHTML=1
- ENABLE_MICRODATA=0
- ENABLE_MOUSE_CURSOR_SCALE=0
- ENABLE_NAVIGATOR_CONTENT_UTILS=0
- ENABLE_NETSCAPE_PLUGIN_API=1
- ENABLE_NETWORK_INFO=0
- ENABLE_NOTIFICATIONS=0
- ENABLE_ORIENTATION_EVENTS=0
- ENABLE_PAGE_VISIBILITY_API=0
- ENABLE_PERFORMANCE_TIMELINE=0
- ENABLE_PROGRESS_ELEMENT=1
- ENABLE_PROXIMITY_EVENTS=0
- ENABLE_QUOTA=0
- ENABLE_RESOURCE_TIMING=0
- ENABLE_REQUEST_ANIMATION_FRAME=1
- ENABLE_SCRIPTED_SPEECH=0
- ENABLE_SHADOW_DOM=1
- ENABLE_SHARED_WORKERS=1
- ENABLE_SMOOTH_SCROLLING=1
- ENABLE_SQL_DATABASE=1
- ENABLE_STYLE_SCOPED=0
- ENABLE_TEMPLATE_ELEMENT=0
- ENABLE_TEXT_AUTOSIZING=0
- ENABLE_THREADED_HTML_PARSER=0
- ENABLE_TOUCH_EVENTS=0
- ENABLE_TOUCH_ICON_LOADING=0
- ENABLE_USER_TIMING=0
- ENABLE_VIBRATION=0
- ENABLE_VIDEO_TRACK=0
- ENABLE_VIEW_MODE_CSS_MEDIA=1
- ENABLE_WEB_AUDIO=0
- ENABLE_WEB_SOCKETS=1
- ENABLE_WEB_TIMING=1
- ENABLE_WORKERS=1
- ENABLE_XHR_TIMEOUT=1
-EOF
+CONFIGURABLE_FEATURE_DEFINES=
if test "$enable_spellcheck" = "yes"; then
- DEFAULT_FEATURE_DEFINES="$DEFAULT_FEATURE_DEFINES ENABLE_SPELLCHECK=1"
+ CONFIGURABLE_FEATURE_DEFINES="$CONFIGURABLE_FEATURE_DEFINES ENABLE_SPELLCHECK=1"
else
- DEFAULT_FEATURE_DEFINES="$DEFAULT_FEATURE_DEFINES ENABLE_SPELLCHECK=0"
+ CONFIGURABLE_FEATURE_DEFINES="$CONFIGURABLE_FEATURE_DEFINES ENABLE_SPELLCHECK=0"
fi
if test "$enable_gamepad" = "yes"; then
- DEFAULT_FEATURE_DEFINES="$DEFAULT_FEATURE_DEFINES ENABLE_GAMEPAD=1"
+ CONFIGURABLE_FEATURE_DEFINES="$CONFIGURABLE_FEATURE_DEFINES ENABLE_GAMEPAD=1"
else
- DEFAULT_FEATURE_DEFINES="$DEFAULT_FEATURE_DEFINES ENABLE_GAMEPAD=0"
+ CONFIGURABLE_FEATURE_DEFINES="$CONFIGURABLE_FEATURE_DEFINES ENABLE_GAMEPAD=0"
fi
if test "$enable_video" = "yes"; then
- DEFAULT_FEATURE_DEFINES="$DEFAULT_FEATURE_DEFINES ENABLE_VIDEO=1"
+ CONFIGURABLE_FEATURE_DEFINES="$CONFIGURABLE_FEATURE_DEFINES ENABLE_VIDEO=1"
else
- DEFAULT_FEATURE_DEFINES="$DEFAULT_FEATURE_DEFINES ENABLE_VIDEO=0"
+ CONFIGURABLE_FEATURE_DEFINES="$CONFIGURABLE_FEATURE_DEFINES ENABLE_VIDEO=0"
fi
if test "$enable_css_shaders" = "yes"; then
- DEFAULT_FEATURE_DEFINES="$DEFAULT_FEATURE_DEFINES ENABLE_CSS_SHADERS=1"
+ CONFIGURABLE_FEATURE_DEFINES="$CONFIGURABLE_FEATURE_DEFINES ENABLE_CSS_SHADERS=1"
else
- DEFAULT_FEATURE_DEFINES="$DEFAULT_FEATURE_DEFINES ENABLE_CSS_SHADERS=0"
+ CONFIGURABLE_FEATURE_DEFINES="$CONFIGURABLE_FEATURE_DEFINES ENABLE_CSS_SHADERS=0"
fi
if test "$enable_css_filters" = "yes"; then
- DEFAULT_FEATURE_DEFINES="$DEFAULT_FEATURE_DEFINES ENABLE_CSS_FILTERS=1"
+ CONFIGURABLE_FEATURE_DEFINES="$CONFIGURABLE_FEATURE_DEFINES ENABLE_CSS_FILTERS=1"
else
- DEFAULT_FEATURE_DEFINES="$DEFAULT_FEATURE_DEFINES ENABLE_CSS_FILTERS=0"
+ CONFIGURABLE_FEATURE_DEFINES="$CONFIGURABLE_FEATURE_DEFINES ENABLE_CSS_FILTERS=0"
fi
if test "$enable_geolocation" = "yes"; then
- DEFAULT_FEATURE_DEFINES="$DEFAULT_FEATURE_DEFINES ENABLE_GEOLOCATION=1"
+ CONFIGURABLE_FEATURE_DEFINES="$CONFIGURABLE_FEATURE_DEFINES ENABLE_GEOLOCATION=1"
else
- DEFAULT_FEATURE_DEFINES="$DEFAULT_FEATURE_DEFINES ENABLE_GEOLOCATION=0"
+ CONFIGURABLE_FEATURE_DEFINES="$CONFIGURABLE_FEATURE_DEFINES ENABLE_GEOLOCATION=0"
fi
if test "$enable_svg" = "yes"; then
- DEFAULT_FEATURE_DEFINES="$DEFAULT_FEATURE_DEFINES ENABLE_SVG=1"
+ CONFIGURABLE_FEATURE_DEFINES="$CONFIGURABLE_FEATURE_DEFINES ENABLE_SVG=1"
else
- DEFAULT_FEATURE_DEFINES="$DEFAULT_FEATURE_DEFINES ENABLE_SVG=0"
+ CONFIGURABLE_FEATURE_DEFINES="$CONFIGURABLE_FEATURE_DEFINES ENABLE_SVG=0"
fi
if test "$enable_svg_fonts" = "yes"; then
- DEFAULT_FEATURE_DEFINES="$DEFAULT_FEATURE_DEFINES ENABLE_SVG_FONTS=1"
+ CONFIGURABLE_FEATURE_DEFINES="$CONFIGURABLE_FEATURE_DEFINES ENABLE_SVG_FONTS=1"
else
- DEFAULT_FEATURE_DEFINES="$DEFAULT_FEATURE_DEFINES ENABLE_SVG_FONTS=0"
+ CONFIGURABLE_FEATURE_DEFINES="$CONFIGURABLE_FEATURE_DEFINES ENABLE_SVG_FONTS=0"
fi
if test "$enable_webgl" = "yes"; then
- DEFAULT_FEATURE_DEFINES="$DEFAULT_FEATURE_DEFINES ENABLE_WEBGL=1"
+ CONFIGURABLE_FEATURE_DEFINES="$CONFIGURABLE_FEATURE_DEFINES ENABLE_WEBGL=1"
else
- DEFAULT_FEATURE_DEFINES="$DEFAULT_FEATURE_DEFINES ENABLE_WEBGL=0"
+ CONFIGURABLE_FEATURE_DEFINES="$CONFIGURABLE_FEATURE_DEFINES ENABLE_WEBGL=0"
fi
if test "$enable_accelerated_compositing" = "yes"; then
- DEFAULT_FEATURE_DEFINES="$DEFAULT_FEATURE_DEFINES ENABLE_3D_RENDERING=1"
+ CONFIGURABLE_FEATURE_DEFINES="$CONFIGURABLE_FEATURE_DEFINES ENABLE_3D_RENDERING=1"
else
- DEFAULT_FEATURE_DEFINES="$DEFAULT_FEATURE_DEFINES ENABLE_3D_RENDERING=0"
+ CONFIGURABLE_FEATURE_DEFINES="$CONFIGURABLE_FEATURE_DEFINES ENABLE_3D_RENDERING=0"
fi
if test "$enable_web_audio" = "yes"; then
- DEFAULT_FEATURE_DEFINES="$DEFAULT_FEATURE_DEFINES ENABLE_WEB_AUDIO=1"
+ CONFIGURABLE_FEATURE_DEFINES="$CONFIGURABLE_FEATURE_DEFINES ENABLE_WEB_AUDIO=1"
else
- DEFAULT_FEATURE_DEFINES="$DEFAULT_FEATURE_DEFINES ENABLE_WEB_AUDIO=0"
+ CONFIGURABLE_FEATURE_DEFINES="$CONFIGURABLE_FEATURE_DEFINES ENABLE_WEB_AUDIO=0"
fi
-# 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 $DEFAULT_FEATURE_DEFINES
+# 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_ACCELERATED_2D_CANVAS=0 \
+ ENABLE_BATTERY_STATUS=0 \
+ ENABLE_BLOB=1 \
+ ENABLE_CANVAS_PATH=0 \
+ ENABLE_CANVAS_PROXY=0 \
+ ENABLE_CHANNEL_MESSAGING=1 \
+ ENABLE_CSP_NEXT=0 \
+ ENABLE_CSS3_TEXT=0 \
+ ENABLE_CSS_BOX_DECORATION_BREAK=1 \
+ ENABLE_CSS_COMPOSITING=0 \
+ ENABLE_CSS_DEVICE_ADAPTATION=0 \
+ ENABLE_CSS_EXCLUSIONS=1 \
+ ENABLE_CSS_IMAGE_ORIENTATION=0 \
+ ENABLE_CSS_IMAGE_RESOLUTION=0 \
+ ENABLE_CSS_IMAGE_SET=0 \
+ ENABLE_CSS_REGIONS=0 \
+ ENABLE_CSS_STICKY_POSITION=0 \
+ ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED=0 \
+ ENABLE_CSS_VARIABLES=0 \
+ ENABLE_CSS3_CONDITIONAL_RULES=0 \
+ ENABLE_CUSTOM_SCHEME_HANDLER=0 \
+ ENABLE_DASHBOARD_SUPPORT=0 \
+ ENABLE_DATALIST_ELEMENT=0 \
+ ENABLE_DATA_TRANSFER_ITEMS=0 \
+ ENABLE_DETAILS_ELEMENT=1 \
+ ENABLE_DEVICE_ORIENTATION=0 \
+ ENABLE_DIALOG_ELEMENT=0 \
+ ENABLE_DIRECTORY_UPLOAD=0 \
+ ENABLE_DOM4_EVENTS_CONSTRUCTOR=0 \
+ ENABLE_DOWNLOAD_ATTRIBUTE=0 \
+ ENABLE_FILE_SYSTEM=0 \
+ ENABLE_FILTERS=1 \
+ ENABLE_FTPDIR=0 \
+ ENABLE_FONT_LOAD_EVENTS=0 \
+ ENABLE_FULLSCREEN_API=1 \
+ ENABLE_HIGH_DPI_CANVAS=0 \
+ ENABLE_ICONDATABASE=1 \
+ ENABLE_IFRAME_SEAMLESS=1 \
+ ENABLE_INDEXED_DATABASE=0 \
+ ENABLE_INPUT_SPEECH=0 \
+ ENABLE_INPUT_TYPE_COLOR=0 \
+ ENABLE_INPUT_TYPE_DATE=0 \
+ ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE=0 \
+ ENABLE_INPUT_TYPE_DATETIMELOCAL=0 \
+ ENABLE_INPUT_TYPE_MONTH=0 \
+ ENABLE_INPUT_TYPE_TIME=0 \
+ ENABLE_INPUT_TYPE_WEEK=0 \
+ ENABLE_INSPECTOR=1 \
+ ENABLE_JAVASCRIPT_DEBUGGER=1 \
+ ENABLE_LEGACY_CSS_VENDOR_PREFIXES=0 \
+ ENABLE_LEGACY_NOTIFICATIONS=0 \
+ ENABLE_LEGACY_VENDOR_PREFIXES=1 \
+ ENABLE_LEGACY_WEB_AUDIO=0 \
+ ENABLE_LINK_PREFETCH=0 \
+ ENABLE_LINK_PRERENDER=0 \
+ ENABLE_MATHML=0 \
+ ENABLE_MEDIA_CAPTURE=0 \
+ ENABLE_MEDIA_SOURCE=0 \
+ ENABLE_MEDIA_STATISTICS=0 \
+ ENABLE_MEDIA_STREAM=0 \
+ ENABLE_METER_ELEMENT=1 \
+ ENABLE_MHTML=1 \
+ ENABLE_MICRODATA=0 \
+ ENABLE_MOUSE_CURSOR_SCALE=0 \
+ ENABLE_NAVIGATOR_CONTENT_UTILS=0 \
+ ENABLE_NETSCAPE_PLUGIN_API=1 \
+ ENABLE_NETWORK_INFO=0 \
+ ENABLE_NOTIFICATIONS=0 \
+ ENABLE_ORIENTATION_EVENTS=0 \
+ ENABLE_PAGE_VISIBILITY_API=0 \
+ ENABLE_PERFORMANCE_TIMELINE=0 \
+ ENABLE_PROGRESS_ELEMENT=1 \
+ ENABLE_PROXIMITY_EVENTS=0 \
+ ENABLE_QUOTA=0 \
+ ENABLE_RESOURCE_TIMING=0 \
+ ENABLE_REQUEST_ANIMATION_FRAME=1 \
+ ENABLE_SCRIPTED_SPEECH=0 \
+ ENABLE_SHADOW_DOM=1 \
+ ENABLE_SHARED_WORKERS=1 \
+ ENABLE_SMOOTH_SCROLLING=1 \
+ ENABLE_SQL_DATABASE=1 \
+ ENABLE_STYLE_SCOPED=0 \
+ ENABLE_TEMPLATE_ELEMENT=0 \
+ ENABLE_TEXT_AUTOSIZING=0 \
+ ENABLE_THREADED_HTML_PARSER=0 \
+ ENABLE_TOUCH_EVENTS=0 \
+ ENABLE_TOUCH_ICON_LOADING=0 \
+ ENABLE_USER_TIMING=0 \
+ ENABLE_VIBRATION=0 \
+ ENABLE_VIDEO_TRACK=0 \
+ ENABLE_VIEW_MODE_CSS_MEDIA=1 \
+ ENABLE_WEB_SOCKETS=1 \
+ ENABLE_WEB_TIMING=1 \
+ ENABLE_WORKERS=1 \
+ ENABLE_XHR_TIMEOUT=1
dnl AM_WEBKIT_FEATURE_CONDITIONAL
dnl Checks whether the given feature is enabled in the
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
