Progress towards CMake on Mac.
authorachristensen@apple.com <achristensen@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 13 Aug 2014 22:53:12 +0000 (22:53 +0000)
committerachristensen@apple.com <achristensen@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 13 Aug 2014 22:53:12 +0000 (22:53 +0000)
https://bugs.webkit.org/show_bug.cgi?id=135819

Reviewed by Laszlo Gombos.

.:

* Source/cmake/OptionsMac.cmake:
Disable some more features temporarily to get CMake working.
* Source/cmake/WebKitMacros.cmake:
Added an extension parameter to GENERATE_BINDINGS to allow ObjC bindings to generate .mm files.

Source/JavaScriptCore:

* CMakeLists.txt:
Add the remote inspector headers to the forwarding headers list.

Source/WebCore:

* CMakeLists.txt:
Include derived sources directory, which is needed by Apple ports.
Separated svg and non-svg idls for ObjC bindings.
Don't build the new gamepad API right now.  It's causing naming conflicts and it's not done.
Process CSSUnknownRule.idl.
* PlatformGTK.cmake:
Added cpp as the extension of the generated bindings.
* PlatformMac.cmake:
Include more directories and sources.
Add forwarding headers.
Generate ObjC bindings.
* bindings/objc/DOMUIKitExtensions.mm:
Moved config.h to recognize the PLATFORM macro.
* bindings/scripts/CodeGeneratorObjC.pm:
(ReadPublicInterfaces):
(GenerateInterface):
Added some workarounds for CMake.
* bindings/scripts/IDLAttributes.txt:
Added missing attribute names.
* platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
Added PLATFORM(IOS) to protect IOS_AIRPLAY code.
* platform/mac/PasteboardMac.mm:
Added necessary DRAG_SUPPORT protection.
* platform/text/mac/TextCodecMac.cpp:
Moved config.h to recognize the PLATFORM macro.

Tools:

* WebKitTestRunner/CMakeLists.txt:
Added new cpp parameter for the extension of the generated files.

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

17 files changed:
ChangeLog
Source/JavaScriptCore/CMakeLists.txt
Source/JavaScriptCore/ChangeLog
Source/WebCore/CMakeLists.txt
Source/WebCore/ChangeLog
Source/WebCore/PlatformGTK.cmake
Source/WebCore/PlatformMac.cmake
Source/WebCore/bindings/objc/DOMUIKitExtensions.mm
Source/WebCore/bindings/scripts/CodeGeneratorObjC.pm
Source/WebCore/bindings/scripts/IDLAttributes.txt
Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm
Source/WebCore/platform/mac/PasteboardMac.mm
Source/WebCore/platform/text/mac/TextCodecMac.cpp
Source/cmake/OptionsMac.cmake
Source/cmake/WebKitMacros.cmake
Tools/ChangeLog
Tools/WebKitTestRunner/CMakeLists.txt

index f49a822..311f0ee 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2014-08-13  Alex Christensen  <achristensen@webkit.org>
+
+        Progress towards CMake on Mac.
+        https://bugs.webkit.org/show_bug.cgi?id=135819
+
+        Reviewed by Laszlo Gombos.
+
+        * Source/cmake/OptionsMac.cmake:
+        Disable some more features temporarily to get CMake working.
+        * Source/cmake/WebKitMacros.cmake:
+        Added an extension parameter to GENERATE_BINDINGS to allow ObjC bindings to generate .mm files.
+
 2014-08-12  Eduardo Lima Mitev  <elima@igalia.com>
 
         [GTK] Subtle-crypto feature off by default and add a new configure flag to enable it
