Changeset 147967 in webkit


Ignore:
Timestamp:
Apr 8, 2013 5:31:54 PM (11 years ago)
Author:
Martin Robinson
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.

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/ChangeLog

    r147960 r147967  
     12013-03-31  Martin Robinson  <mrobinson@igalia.com>
     2
     3        Bug 110293 uses read -d which is a non-portable bashism
     4        https://bugs.webkit.org/show_bug.cgi?id=113349
     5
     6        Reviewed by Gustavo Noronha Silva.
     7
     8        * Source/autotools/SetupWebKitFeatures.m4: Pass the default feature set to the
     9        feature script in a more portable way.
     10
    1112013-04-08  Jeff Rogers  <jrogers@rim.com>
    212
  • trunk/Source/autotools/SetupWebKitFeatures.m4

    r147878 r147967  
    1010])
    1111
    12 # This list of features represents those selected for release builds.
    13 # If you are adding a new or unstable feature, you should mark it
    14 # disabled here.
    15 read -d '' DEFAULT_FEATURE_DEFINES <<"EOF"
    16         ENABLE_ACCELERATED_2D_CANVAS=0
    17         ENABLE_BATTERY_STATUS=0
    18         ENABLE_BLOB=1
    19         ENABLE_CANVAS_PATH=0
    20         ENABLE_CANVAS_PROXY=0
    21         ENABLE_CHANNEL_MESSAGING=1
    22         ENABLE_CSP_NEXT=0
    23         ENABLE_CSS3_TEXT=0
    24         ENABLE_CSS_BOX_DECORATION_BREAK=1
    25         ENABLE_CSS_COMPOSITING=0
    26         ENABLE_CSS_DEVICE_ADAPTATION=0
    27         ENABLE_CSS_EXCLUSIONS=1
    28         ENABLE_CSS_IMAGE_ORIENTATION=0
    29         ENABLE_CSS_IMAGE_RESOLUTION=0
    30         ENABLE_CSS_IMAGE_SET=0
    31         ENABLE_CSS_REGIONS=0
    32         ENABLE_CSS_STICKY_POSITION=0
    33         ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED=0
    34         ENABLE_CSS_VARIABLES=0
    35         ENABLE_CSS3_CONDITIONAL_RULES=0
    36         ENABLE_CUSTOM_SCHEME_HANDLER=0
    37         ENABLE_DASHBOARD_SUPPORT=0
    38         ENABLE_DATALIST_ELEMENT=0
    39         ENABLE_DATA_TRANSFER_ITEMS=0
    40         ENABLE_DETAILS_ELEMENT=1
    41         ENABLE_DEVICE_ORIENTATION=0
    42         ENABLE_DIALOG_ELEMENT=0
    43         ENABLE_DIRECTORY_UPLOAD=0
    44         ENABLE_DOM4_EVENTS_CONSTRUCTOR=0
    45         ENABLE_DOWNLOAD_ATTRIBUTE=0
    46         ENABLE_FILE_SYSTEM=0
    47         ENABLE_FILTERS=1
    48         ENABLE_FTPDIR=0
    49         ENABLE_FONT_LOAD_EVENTS=0
    50         ENABLE_FULLSCREEN_API=1
    51         ENABLE_HIGH_DPI_CANVAS=0
    52         ENABLE_ICONDATABASE=1
    53         ENABLE_IFRAME_SEAMLESS=1
    54         ENABLE_INDEXED_DATABASE=0
    55         ENABLE_INPUT_SPEECH=0
    56         ENABLE_INPUT_TYPE_COLOR=0
    57         ENABLE_INPUT_TYPE_DATE=0
    58         ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE=0
    59         ENABLE_INPUT_TYPE_DATETIMELOCAL=0
    60         ENABLE_INPUT_TYPE_MONTH=0
    61         ENABLE_INPUT_TYPE_TIME=0
    62         ENABLE_INPUT_TYPE_WEEK=0
    63         ENABLE_INSPECTOR=1
    64         ENABLE_JAVASCRIPT_DEBUGGER=1
    65         ENABLE_LEGACY_CSS_VENDOR_PREFIXES=0
    66         ENABLE_LEGACY_NOTIFICATIONS=0
    67         ENABLE_LEGACY_VENDOR_PREFIXES=1
    68         ENABLE_LEGACY_WEB_AUDIO=0
    69         ENABLE_LINK_PREFETCH=0
    70         ENABLE_LINK_PRERENDER=0
    71         ENABLE_MATHML=0
    72         ENABLE_MEDIA_CAPTURE=0
    73         ENABLE_MEDIA_SOURCE=0
    74         ENABLE_MEDIA_STATISTICS=0
    75         ENABLE_MEDIA_STREAM=0
    76         ENABLE_METER_ELEMENT=1
    77         ENABLE_MHTML=1
    78         ENABLE_MICRODATA=0
    79         ENABLE_MOUSE_CURSOR_SCALE=0
    80         ENABLE_NAVIGATOR_CONTENT_UTILS=0
    81         ENABLE_NETSCAPE_PLUGIN_API=1
    82         ENABLE_NETWORK_INFO=0
    83         ENABLE_NOTIFICATIONS=0
    84         ENABLE_ORIENTATION_EVENTS=0
    85         ENABLE_PAGE_VISIBILITY_API=0
    86         ENABLE_PERFORMANCE_TIMELINE=0
    87         ENABLE_PROGRESS_ELEMENT=1
    88         ENABLE_PROXIMITY_EVENTS=0
    89         ENABLE_QUOTA=0
    90         ENABLE_RESOURCE_TIMING=0
    91         ENABLE_REQUEST_ANIMATION_FRAME=1
    92         ENABLE_SCRIPTED_SPEECH=0
    93         ENABLE_SHADOW_DOM=1
    94         ENABLE_SHARED_WORKERS=1
    95         ENABLE_SMOOTH_SCROLLING=1
    96         ENABLE_SQL_DATABASE=1
    97         ENABLE_STYLE_SCOPED=0
    98         ENABLE_TEMPLATE_ELEMENT=0
    99         ENABLE_TEXT_AUTOSIZING=0
    100         ENABLE_THREADED_HTML_PARSER=0
    101         ENABLE_TOUCH_EVENTS=0
    102         ENABLE_TOUCH_ICON_LOADING=0
    103         ENABLE_USER_TIMING=0
    104         ENABLE_VIBRATION=0
    105         ENABLE_VIDEO_TRACK=0
    106         ENABLE_VIEW_MODE_CSS_MEDIA=1
    107         ENABLE_WEB_AUDIO=0
    108         ENABLE_WEB_SOCKETS=1
    109         ENABLE_WEB_TIMING=1
    110         ENABLE_WORKERS=1
    111         ENABLE_XHR_TIMEOUT=1
    112 EOF
     12CONFIGURABLE_FEATURE_DEFINES=
    11313
    11414if test "$enable_spellcheck" = "yes"; then
    115     DEFAULT_FEATURE_DEFINES="$DEFAULT_FEATURE_DEFINES ENABLE_SPELLCHECK=1"
    116 else
    117     DEFAULT_FEATURE_DEFINES="$DEFAULT_FEATURE_DEFINES ENABLE_SPELLCHECK=0"
     15    CONFIGURABLE_FEATURE_DEFINES="$CONFIGURABLE_FEATURE_DEFINES ENABLE_SPELLCHECK=1"
     16else
     17    CONFIGURABLE_FEATURE_DEFINES="$CONFIGURABLE_FEATURE_DEFINES ENABLE_SPELLCHECK=0"
    11818fi
    11919
    12020if test "$enable_gamepad" = "yes"; then
    121         DEFAULT_FEATURE_DEFINES="$DEFAULT_FEATURE_DEFINES ENABLE_GAMEPAD=1"
    122 else
    123         DEFAULT_FEATURE_DEFINES="$DEFAULT_FEATURE_DEFINES ENABLE_GAMEPAD=0"
     21    CONFIGURABLE_FEATURE_DEFINES="$CONFIGURABLE_FEATURE_DEFINES ENABLE_GAMEPAD=1"
     22else
     23    CONFIGURABLE_FEATURE_DEFINES="$CONFIGURABLE_FEATURE_DEFINES ENABLE_GAMEPAD=0"
    12424fi
    12525
    12626if test "$enable_video" = "yes"; then
    127     DEFAULT_FEATURE_DEFINES="$DEFAULT_FEATURE_DEFINES ENABLE_VIDEO=1"
    128 else
    129     DEFAULT_FEATURE_DEFINES="$DEFAULT_FEATURE_DEFINES ENABLE_VIDEO=0"
     27    CONFIGURABLE_FEATURE_DEFINES="$CONFIGURABLE_FEATURE_DEFINES ENABLE_VIDEO=1"
     28else
     29    CONFIGURABLE_FEATURE_DEFINES="$CONFIGURABLE_FEATURE_DEFINES ENABLE_VIDEO=0"
    13030fi
    13131
    13232if test "$enable_css_shaders" = "yes"; then
    133     DEFAULT_FEATURE_DEFINES="$DEFAULT_FEATURE_DEFINES ENABLE_CSS_SHADERS=1"
    134 else
    135     DEFAULT_FEATURE_DEFINES="$DEFAULT_FEATURE_DEFINES ENABLE_CSS_SHADERS=0"
     33    CONFIGURABLE_FEATURE_DEFINES="$CONFIGURABLE_FEATURE_DEFINES ENABLE_CSS_SHADERS=1"
     34else
     35    CONFIGURABLE_FEATURE_DEFINES="$CONFIGURABLE_FEATURE_DEFINES ENABLE_CSS_SHADERS=0"
    13636fi
    13737
    13838if test "$enable_css_filters" = "yes"; then
    139     DEFAULT_FEATURE_DEFINES="$DEFAULT_FEATURE_DEFINES ENABLE_CSS_FILTERS=1"
    140 else
    141     DEFAULT_FEATURE_DEFINES="$DEFAULT_FEATURE_DEFINES ENABLE_CSS_FILTERS=0"
     39    CONFIGURABLE_FEATURE_DEFINES="$CONFIGURABLE_FEATURE_DEFINES ENABLE_CSS_FILTERS=1"
     40else
     41    CONFIGURABLE_FEATURE_DEFINES="$CONFIGURABLE_FEATURE_DEFINES ENABLE_CSS_FILTERS=0"
    14242fi
    14343
    14444if test "$enable_geolocation" = "yes"; then
    145     DEFAULT_FEATURE_DEFINES="$DEFAULT_FEATURE_DEFINES ENABLE_GEOLOCATION=1"
    146 else
    147     DEFAULT_FEATURE_DEFINES="$DEFAULT_FEATURE_DEFINES ENABLE_GEOLOCATION=0"
     45    CONFIGURABLE_FEATURE_DEFINES="$CONFIGURABLE_FEATURE_DEFINES ENABLE_GEOLOCATION=1"
     46else
     47    CONFIGURABLE_FEATURE_DEFINES="$CONFIGURABLE_FEATURE_DEFINES ENABLE_GEOLOCATION=0"
    14848fi
    14949
    15050if test "$enable_svg" = "yes"; then
    151     DEFAULT_FEATURE_DEFINES="$DEFAULT_FEATURE_DEFINES ENABLE_SVG=1"
    152 else
    153     DEFAULT_FEATURE_DEFINES="$DEFAULT_FEATURE_DEFINES ENABLE_SVG=0"
     51    CONFIGURABLE_FEATURE_DEFINES="$CONFIGURABLE_FEATURE_DEFINES ENABLE_SVG=1"
     52else
     53    CONFIGURABLE_FEATURE_DEFINES="$CONFIGURABLE_FEATURE_DEFINES ENABLE_SVG=0"
    15454fi
    15555
    15656if test "$enable_svg_fonts" = "yes"; then
    157     DEFAULT_FEATURE_DEFINES="$DEFAULT_FEATURE_DEFINES ENABLE_SVG_FONTS=1"
    158 else
    159     DEFAULT_FEATURE_DEFINES="$DEFAULT_FEATURE_DEFINES ENABLE_SVG_FONTS=0"
     57    CONFIGURABLE_FEATURE_DEFINES="$CONFIGURABLE_FEATURE_DEFINES ENABLE_SVG_FONTS=1"
     58else
     59    CONFIGURABLE_FEATURE_DEFINES="$CONFIGURABLE_FEATURE_DEFINES ENABLE_SVG_FONTS=0"
    16060fi
    16161
    16262if test "$enable_webgl" = "yes"; then
    163     DEFAULT_FEATURE_DEFINES="$DEFAULT_FEATURE_DEFINES ENABLE_WEBGL=1"
    164 else
    165     DEFAULT_FEATURE_DEFINES="$DEFAULT_FEATURE_DEFINES ENABLE_WEBGL=0"
     63    CONFIGURABLE_FEATURE_DEFINES="$CONFIGURABLE_FEATURE_DEFINES ENABLE_WEBGL=1"
     64else
     65    CONFIGURABLE_FEATURE_DEFINES="$CONFIGURABLE_FEATURE_DEFINES ENABLE_WEBGL=0"
    16666fi
    16767
    16868if test "$enable_accelerated_compositing" = "yes"; then
    169     DEFAULT_FEATURE_DEFINES="$DEFAULT_FEATURE_DEFINES ENABLE_3D_RENDERING=1"
    170 else
    171     DEFAULT_FEATURE_DEFINES="$DEFAULT_FEATURE_DEFINES ENABLE_3D_RENDERING=0"
     69    CONFIGURABLE_FEATURE_DEFINES="$CONFIGURABLE_FEATURE_DEFINES ENABLE_3D_RENDERING=1"
     70else
     71    CONFIGURABLE_FEATURE_DEFINES="$CONFIGURABLE_FEATURE_DEFINES ENABLE_3D_RENDERING=0"
    17272fi
    17373
    17474if test "$enable_web_audio" = "yes"; then
    175     DEFAULT_FEATURE_DEFINES="$DEFAULT_FEATURE_DEFINES ENABLE_WEB_AUDIO=1"
    176 else
    177     DEFAULT_FEATURE_DEFINES="$DEFAULT_FEATURE_DEFINES ENABLE_WEB_AUDIO=0"
    178 fi
    179 
    180 # We need to run this command now rather than use AC_CONFIG_COMMANDS
    181 # because automake rules depend on the output file (WebKitFeatures.txt).
    182 $srcdir/Tools/gtk/generate-feature-defines-files $DEFAULT_FEATURE_DEFINES
     75    CONFIGURABLE_FEATURE_DEFINES="$CONFIGURABLE_FEATURE_DEFINES ENABLE_WEB_AUDIO=1"
     76else
     77    CONFIGURABLE_FEATURE_DEFINES="$CONFIGURABLE_FEATURE_DEFINES ENABLE_WEB_AUDIO=0"
     78fi
     79
     80# This list of features represents those selected for release builds.  If you are
     81# adding a new or unstable feature, you should mark it disabled here. We need to run
     82# this command now rather than use AC_CONFIG_COMMANDS because automake rules depend
     83# on the output file (WebKitFeatures.txt).
     84$srcdir/Tools/gtk/generate-feature-defines-files $CONFIGURABLE_FEATURE_DEFINES \
     85    ENABLE_ACCELERATED_2D_CANVAS=0 \
     86    ENABLE_BATTERY_STATUS=0 \
     87    ENABLE_BLOB=1 \
     88    ENABLE_CANVAS_PATH=0 \
     89    ENABLE_CANVAS_PROXY=0 \
     90    ENABLE_CHANNEL_MESSAGING=1 \
     91    ENABLE_CSP_NEXT=0 \
     92    ENABLE_CSS3_TEXT=0 \
     93    ENABLE_CSS_BOX_DECORATION_BREAK=1 \
     94    ENABLE_CSS_COMPOSITING=0 \
     95    ENABLE_CSS_DEVICE_ADAPTATION=0 \
     96    ENABLE_CSS_EXCLUSIONS=1 \
     97    ENABLE_CSS_IMAGE_ORIENTATION=0 \
     98    ENABLE_CSS_IMAGE_RESOLUTION=0 \
     99    ENABLE_CSS_IMAGE_SET=0 \
     100    ENABLE_CSS_REGIONS=0 \
     101    ENABLE_CSS_STICKY_POSITION=0 \
     102    ENABLE_CSS_TRANSFORMS_ANIMATIONS_UNPREFIXED=0 \
     103    ENABLE_CSS_VARIABLES=0 \
     104    ENABLE_CSS3_CONDITIONAL_RULES=0 \
     105    ENABLE_CUSTOM_SCHEME_HANDLER=0 \
     106    ENABLE_DASHBOARD_SUPPORT=0 \
     107    ENABLE_DATALIST_ELEMENT=0 \
     108    ENABLE_DATA_TRANSFER_ITEMS=0 \
     109    ENABLE_DETAILS_ELEMENT=1 \
     110    ENABLE_DEVICE_ORIENTATION=0 \
     111    ENABLE_DIALOG_ELEMENT=0 \
     112    ENABLE_DIRECTORY_UPLOAD=0 \
     113    ENABLE_DOM4_EVENTS_CONSTRUCTOR=0 \
     114    ENABLE_DOWNLOAD_ATTRIBUTE=0 \
     115    ENABLE_FILE_SYSTEM=0 \
     116    ENABLE_FILTERS=1 \
     117    ENABLE_FTPDIR=0 \
     118    ENABLE_FONT_LOAD_EVENTS=0 \
     119    ENABLE_FULLSCREEN_API=1 \
     120    ENABLE_HIGH_DPI_CANVAS=0 \
     121    ENABLE_ICONDATABASE=1 \
     122    ENABLE_IFRAME_SEAMLESS=1 \
     123    ENABLE_INDEXED_DATABASE=0 \
     124    ENABLE_INPUT_SPEECH=0 \
     125    ENABLE_INPUT_TYPE_COLOR=0 \
     126    ENABLE_INPUT_TYPE_DATE=0 \
     127    ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE=0 \
     128    ENABLE_INPUT_TYPE_DATETIMELOCAL=0 \
     129    ENABLE_INPUT_TYPE_MONTH=0 \
     130    ENABLE_INPUT_TYPE_TIME=0 \
     131    ENABLE_INPUT_TYPE_WEEK=0 \
     132    ENABLE_INSPECTOR=1 \
     133    ENABLE_JAVASCRIPT_DEBUGGER=1 \
     134    ENABLE_LEGACY_CSS_VENDOR_PREFIXES=0 \
     135    ENABLE_LEGACY_NOTIFICATIONS=0 \
     136    ENABLE_LEGACY_VENDOR_PREFIXES=1 \
     137    ENABLE_LEGACY_WEB_AUDIO=0 \
     138    ENABLE_LINK_PREFETCH=0 \
     139    ENABLE_LINK_PRERENDER=0 \
     140    ENABLE_MATHML=0 \
     141    ENABLE_MEDIA_CAPTURE=0 \
     142    ENABLE_MEDIA_SOURCE=0 \
     143    ENABLE_MEDIA_STATISTICS=0 \
     144    ENABLE_MEDIA_STREAM=0 \
     145    ENABLE_METER_ELEMENT=1 \
     146    ENABLE_MHTML=1 \
     147    ENABLE_MICRODATA=0 \
     148    ENABLE_MOUSE_CURSOR_SCALE=0 \
     149    ENABLE_NAVIGATOR_CONTENT_UTILS=0 \
     150    ENABLE_NETSCAPE_PLUGIN_API=1 \
     151    ENABLE_NETWORK_INFO=0 \
     152    ENABLE_NOTIFICATIONS=0 \
     153    ENABLE_ORIENTATION_EVENTS=0 \
     154    ENABLE_PAGE_VISIBILITY_API=0 \
     155    ENABLE_PERFORMANCE_TIMELINE=0 \
     156    ENABLE_PROGRESS_ELEMENT=1 \
     157    ENABLE_PROXIMITY_EVENTS=0 \
     158    ENABLE_QUOTA=0 \
     159    ENABLE_RESOURCE_TIMING=0 \
     160    ENABLE_REQUEST_ANIMATION_FRAME=1 \
     161    ENABLE_SCRIPTED_SPEECH=0 \
     162    ENABLE_SHADOW_DOM=1 \
     163    ENABLE_SHARED_WORKERS=1 \
     164    ENABLE_SMOOTH_SCROLLING=1 \
     165    ENABLE_SQL_DATABASE=1 \
     166    ENABLE_STYLE_SCOPED=0 \
     167    ENABLE_TEMPLATE_ELEMENT=0 \
     168    ENABLE_TEXT_AUTOSIZING=0 \
     169    ENABLE_THREADED_HTML_PARSER=0 \
     170    ENABLE_TOUCH_EVENTS=0 \
     171    ENABLE_TOUCH_ICON_LOADING=0 \
     172    ENABLE_USER_TIMING=0 \
     173    ENABLE_VIBRATION=0 \
     174    ENABLE_VIDEO_TRACK=0 \
     175    ENABLE_VIEW_MODE_CSS_MEDIA=1 \
     176    ENABLE_WEB_SOCKETS=1 \
     177    ENABLE_WEB_TIMING=1 \
     178    ENABLE_WORKERS=1 \
     179    ENABLE_XHR_TIMEOUT=1
    183180
    184181dnl AM_WEBKIT_FEATURE_CONDITIONAL
Note: See TracChangeset for help on using the changeset viewer.