Title: [107656] trunk/Tools
- Revision
- 107656
- Author
- [email protected]
- Date
- 2012-02-13 18:24:12 -0800 (Mon, 13 Feb 2012)
Log Message
Allow to configure ENABLE_FTPDIR in build-webkit
https://bugs.webkit.org/show_bug.cgi?id=65098
Patch by Loïc Yhuel <[email protected]> on 2012-02-13
Reviewed by Eric Seidel.
Allow to disable ENABLE_FTPDIR by command line.
Remove ENABLE_FTPDIR from --minimal build
* Scripts/build-webkit: Add entries for ENABLE_FTPDIR (enabled by default)
* qmake/mkspecs/features/features.prf: ENABLE_FTPDIR must be set to match Platform.h,
as, for Qt platform, build-webkit does not add on command line what it thinks to be default values
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (107655 => 107656)
--- trunk/Tools/ChangeLog 2012-02-14 02:21:35 UTC (rev 107655)
+++ trunk/Tools/ChangeLog 2012-02-14 02:24:12 UTC (rev 107656)
@@ -1,3 +1,17 @@
+2012-02-13 Loïc Yhuel <[email protected]>
+
+ Allow to configure ENABLE_FTPDIR in build-webkit
+ https://bugs.webkit.org/show_bug.cgi?id=65098
+
+ Reviewed by Eric Seidel.
+
+ Allow to disable ENABLE_FTPDIR by command line.
+ Remove ENABLE_FTPDIR from --minimal build
+
+ * Scripts/build-webkit: Add entries for ENABLE_FTPDIR (enabled by default)
+ * qmake/mkspecs/features/features.prf: ENABLE_FTPDIR must be set to match Platform.h,
+ as, for Qt platform, build-webkit does not add on command line what it thinks to be default values
+
2012-02-13 Shinya Kawanaka <[email protected]>
Add shinyak as committer.
Modified: trunk/Tools/Scripts/build-webkit (107655 => 107656)
--- trunk/Tools/Scripts/build-webkit 2012-02-14 02:21:35 UTC (rev 107655)
+++ trunk/Tools/Scripts/build-webkit 2012-02-14 02:24:12 UTC (rev 107656)
@@ -86,6 +86,7 @@
$downloadAttributeSupport,
$fileSystemSupport,
$filtersSupport,
+ $ftpDirSupport,
$fullscreenAPISupport,
$gamepadSupport,
$geolocationSupport,
@@ -202,6 +203,9 @@
{ option => "filters", desc => "Toggle SVG Filters support",
define => "ENABLE_FILTERS", default => (isAppleWebKit() || isGtk() || isQt() || isEfl() || isBlackBerry()), value => \$filtersSupport },
+ { option => "ftpdir", desc => "Toggle FTP directory support",
+ define => "ENABLE_FTPDIR", default => 1, value => \$ftpDirSupport },
+
{ option => "fullscreen-api", desc => "Toggle Fullscreen API support",
define => "ENABLE_FULLSCREEN_API", default => (isAppleMacWebKit() || isGtk()), value => \$fullscreenAPISupport },
Modified: trunk/Tools/qmake/mkspecs/features/features.prf (107655 => 107656)
--- trunk/Tools/qmake/mkspecs/features/features.prf 2012-02-14 02:21:35 UTC (rev 107655)
+++ trunk/Tools/qmake/mkspecs/features/features.prf 2012-02-14 02:24:12 UTC (rev 107656)
@@ -87,6 +87,10 @@
!contains(DEFINES, ENABLE_TOUCH_ICON_LOADING=.): DEFINES += ENABLE_TOUCH_ICON_LOADING=0
!contains(DEFINES, ENABLE_ANIMATION_API=.): DEFINES += ENABLE_ANIMATION_API=0
+# Enabled in Source/_javascript_Core/wtf/Platform.h if not set
+# We have to do the same to be able to disable the feature in build-webkit
+!contains(DEFINES, ENABLE_FTPDIR=.): DEFINES += ENABLE_FTPDIR=1
+
# SVG support
!contains(DEFINES, ENABLE_SVG=0) {
!contains(DEFINES, ENABLE_SVG=.): DEFINES += ENABLE_SVG=1
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
