Unreviewed, rolling out r183116.

https://bugs.webkit.org/show_bug.cgi?id=144060

Inadvertently deleted a file... (Requested by mcatanzaro on
#webkit).

Reverted changeset:

"[CMake] Use lowercase for local variables in macros"
https://bugs.webkit.org/show_bug.cgi?id=144059
http://trac.webkit.org/changeset/183116

Patch by Commit Queue <commit-queue@webkit.org> on 2015-04-22

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@183118 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index 1d81b83..2c2acc7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2015-04-22  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r183116.
+        https://bugs.webkit.org/show_bug.cgi?id=144060
+
+        Inadvertently deleted a file... (Requested by mcatanzaro on
+        #webkit).
+
+        Reverted changeset:
+
+        "[CMake] Use lowercase for local variables in macros"
+        https://bugs.webkit.org/show_bug.cgi?id=144059
+        http://trac.webkit.org/changeset/183116
+
 2015-04-22  Michael Catanzaro  <mcatanzaro@igalia.com>
 
         [CMake] Use lowercase for local variables in macros

diff --git a/Source/cmake/WebKitFeatures.cmake b/Source/cmake/WebKitFeatures.cmake
index 423852e..54fe327 100644 (file)
--- a/Source/cmake/WebKitFeatures.cmake
+++ b/Source/cmake/WebKitFeatures.cmake
@@ -168,9 +168,9 @@ macro(WEBKIT_OPTION_END)
     list(SORT _WEBKIT_AVAILABLE_OPTIONS)
     set(_MAX_FEATURE_LENGTH 0)
     foreach (_name ${_WEBKIT_AVAILABLE_OPTIONS})
-        string(LENGTH ${_name} _name_length)
-        if (_name_length GREATER _MAX_FEATURE_LENGTH)
-            set(_MAX_FEATURE_LENGTH ${_name_length})
+        string(LENGTH ${_name} _NAME_LENGTH)
+        if (_NAME_LENGTH GREATER _MAX_FEATURE_LENGTH)
+            set(_MAX_FEATURE_LENGTH ${_NAME_LENGTH})
         endif ()
 
         option(${_name} "${_WEBKIT_AVAILABLE_OPTIONS_DESCRIPTION_${_name}}" ${_WEBKIT_AVAILABLE_OPTIONS_INITIAL_VALUE_${_name}})
@@ -195,25 +195,25 @@ endmacro()
 macro(PRINT_WEBKIT_OPTIONS)
     message(STATUS "Enabled features:")
 
-    set(_should_print_dots ON)
+    set(_SHOULD_PRINT_DOTS ON)
     foreach (_name ${_WEBKIT_AVAILABLE_OPTIONS})
         if (${_WEBKIT_AVAILABLE_OPTIONS_IS_PUBLIC_${_name}})
-            string(LENGTH ${_name} _name_length)
-            set(_message " ${_name} ")
+            string(LENGTH ${_name} _NAME_LENGTH)
+            set(_MESSAGE " ${_name} ")
 
             # Print dots on every other row, for readability.
-            foreach (IGNORE RANGE ${_name_length} ${_MAX_FEATURE_LENGTH})
-                if (${_should_print_dots})
-                    set(_message "${_message}.")
+            foreach (IGNORE RANGE ${_NAME_LENGTH} ${_MAX_FEATURE_LENGTH})
+                if (${_SHOULD_PRINT_DOTS})
+                    set(_MESSAGE "${_MESSAGE}.")
                 else ()
-                    set(_message "${_message} ")
+                    set(_MESSAGE "${_MESSAGE} ")
                 endif ()
             endforeach ()
 
-            set(_should_print_dots (NOT ${_should_print_dots}))
+            set(_SHOULD_PRINT_DOTS (NOT ${_SHOULD_PRINT_DOTS}))
 
-            set(_message "${_message} ${${_name}}")
-            message(STATUS "${_message}")
+            set(_MESSAGE "${_MESSAGE} ${${_name}}")
+            message(STATUS "${_MESSAGE}")
         endif ()
     endforeach ()
 endmacro()

diff --git a/Source/cmakeconfig.h.cmake b/Source/cmakeconfig.h.cmake
new file mode 100644 (file)
index 0000000..877ef5c
--- /dev/null
+++ b/Source/cmakeconfig.h.cmake
@@ -0,0 +1,150 @@
+#ifndef CMAKECONFIG_H
+#define CMAKECONFIG_H
+
+#cmakedefine01 ENABLE_3D_RENDERING
+#cmakedefine01 ENABLE_ACCELERATED_2D_CANVAS
+#cmakedefine01 ENABLE_ACCELERATED_OVERFLOW_SCROLLING
+#cmakedefine01 ENABLE_ACCESSIBILITY
+#cmakedefine01 ENABLE_API_TESTS
+#cmakedefine01 ENABLE_ATTACHMENT_ELEMENT
+#cmakedefine01 ENABLE_AVF_CAPTIONS
+#cmakedefine01 ENABLE_ASSEMBLER_WX_EXCLUSIVE
+#cmakedefine01 ENABLE_BATTERY_STATUS
+#cmakedefine01 ENABLE_CACHE_PARTITIONING
+#cmakedefine01 ENABLE_CANVAS_PATH
+#cmakedefine01 ENABLE_CANVAS_PROXY
+#cmakedefine01 ENABLE_CHANNEL_MESSAGING
+#cmakedefine01 ENABLE_ES6_CLASS_SYNTAX
+#cmakedefine01 ENABLE_CONTENT_FILTERING
+#cmakedefine01 ENABLE_CONTEXT_MENUS
+#cmakedefine01 ENABLE_CREDENTIAL_STORAGE
+#cmakedefine01 ENABLE_CSP_NEXT
+#cmakedefine01 ENABLE_CSS3_TEXT
+#cmakedefine01 ENABLE_CSS3_TEXT_LINE_BREAK
+#cmakedefine01 ENABLE_CSS_BOX_DECORATION_BREAK
+#cmakedefine01 ENABLE_CSS_COMPOSITING
+#cmakedefine01 ENABLE_CSS_DEVICE_ADAPTATION
+#cmakedefine01 ENABLE_CSS_GRID_LAYOUT
+#cmakedefine01 ENABLE_CSS_IMAGE_ORIENTATION
+#cmakedefine01 ENABLE_CSS_IMAGE_RESOLUTION
+#cmakedefine01 ENABLE_CSS_IMAGE_SET
+#cmakedefine01 ENABLE_CSS_REGIONS
+#cmakedefine01 ENABLE_CSS_SCROLL_SNAP
+#cmakedefine01 ENABLE_CSS_SELECTORS_LEVEL4
+#cmakedefine01 ENABLE_CSS_SHAPES
+#cmakedefine01 ENABLE_CURSOR_VISIBILITY
+#cmakedefine01 ENABLE_CUSTOM_SCHEME_HANDLER
+#cmakedefine01 ENABLE_DASHBOARD_SUPPORT
+#cmakedefine01 ENABLE_DATACUE_VALUE
+#cmakedefine01 ENABLE_DATALIST_ELEMENT
+#cmakedefine01 ENABLE_DATA_TRANSFER_ITEMS
+#cmakedefine01 ENABLE_DETAILS_ELEMENT
+#cmakedefine01 ENABLE_DEVICE_ORIENTATION
+#cmakedefine01 ENABLE_DOM4_EVENTS_CONSTRUCTOR
+#cmakedefine01 ENABLE_DOWNLOAD_ATTRIBUTE
+#cmakedefine01 ENABLE_DRAG_SUPPORT
+#cmakedefine01 ENABLE_ENCRYPTED_MEDIA
+#cmakedefine01 ENABLE_ENCRYPTED_MEDIA_V2
+#cmakedefine01 ENABLE_FILTERS_LEVEL_2
+#cmakedefine01 ENABLE_FONT_LOAD_EVENTS
+#cmakedefine01 ENABLE_FTPDIR
+#cmakedefine01 ENABLE_FTL_JIT
+#cmakedefine01 ENABLE_FTL_NATIVE_CALL_INLINING
+#cmakedefine01 ENABLE_FULLSCREEN_API
+#cmakedefine01 ENABLE_GAMEPAD
+#cmakedefine01 ENABLE_GAMEPAD_DEPRECATED
+#cmakedefine01 ENABLE_GEOLOCATION
+#cmakedefine01 ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING
+#cmakedefine01 ENABLE_ICONDATABASE
+#cmakedefine01 ENABLE_IMAGE_DECODER_DOWN_SAMPLING
+#cmakedefine01 ENABLE_INDEXED_DATABASE
+#cmakedefine01 ENABLE_INDEXED_DATABASE_IN_WORKERS
+#cmakedefine01 ENABLE_INDIE_UI
+#cmakedefine01 ENABLE_INPUT_TYPE_COLOR
+#cmakedefine01 ENABLE_INPUT_TYPE_COLOR_POPOVER
+#cmakedefine01 ENABLE_INPUT_TYPE_DATE
+#cmakedefine01 ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE
+#cmakedefine01 ENABLE_INPUT_TYPE_DATETIMELOCAL
+#cmakedefine01 ENABLE_INPUT_TYPE_TIME
+#cmakedefine01 ENABLE_INPUT_TYPE_MONTH
+#cmakedefine01 ENABLE_INPUT_TYPE_WEEK
+#cmakedefine01 ENABLE_IOS_AIRPLAY
+#cmakedefine01 ENABLE_IOS_TEXT_AUTOSIZING
+#cmakedefine01 ENABLE_JIT
+#cmakedefine01 ENABLE_LEGACY_CSS_VENDOR_PREFIXES
+#cmakedefine01 ENABLE_LEGACY_NOTIFICATIONS
+#cmakedefine01 ENABLE_LEGACY_VENDOR_PREFIXES
+#cmakedefine01 ENABLE_LEGACY_WEB_AUDIO
+#cmakedefine01 ENABLE_LINK_PREFETCH
+#cmakedefine01 ENABLE_LLINT_C_LOOP
+#cmakedefine01 ENABLE_MAC_LONG_PRESS
+#cmakedefine01 ENABLE_MATHML
+#cmakedefine01 ENABLE_MEDIA_CAPTURE
+#cmakedefine01 ENABLE_MEDIA_CONTROLS_SCRIPT
+#cmakedefine01 ENABLE_MEDIA_SOURCE
+#cmakedefine01 ENABLE_MEDIA_STATISTICS
+#cmakedefine01 ENABLE_MEDIA_STREAM
+#cmakedefine01 ENABLE_MEMORY_SAMPLER
+#cmakedefine01 ENABLE_METER_ELEMENT
+#cmakedefine01 ENABLE_MHTML
+#cmakedefine01 ENABLE_MINIBROWSER
+#cmakedefine01 ENABLE_MOUSE_CURSOR_SCALE
+#cmakedefine01 ENABLE_NAVIGATOR_CONTENT_UTILS
+#cmakedefine01 ENABLE_NAVIGATOR_HWCONCURRENCY
+#cmakedefine01 ENABLE_NOSNIFF
+#cmakedefine01 ENABLE_NETSCAPE_PLUGIN_API
+#cmakedefine01 ENABLE_NETWORK_PROCESS
+#cmakedefine01 ENABLE_NOTIFICATIONS
+#cmakedefine01 ENABLE_ORIENTATION_EVENTS
+#cmakedefine01 ENABLE_PDFKIT_PLUGIN
+#cmakedefine01 ENABLE_PERFORMANCE_TIMELINE
+#cmakedefine01 ENABLE_PICTURE_SIZES
+#cmakedefine01 ENABLE_POINTER_LOCK
+#cmakedefine01 ENABLE_PROMISES
+#cmakedefine01 ENABLE_PROXIMITY_EVENTS
+#cmakedefine01 ENABLE_PUBLIC_SUFFIX_LIST
+#cmakedefine01 ENABLE_QUOTA
+#cmakedefine01 ENABLE_REMOTE_INSPECTOR
+#cmakedefine01 ENABLE_REQUEST_ANIMATION_FRAME
+#cmakedefine01 ENABLE_RESOLUTION_MEDIA_QUERY
+#cmakedefine01 ENABLE_RESOURCE_TIMING
+#cmakedefine01 ENABLE_SATURATED_LAYOUT_ARITHMETIC
+#cmakedefine01 ENABLE_SECCOMP_FILTERS
+#cmakedefine01 ENABLE_SERVICE_CONTROLS
+#cmakedefine01 ENABLE_SMOOTH_SCROLLING
+#cmakedefine01 ENABLE_SPELLCHECK
+#cmakedefine01 ENABLE_STREAMS_API
+#cmakedefine01 ENABLE_SUBTLE_CRYPTO
+#cmakedefine01 ENABLE_SVG_FONTS
+#cmakedefine01 ENABLE_TELEPHONE_NUMBER_DETECTION
+#cmakedefine01 ENABLE_TEMPLATE_ELEMENT
+#cmakedefine01 ENABLE_TEXT_AUTOSIZING
+#cmakedefine01 ENABLE_TOUCH_EVENTS
+#cmakedefine01 ENABLE_TOUCH_SLIDER
+#cmakedefine01 ENABLE_TOUCH_ICON_LOADING
+#cmakedefine01 ENABLE_USERSELECT_ALL
+#cmakedefine01 ENABLE_USER_MESSAGE_HANDLERS
+#cmakedefine01 ENABLE_USER_TIMING
+#cmakedefine01 ENABLE_VIBRATION
+#cmakedefine01 ENABLE_VIDEO
+#cmakedefine01 ENABLE_VIDEO_TRACK
+#cmakedefine01 ENABLE_VIEW_MODE_CSS_MEDIA
+#cmakedefine01 ENABLE_WEBGL
+#cmakedefine01 ENABLE_WEBVTT_REGIONS
+#cmakedefine01 ENABLE_WEB_AUDIO
+#cmakedefine01 ENABLE_WEB_REPLAY
+#cmakedefine01 ENABLE_WEB_SOCKETS
+#cmakedefine01 ENABLE_WEB_TIMING
+#cmakedefine01 ENABLE_XHR_TIMEOUT
+#cmakedefine01 ENABLE_XSLT
+#cmakedefine01 USE_SYSTEM_MALLOC
+#cmakedefine01 WTF_USE_GEOCLUE2
+#cmakedefine01 HAVE_LLVM
+#cmakedefine01 HAVE_GTK_UNIX_PRINTING
+#cmakedefine01 WTF_CPU_ARM64_CORTEXA53
+
+#if defined(BUILDING_GTK__) && !defined(GTK_API_VERSION_2)
+#define GDK_VERSION_MIN_REQUIRED @GDK_VERSION_MIN_REQUIRED@
+#endif
+
+#endif /* CMAKECONFIG_H */