Changeset 194424 in webkit

Timestamp:

Dec 26, 2015 10:34:59 PM (8 years ago)

Author:

Gyuyoung Kim

Message:

[CMake] Rearrange new gamepad files with deprecated files
​https://bugs.webkit.org/show_bug.cgi?id=152564

Reviewed by Alex Christensen.

New gamepad files have been commented out in CMakeLists.txt so far. This patch
rearrange the files with deprecated files using ENABLE_GAMEPAD.

• CMakeLists.txt:

Location:

trunk/Source/WebCore

Files:

• CMakeLists.txt (modified) (6 diffs)
• ChangeLog (modified) (1 diff)

trunk/Source/WebCore/CMakeLists.txt

@@ -7 +7 @@
     "${WEBCORE_DIR}/Modules/battery"
     "${WEBCORE_DIR}/Modules/encryptedmedia"
-    "${WEBCORE_DIR}/Modules/gamepad"
-    "${WEBCORE_DIR}/Modules/gamepad/deprecated"
     "${WEBCORE_DIR}/Modules/geolocation"
     "${WEBCORE_DIR}/Modules/indexeddb"
@@ -140 +138 @@
     Modules/battery
     Modules/encryptedmedia
-    Modules/gamepad
     Modules/geolocation
     Modules/indexeddb
@@ -156 +153 @@
     Modules/websockets
 
-    Modules/gamepad/deprecated
-
     bindings/generic
     bindings/js
@@ -173 +168 @@
     Modules/battery/BatteryManager.idl
     Modules/battery/NavigatorBattery.idl
-
-# FIXME: These were causing name conflicts on Mac, and the Gamepad API is not finished yet.
-# https://bugs.webkit.org/show_bug.cgi?id=135858
-#   Modules/gamepad/Gamepad.idl
-#   Modules/gamepad/GamepadButton.idl
-#   Modules/gamepad/GamepadEvent.idl
-#   Modules/gamepad/NavigatorGamepad.idl
-
-    Modules/gamepad/deprecated/Gamepad.idl
-    Modules/gamepad/deprecated/GamepadList.idl
-    Modules/gamepad/deprecated/NavigatorGamepad.idl
 
     Modules/geolocation/Coordinates.idl
@@ -829 +813 @@
     Modules/battery/BatteryStatus.cpp
     Modules/battery/NavigatorBattery.cpp
-
-    Modules/gamepad/deprecated/Gamepad.cpp
-    Modules/gamepad/deprecated/GamepadList.cpp
-    Modules/gamepad/deprecated/NavigatorGamepad.cpp
 
     Modules/geolocation/Coordinates.cpp
@@ -3253 +3233 @@
 endif ()
 
+if (ENABLE_GAMEPAD)
+    list(APPEND WebCore_INCLUDE_DIRECTORIES
+        "${WEBCORE_DIR}/Modules/gamepad"
+    )
+
+    list(APPEND WebCore_IDL_INCLUDES
+        Modules/gamepad
+    )
+
+    list(APPEND WebCore_NON_SVG_IDL_FILES
+        Modules/gamepad/Gamepad.idl
+        Modules/gamepad/GamepadButton.idl
+        Modules/gamepad/GamepadEvent.idl
+        Modules/gamepad/NavigatorGamepad.idl
+    )
+elseif (ENABLE_GAMEPAD_DEPRECATED)
+    list(APPEND WebCore_INCLUDE_DIRECTORIES
+        "${WEBCORE_DIR}/Modules/gamepad/deprecated"
+    )
+
+    list(APPEND WebCore_IDL_INCLUDES
+        Modules/gamepad/deprecated
+    )
+
+    list(APPEND WebCore_NON_SVG_IDL_FILES
+        Modules/gamepad/deprecated/Gamepad.idl
+        Modules/gamepad/deprecated/GamepadList.idl
+        Modules/gamepad/deprecated/NavigatorGamepad.idl
+    )
+
+    list(APPEND WebCore_SOURCES
+        Modules/gamepad/deprecated/Gamepad.cpp
+        Modules/gamepad/deprecated/GamepadList.cpp
+        Modules/gamepad/deprecated/NavigatorGamepad.cpp
+    )
+endif ()
+
 if (ENABLE_WEB_REPLAY)
     list(APPEND WebCore_INCLUDE_DIRECTORIES

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-12-26  Gyuyoung Kim  <gyuyoung.kim@webkit.org>
+
+        [CMake] Rearrange new gamepad files with deprecated files
+        https://bugs.webkit.org/show_bug.cgi?id=152564
+
+        Reviewed by Alex Christensen.
+
+        New gamepad files have been commented out in CMakeLists.txt so far. This patch
+        rearrange the files with deprecated files using ENABLE_GAMEPAD.
+
+        * CMakeLists.txt:
+
 2015-12-26  Per Arne Vollan  <peavo@outlook.com>