index ec0c8bb..0f85fa8 100644 (file)
@@ -804,6 +804,7 @@ set(JavaScriptCore_FORWARDING_HEADERS_DIRECTORIES
     heap
     inspector
     inspector/agents
+    inspector/remote
     interpreter
     jit
     llint
@@ -864,7 +865,15 @@ set(JavaScriptCore_FORWARDING_HEADERS_FILES
     assembler/MacroAssembler.h
     assembler/MacroAssemblerCodeRef.h
     assembler/MacroAssemblerCodeRef.h
+
+    inspector/remote/RemoteInspector.h
+    inspector/remote/RemoteInspectorConstants.h
+    inspector/remote/RemoteInspectorDebuggable.h
+    inspector/remote/RemoteInspectorDebuggableConnection.h
+    inspector/remote/RemoteInspectorXPCConnection.h
+
     jit/GPRInfo.h
+
     runtime/VM.h
 
     ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/JSCBuiltins.h
index 253231c..ed3ff54 100644 (file)
@@ -1,3 +1,13 @@
+2014-08-13  Alex Christensen  <achristensen@webkit.org>
+
+        Progress towards CMake on Mac.
+        https://bugs.webkit.org/show_bug.cgi?id=135819
+
+        Reviewed by Laszlo Gombos.
+
+        * CMakeLists.txt:
+        Add the remote inspector headers to the forwarding headers list.
+
 2014-08-13  Daniel Bates  <dabates@apple.com>
 
         [iOS] Make JavaScriptCore and bmalloc build with the public SDK
index d30b701..f56f0ed 100644 (file)
@@ -167,16 +167,18 @@ set(WebCore_IDL_INCLUDES
     xml
 )
 
-set(WebCore_IDL_FILES
+set(WebCore_NON_SVG_IDL_FILES
     Modules/airplay/WebKitPlaybackTargetAvailabilityEvent.idl
 
     Modules/battery/BatteryManager.idl
     Modules/battery/NavigatorBattery.idl
 
-    Modules/gamepad/Gamepad.idl
-    Modules/gamepad/GamepadButton.idl
-    Modules/gamepad/GamepadEvent.idl
-    Modules/gamepad/NavigatorGamepad.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
@@ -335,6 +337,7 @@ set(WebCore_IDL_FILES
     css/CSSStyleRule.idl
     css/CSSStyleSheet.idl
     css/CSSSupportsRule.idl
+    css/CSSUnknownRule.idl
     css/CSSValue.idl
     css/CSSValueList.idl
     css/Counter.idl
@@ -603,6 +606,29 @@ set(WebCore_IDL_FILES
     storage/Storage.idl
     storage/StorageEvent.idl
 
+    workers/AbstractWorker.idl
+    workers/DedicatedWorkerGlobalScope.idl
+    workers/SharedWorker.idl
+    workers/SharedWorkerGlobalScope.idl
+    workers/Worker.idl
+    workers/WorkerGlobalScope.idl
+    workers/WorkerLocation.idl
+
+    xml/DOMParser.idl
+    xml/XMLHttpRequest.idl
+    xml/XMLHttpRequestException.idl
+    xml/XMLHttpRequestProgressEvent.idl
+    xml/XMLHttpRequestUpload.idl
+    xml/XMLSerializer.idl
+    xml/XPathEvaluator.idl
+    xml/XPathException.idl
+    xml/XPathExpression.idl
+    xml/XPathNSResolver.idl
+    xml/XPathResult.idl
+    xml/XSLTProcessor.idl
+)
+
+set(WebCore_SVG_IDL_FILES
     svg/SVGAElement.idl
     svg/SVGAltGlyphDefElement.idl
     svg/SVGAltGlyphElement.idl
@@ -752,27 +778,11 @@ set(WebCore_IDL_FILES
     svg/SVGViewSpec.idl
     svg/SVGZoomAndPan.idl
     svg/SVGZoomEvent.idl
+)
 
-    workers/AbstractWorker.idl
-    workers/DedicatedWorkerGlobalScope.idl
-    workers/SharedWorker.idl
-    workers/SharedWorkerGlobalScope.idl
-    workers/Worker.idl
-    workers/WorkerGlobalScope.idl
-    workers/WorkerLocation.idl
-
-    xml/DOMParser.idl
-    xml/XMLHttpRequest.idl
-    xml/XMLHttpRequestException.idl
-    xml/XMLHttpRequestProgressEvent.idl
-    xml/XMLHttpRequestUpload.idl
-    xml/XMLSerializer.idl
-    xml/XPathEvaluator.idl
-    xml/XPathException.idl
-    xml/XPathExpression.idl
-    xml/XPathNSResolver.idl
-    xml/XPathResult.idl
-    xml/XSLTProcessor.idl
+set(WebCore_IDL_FILES
+    ${WebCore_NON_SVG_IDL_FILES}
+    ${WebCore_SVG_IDL_FILES}
 )
 
 set(WebCore_INSPECTOR_SCRIPTS_DIR "${JAVASCRIPTCORE_DIR}/inspector/scripts")
@@ -3473,7 +3483,7 @@ GENERATE_BINDINGS(WebCore_SOURCES
     "${WEBCORE_DIR}"
     "${IDL_INCLUDES}"
     "${FEATURE_DEFINES_JAVASCRIPT}"
-    ${DERIVED_SOURCES_WEBCORE_DIR} JS JS
+    ${DERIVED_SOURCES_WEBCORE_DIR} JS JS cpp
     ${IDL_ATTRIBUTES_FILE}
     ${SUPPLEMENTAL_DEPENDENCY_FILE}
     ${WINDOW_CONSTRUCTORS_FILE}
@@ -3486,7 +3496,7 @@ GENERATE_BINDINGS(WebCoreTestSupport_SOURCES
     "${WEBCORE_DIR}"
     "${IDL_INCLUDES}"
     "${FEATURE_DEFINES_JAVASCRIPT}"
-    ${DERIVED_SOURCES_WEBCORE_DIR} JS JS
+    ${DERIVED_SOURCES_WEBCORE_DIR} JS JS cpp
     ${IDL_ATTRIBUTES_FILE}
     ${SUPPLEMENTAL_DEPENDENCY_FILE}
     ${WINDOW_CONSTRUCTORS_FILE}
index e22c65e..4506fe0 100644 (file)
@@ -1,3 +1,36 @@
+2014-08-13  Alex Christensen  <achristensen@webkit.org>
+
+        Progress towards CMake on Mac.
+        https://bugs.webkit.org/show_bug.cgi?id=135819
+
+        Reviewed by Laszlo Gombos.
+
+        * CMakeLists.txt:
+        Include derived sources directory, which is needed by Apple ports.
+        Separated svg and non-svg idls for ObjC bindings.
+        Don't build the new gamepad API right now.  It's causing naming conflicts and it's not done.
+        Process CSSUnknownRule.idl.
+        * PlatformGTK.cmake:
+        Added cpp as the extension of the generated bindings.
+        * PlatformMac.cmake:
+        Include more directories and sources.
+        Add forwarding headers.
+        Generate ObjC bindings.
+        * bindings/objc/DOMUIKitExtensions.mm:
+        Moved config.h to recognize the PLATFORM macro.
+        * bindings/scripts/CodeGeneratorObjC.pm:
+        (ReadPublicInterfaces):
+        (GenerateInterface):
+        Added some workarounds for CMake.
+        * bindings/scripts/IDLAttributes.txt:
+        Added missing attribute names.
+        * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+        Added PLATFORM(IOS) to protect IOS_AIRPLAY code.
+        * platform/mac/PasteboardMac.mm:
+        Added necessary DRAG_SUPPORT protection.
+        * platform/text/mac/TextCodecMac.cpp:
+        Moved config.h to recognize the PLATFORM macro.        
+
 2014-08-13  Jer Noble  <jer.noble@apple.com>
 
         [MSE] Replacing existing samples with overlapping new samples will cause playback to stutter.
index a92c667..239e63a 100644 (file)
@@ -730,7 +730,7 @@ GENERATE_BINDINGS(GObjectDOMBindings_SOURCES
     "${IDL_INCLUDES}"
     "${GOBJECT_DOM_BINDINGS_FEATURES_DEFINES}"
     ${DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR}
-    WebKitDOM GObject
+    WebKitDOM GObject cpp
     ${IDL_ATTRIBUTES_FILE}
     ${SUPPLEMENTAL_DEPENDENCY_FILE}
     ${WINDOW_CONSTRUCTORS_FILE}
index 7d07735..418c254 100644 (file)
@@ -1,8 +1,10 @@
 list(APPEND WebCore_INCLUDE_DIRECTORIES
     "${WEBCORE_DIR}/accessibility/mac"
+    "${WEBCORE_DIR}/bindings/objc"
     "${WEBCORE_DIR}/bridge/objc"
     "${WEBCORE_DIR}/loader/archive/cf"
     "${WEBCORE_DIR}/loader/cf"
+    "${WEBCORE_DIR}/loader/mac"
     "${WEBCORE_DIR}/page/cocoa"
     "${WEBCORE_DIR}/page/mac"
     "${WEBCORE_DIR}/platform/cf"
@@ -163,7 +165,6 @@ list(APPEND WebCore_SOURCES
     platform/network/cf/FormDataStreamCFNet.cpp
     platform/network/cf/LoaderRunLoopCF.cpp
     platform/network/cf/NetworkStorageSessionCFNet.cpp
-    platform/network/cf/ProtectionSpaceCFNet.cpp
     platform/network/cf/ProxyServerCFNet.cpp
     platform/network/cf/ResourceErrorCF.cpp
     platform/network/cf/ResourceHandleCFNet.cpp
@@ -199,7 +200,36 @@ list(APPEND WebCore_SOURCES
     platform/text/mac/TextBoundaries.mm
     platform/text/mac/TextBreakIteratorInternalICUMac.mm
     platform/text/mac/TextCodecMac.cpp
+)
+
+set(WebCore_FORWARDING_HEADERS_DIRECTORIES
+    html
+    bindings/objc
+    platform
+    platform/mac
+    platform/network/cf
+)
 
-    plugins/mac/PluginPackageMac.cpp
-    plugins/mac/PluginViewMac.mm
+set(WebCore_FORWARDING_HEADERS_FILES
+    html/HTMLMediaElement.h
+    bindings/objc/WebKitAvailability.h
+    platform/DisplaySleepDisabler.h
+    platform/mac/SoftLinking.h
+    platform/network/cf/ResourceResponse.h
 )
+
+WEBKIT_CREATE_FORWARDING_HEADERS(WebCore DIRECTORIES ${WebCore_FORWARDING_HEADERS_DIRECTORIES} FILES ${WebCore_FORWARDING_HEADERS_FILES})
+
+set(FEATURE_DEFINES_OBJECTIVE_C "LANGUAGE_OBJECTIVE_C=1 ${FEATURE_DEFINES_WITH_SPACE_SEPARATOR}")
+GENERATE_BINDINGS(WebCore_SOURCES
+    "${WebCore_NON_SVG_IDL_FILES}"
+    "${WEBCORE_DIR}"
+    "${IDL_INCLUDES}"
+    "${FEATURE_DEFINES_OBJECTIVE_C}"
+    ${DERIVED_SOURCES_WEBCORE_DIR} DOM ObjC mm
+    ${IDL_ATTRIBUTES_FILE}
+    ${SUPPLEMENTAL_DEPENDENCY_FILE}
+    ${WINDOW_CONSTRUCTORS_FILE}
+    ${WORKERGLOBALSCOPE_CONSTRUCTORS_FILE}
+    ${SHAREDWORKERGLOBALSCOPE_CONSTRUCTORS_FILE}
+    ${DEDICATEDWORKERGLOBALSCOPE_CONSTRUCTORS_FILE})
index b742310..84092d7 100644 (file)
  *
  */
 
+#import "config.h"
+
 #if PLATFORM(IOS)
 
-#import "config.h"
 #import "DOMUIKitExtensions.h"
 
 #import "CachedImage.h"
index fff6871..d237520 100644 (file)
@@ -27,6 +27,8 @@
 package CodeGeneratorObjC;
 
 use constant FileNamePrefix => "DOM";
+use File::Basename;
+use FindBin;
 
 sub ConditionalIsEnabled(\%$);
 
@@ -246,7 +248,8 @@ sub ReadPublicInterfaces
     push(@args, "-I" . $ENV{BUILT_PRODUCTS_DIR} . "/usr/local/include") if $ENV{BUILT_PRODUCTS_DIR};
     push(@args, "-isysroot", $ENV{SDKROOT}) if $ENV{SDKROOT};
 
-    my $fileName = "WebCore/bindings/objc/PublicDOMInterfaces.h";
+    my $bindingsDir = dirname($FindBin::Bin);
+    my $fileName = "$bindingsDir/objc/PublicDOMInterfaces.h";
     my $gccLocation = "";
     if ($ENV{CC}) {
         $gccLocation = $ENV{CC};
@@ -377,7 +380,10 @@ sub GenerateInterface
         $fatalError = 1;
     }
 
-    die if $fatalError;
+    # FIXME: This should not need to be an exception.
+    # ObjCCustomImplementation doesn't work with CMake right now.
+    # https://bugs.webkit.org/show_bug.cgi?id=135860
+    die if $fatalError && $className ne "DOMAbstractView";
 }
 
 sub GetClassName
index b907909..1e4590f 100644 (file)
@@ -92,9 +92,11 @@ NotEnumerable
 NotDeletable
 ObjCCustomImplementation
 ObjCExplicitAtomicString
+ObjCImplementedAsUnsignedLong
 ObjCLegacyUnnamedParameters
 ObjCPolymorphic
 ObjCProtocol
+ObjCUseDefaultView
 OperationsNotDeletable
 PassContext
 RaisesException
index f9d54a0..8f08211 100644 (file)
@@ -2339,7 +2339,7 @@ String MediaPlayerPrivateAVFoundationObjC::languageOfPrimaryAudioTrack() const
     return m_languageOfPrimaryAudioTrack;
 }
 
-#if ENABLE(IOS_AIRPLAY)
+#if ENABLE(IOS_AIRPLAY) && PLATFORM(IOS)
 bool MediaPlayerPrivateAVFoundationObjC::isCurrentPlaybackTargetWireless() const
 {
     if (!m_avPlayer)
index 2b9f8b6..cea9048 100644 (file)
@@ -139,6 +139,7 @@ PassOwnPtr<Pasteboard> Pasteboard::createPrivate()
     return create(platformStrategies()->pasteboardStrategy()->uniqueName());
 }
 
+#if ENABLE(DRAG_SUPPORT)
 PassOwnPtr<Pasteboard> Pasteboard::createForDragAndDrop()
 {
     return create(NSDragPboard);
@@ -148,6 +149,7 @@ PassOwnPtr<Pasteboard> Pasteboard::createForDragAndDrop(const DragData& dragData
 {
     return create(dragData.pasteboardName());
 }
+#endif
 
 void Pasteboard::clear()
 {
@@ -635,6 +637,7 @@ Vector<String> Pasteboard::readFilenames()
     return paths;
 }
 
+#if ENABLE(DRAG_SUPPORT)
 void Pasteboard::setDragImage(DragImageRef image, const IntPoint& location)
 {
     // Don't allow setting the drag image if someone kept a pasteboard and is trying to set the image too late.
@@ -652,5 +655,6 @@ void Pasteboard::setDragImage(DragImageRef image, const IntPoint& location)
         modifierFlags:0 timestamp:0 windowNumber:0 context:nil eventNumber:0 clickCount:0 pressure:0];
     [NSApp postEvent:event atStart:YES];
 }
+#endif
 
 }
index 52e183a..56cfcfb 100644 (file)
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
+#include "config.h"
+
 #if !PLATFORM(IOS)
 
-#include "config.h"
 #include "TextCodecMac.h"
 
 #include "CharsetData.h"
index cbc3006..a49face 100644 (file)
@@ -55,8 +55,6 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FILTERS ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FONT_LOAD_EVENTS OFF)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FULLSCREEN_API ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FULLSCREEN_API_macosx ON)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_GAMEPAD ON)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_GAMEPAD_macosx ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_GAMEPAD_DEPRECATED OFF)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_GEOLOCATION ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING ON)
@@ -93,9 +91,6 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_WEEK ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_WEEK_iphoneos ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INPUT_TYPE_WEEK_iphonesimulator ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_INSPECTOR ON)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_IOS_AIRPLAY ON)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_IOS_AIRPLAY_iphoneos ON)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_IOS_AIRPLAY_iphonesimulator ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_IOS_TEXT_AUTOSIZING ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_IOS_TEXT_AUTOSIZING_iphoneos ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_IOS_TEXT_AUTOSIZING_iphonesimulator ON)
@@ -194,23 +189,28 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_REPLAY_iphoneos OFF)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_REPLAY_iphonesimulator OFF)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_SOCKETS ON)
 
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_TIMING ON)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_TIMING_macosx ON)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_TIMING_macosx_1080 OFF)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_TIMING_macosx_1090 OFF)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_TIMING_macosx_101000 ON)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_TIMING_iphoneos ON)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_TIMING_iphonesimulator ON)
-
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBVTT_REGIONS ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_XHR_TIMEOUT ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_XSLT ON)
 
-# FIXME: These are turned off temporarily to get CMake working easier.
+# FIXME: These are turned off temporarily to get CMake working easier. 
+# https://bugs.webkit.org/show_bug.cgi?id=135856
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FTL_JIT OFF)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FTL_JIT_macosx OFF)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FTL_JIT_iphoneos OFF)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_FTL_JIT_iphonesimulator OFF)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_TIMING OFF)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_TIMING_macosx OFF)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_TIMING_macosx_1080 OFF)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_TIMING_macosx_1090 OFF)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_TIMING_macosx_101000 OFF)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_TIMING_iphoneos OFF)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_TIMING_iphonesimulator OFF)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_GAMEPAD OFF)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_GAMEPAD_macosx OFF)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_IOS_AIRPLAY OFF)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_IOS_AIRPLAY_iphoneos OFF)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_IOS_AIRPLAY_iphonesimulator OFF)
 
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_LLINT_C_LOOP OFF)
 
index 34082ff..af9c21c 100644 (file)
@@ -34,7 +34,7 @@ endmacro()
 #   _prefix is a prefix of output files. (eg. JS - it makes JSXXX.cpp JSXXX.h from XXX.idl)
 #   _generator is a value of --generator argument.
 #   _supplemental_dependency_file is a value of --supplementalDependencyFile. (optional)
-macro(GENERATE_BINDINGS _output_source _input_files _base_dir _idl_includes _features _destination _prefix _generator _idl_attributes_file)
+macro(GENERATE_BINDINGS _output_source _input_files _base_dir _idl_includes _features _destination _prefix _generator _extension _idl_attributes_file)
     set(BINDING_GENERATOR ${WEBCORE_DIR}/bindings/scripts/generate-bindings.pl)
     set(_args ${ARGN})
     list(LENGTH _args _argCount)
@@ -69,14 +69,14 @@ macro(GENERATE_BINDINGS _output_source _input_files _base_dir _idl_includes _fea
         get_filename_component(_name ${_file} NAME_WE)
 
         add_custom_command(
-            OUTPUT ${_destination}/${_prefix}${_name}.cpp ${_destination}/${_prefix}${_name}.h
+            OUTPUT ${_destination}/${_prefix}${_name}.${_extension} ${_destination}/${_prefix}${_name}.h
             MAIN_DEPENDENCY ${_file}
             DEPENDS ${COMMON_GENERATOR_DEPENDENCIES}
             COMMAND ${PERL_EXECUTABLE} -I${WEBCORE_DIR}/bindings/scripts ${BINDING_GENERATOR} --defines "${_features}" --generator ${_generator} ${_idl_includes} --outputDir "${_destination}" --preprocessor "${CODE_GENERATOR_PREPROCESSOR}" --idlAttributesFile ${_idl_attributes_file} ${_supplemental_dependency} ${_file}
             WORKING_DIRECTORY ${_base_dir}
             VERBATIM)
 
-        list(APPEND ${_output_source} ${_destination}/${_prefix}${_name}.cpp)
+        list(APPEND ${_output_source} ${_destination}/${_prefix}${_name}.${_extension})
     endforeach ()
 endmacro()
 
index a78e8cf..1afe856 100644 (file)
@@ -1,3 +1,13 @@
+2014-08-13  Alex Christensen  <achristensen@webkit.org>
+
+        Progress towards CMake on Mac.
+        https://bugs.webkit.org/show_bug.cgi?id=135819
+
+        Reviewed by Laszlo Gombos.
+
+        * WebKitTestRunner/CMakeLists.txt:
+        Added new cpp parameter for the extension of the generated files.
+
 2014-08-13  Renato Nagy  <nagy.renato@stud.u-szeged.hu>
 
         Make check-webkit-style run sort-export-file
index cb4b191..b3ea571 100644 (file)
@@ -88,7 +88,7 @@ GENERATE_BINDINGS(WebKitTestRunnerInjectedBundle_SOURCES
     "${WEBKIT_TESTRUNNER_INJECTEDBUNDLE_DIR}/Bindings"
     "--include=${WEBKIT_TESTRUNNER_INJECTEDBUNDLE_DIR}/Bindings"
     "${FEATURE_DEFINES_WITH_SPACE_SEPARATOR}"
-    ${DERIVED_SOURCES_DIR}/InjectedBundle JS TestRunner
+    ${DERIVED_SOURCES_DIR}/InjectedBundle JS TestRunner cpp
     ${WEBCORE_DIR}/bindings/scripts/IDLAttributes.txt)
 
 INCLUDE_IF_EXISTS(${WEBKIT_TESTRUNNER_DIR}/Platform${PORT}.cmake)