Title: [205982] trunk
- Revision
- 205982
- Author
- [email protected]
- Date
- 2016-09-15 10:48:05 -0700 (Thu, 15 Sep 2016)
Log Message
[CMake] Refactor GENERATE_BINDINGS
https://bugs.webkit.org/show_bug.cgi?id=161854
Patch by Fujii Hironori <[email protected]> on 2016-09-15
Reviewed by Gyuyoung Kim.
.:
* Source/cmake/WebKitMacros.cmake(GENERATE_BINDINGS): Use
CMakeParseArguments for argument parsing. Defined as a function
instread of a macro because function has its own variable scope.
Wrapped both preprocess-idls.pl and generate-bindings.pl scripts.
Downcased local variables COMMON_GENERATOR_DEPENDENCIES and
BINDING_GENERATOR. Generate idl_files.tmp. Removed arguments
_prefix and _extension because they are always JS and cpp now.
Source/WebCore:
* CMakeLists.txt: Changed the arguments of GENERATE_BINDINGS to
new style. Removed add_custom_command of preprocess-idls.pl which
is moved to GENERATE_BINDINGS. Moved IDL_ATTRIBUTES_FILE into
GENERATE_BINDINGS.
Tools:
* DumpRenderTree/CMakeLists.txt: Changed the arguments of
GENERATE_BINDINGS to new style.
* WebKitTestRunner/CMakeLists.txt: Ditto.
Modified Paths
Diff
Modified: trunk/ChangeLog (205981 => 205982)
--- trunk/ChangeLog 2016-09-15 17:46:51 UTC (rev 205981)
+++ trunk/ChangeLog 2016-09-15 17:48:05 UTC (rev 205982)
@@ -1,3 +1,18 @@
+2016-09-15 Fujii Hironori <[email protected]>
+
+ [CMake] Refactor GENERATE_BINDINGS
+ https://bugs.webkit.org/show_bug.cgi?id=161854
+
+ Reviewed by Gyuyoung Kim.
+
+ * Source/cmake/WebKitMacros.cmake(GENERATE_BINDINGS): Use
+ CMakeParseArguments for argument parsing. Defined as a function
+ instread of a macro because function has its own variable scope.
+ Wrapped both preprocess-idls.pl and generate-bindings.pl scripts.
+ Downcased local variables COMMON_GENERATOR_DEPENDENCIES and
+ BINDING_GENERATOR. Generate idl_files.tmp. Removed arguments
+ _prefix and _extension because they are always JS and cpp now.
+
2016-09-08 Carlos Alberto Lopez Perez <[email protected]>
[CMake] Build failure with GCC 6 (fatal error: stdlib.h: No such file or directory)
Modified: trunk/Source/WebCore/CMakeLists.txt (205981 => 205982)
--- trunk/Source/WebCore/CMakeLists.txt 2016-09-15 17:46:51 UTC (rev 205981)
+++ trunk/Source/WebCore/CMakeLists.txt 2016-09-15 17:48:05 UTC (rev 205982)
@@ -3447,12 +3447,10 @@
${WEBCORE_DIR}/bindings/scripts/Hasher.pm
${WEBCORE_DIR}/bindings/scripts/StaticString.pm
)
-set(IDL_FILES_TMP ${DERIVED_SOURCES_WEBCORE_DIR}/idl_files.tmp)
set(SUPPLEMENTAL_DEPENDENCY_FILE ${DERIVED_SOURCES_WEBCORE_DIR}/supplemental_dependency.tmp)
set(WINDOW_CONSTRUCTORS_FILE ${DERIVED_SOURCES_WEBCORE_DIR}/DOMWindowConstructors.idl)
set(WORKERGLOBALSCOPE_CONSTRUCTORS_FILE ${DERIVED_SOURCES_WEBCORE_DIR}/WorkerGlobalScopeConstructors.idl)
set(DEDICATEDWORKERGLOBALSCOPE_CONSTRUCTORS_FILE ${DERIVED_SOURCES_WEBCORE_DIR}/DedicatedWorkerGlobalScopeConstructors.idl)
-set(IDL_ATTRIBUTES_FILE ${WEBCORE_DIR}/bindings/scripts/IDLAttributes.txt)
WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
@@ -3622,59 +3620,34 @@
GENERATE_GRAMMAR(xpathyy ${WEBCORE_DIR}/xml/XPathGrammar.y ${DERIVED_SOURCES_WEBCORE_DIR}/XPathGrammar.h ${DERIVED_SOURCES_WEBCORE_DIR}/XPathGrammar.cpp "")
list(APPEND WebCore_DERIVED_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/XPathGrammar.cpp)
-
-set(IDL_INCLUDES "")
-foreach (_include ${WebCore_IDL_INCLUDES})
- list(APPEND IDL_INCLUDES --include=${WEBCORE_DIR}/${_include})
-endforeach ()
-
-set(FEATURE_DEFINES_JAVASCRIPT "LANGUAGE_JAVASCRIPT=1 ${FEATURE_DEFINES_WITH_SPACE_SEPARATOR}")
-
-# Create _javascript_ C++ code given an IDL input
-foreach (_idl ${WebCore_IDL_FILES})
- set(IDL_FILES_LIST "${IDL_FILES_LIST}${WEBCORE_DIR}/${_idl}\n")
-endforeach ()
-
-list(APPEND IDL_INCLUDES --include=${DERIVED_SOURCES_WEBCORE_DIR})
+set(FEATURE_DEFINES_JAVASCRIPT "LANGUAGE_JAVASCRIPT ${FEATURE_DEFINES_WITH_SPACE_SEPARATOR}")
list(APPEND WebCoreTestSupport_IDL_FILES ${DERIVED_SOURCES_WEBCORE_DIR}/InternalSettingsGenerated.idl)
-file(WRITE ${IDL_FILES_TMP} ${IDL_FILES_LIST})
+GENERATE_BINDINGS(
+ OUTPUT_SOURCE WebCore_DERIVED_SOURCES
+ INPUT_FILES ${WebCore_IDL_FILES}
+ BASE_DIR ${WEBCORE_DIR}
+ IDL_INCLUDES ${WebCore_IDL_INCLUDES} ${DERIVED_SOURCES_WEBCORE_DIR}
+ FEATURES ${FEATURE_DEFINES_JAVASCRIPT}
+ DESTINATION ${DERIVED_SOURCES_WEBCORE_DIR}
+ GENERATOR JS
+ SUPPLEMENTAL_DEPFILE ${SUPPLEMENTAL_DEPENDENCY_FILE}
+ PP_EXTRA_OUTPUT
+ ${WINDOW_CONSTRUCTORS_FILE} ${WORKERGLOBALSCOPE_CONSTRUCTORS_FILE} ${DEDICATEDWORKERGLOBALSCOPE_CONSTRUCTORS_FILE}
+ PP_EXTRA_ARGS
+ --windowConstructorsFile ${WINDOW_CONSTRUCTORS_FILE}
+ --workerGlobalScopeConstructorsFile ${WORKERGLOBALSCOPE_CONSTRUCTORS_FILE}
+ --dedicatedWorkerGlobalScopeConstructorsFile ${DEDICATEDWORKERGLOBALSCOPE_CONSTRUCTORS_FILE})
-add_custom_command(
- OUTPUT ${SUPPLEMENTAL_DEPENDENCY_FILE} ${WINDOW_CONSTRUCTORS_FILE} ${WORKERGLOBALSCOPE_CONSTRUCTORS_FILE} ${DEDICATEDWORKERGLOBALSCOPE_CONSTRUCTORS_FILE}
- DEPENDS ${WEBCORE_DIR}/bindings/scripts/preprocess-idls.pl ${SCRIPTS_PREPROCESS_IDLS} ${WebCore_IDL_FILES} ${WEBCORE_DIR}/CMakeLists.txt
- COMMAND ${PERL_EXECUTABLE} -I${WEBCORE_DIR}/bindings/scripts ${WEBCORE_DIR}/bindings/scripts/preprocess-idls.pl --defines "${FEATURE_DEFINES_JAVASCRIPT}" --idlFilesList ${IDL_FILES_TMP} --supplementalDependencyFile ${SUPPLEMENTAL_DEPENDENCY_FILE} --windowConstructorsFile ${WINDOW_CONSTRUCTORS_FILE} --workerGlobalScopeConstructorsFile ${WORKERGLOBALSCOPE_CONSTRUCTORS_FILE}
---dedicatedWorkerGlobalScopeConstructorsFile ${DEDICATEDWORKERGLOBALSCOPE_CONSTRUCTORS_FILE}
- VERBATIM)
+GENERATE_BINDINGS(
+ OUTPUT_SOURCE WebCoreTestSupport_SOURCES
+ INPUT_FILES ${WebCoreTestSupport_IDL_FILES}
+ BASE_DIR ${WEBCORE_DIR}
+ IDL_INCLUDES ${WebCore_IDL_INCLUDES} ${DERIVED_SOURCES_WEBCORE_DIR} ${WebCoreTestSupport_IDL_INCLUDES}
+ FEATURES ${FEATURE_DEFINES_JAVASCRIPT}
+ DESTINATION ${DERIVED_SOURCES_WEBCORE_DIR}
+ GENERATOR JS)
-set(ADDITIONAL_BINDINGS_DEPENDENCIES
- ${WINDOW_CONSTRUCTORS_FILE}
- ${WORKERGLOBALSCOPE_CONSTRUCTORS_FILE}
- ${DEDICATEDWORKERGLOBALSCOPE_CONSTRUCTORS_FILE}
-)
-
-GENERATE_BINDINGS(WebCore_DERIVED_SOURCES
- "${WebCore_IDL_FILES}"
- "${WEBCORE_DIR}"
- "${IDL_INCLUDES}"
- "${FEATURE_DEFINES_JAVASCRIPT}"
- ${DERIVED_SOURCES_WEBCORE_DIR} JS JS cpp
- ${IDL_ATTRIBUTES_FILE}
- ${SUPPLEMENTAL_DEPENDENCY_FILE}
- ${ADDITIONAL_BINDINGS_DEPENDENCIES})
-
-foreach (_include ${WebCoreTestSupport_IDL_INCLUDES})
- list(APPEND IDL_INCLUDES --include=${WEBCORE_DIR}/${_include})
-endforeach ()
-
-GENERATE_BINDINGS(WebCoreTestSupport_SOURCES
- "${WebCoreTestSupport_IDL_FILES}"
- "${WEBCORE_DIR}"
- "${IDL_INCLUDES}"
- "${FEATURE_DEFINES_JAVASCRIPT}"
- ${DERIVED_SOURCES_WEBCORE_DIR} JS JS cpp
- ${IDL_ATTRIBUTES_FILE})
-
# WebCore JS Builtins
set(WebCore_BUILTINS_SOURCES
Modified: trunk/Source/WebCore/ChangeLog (205981 => 205982)
--- trunk/Source/WebCore/ChangeLog 2016-09-15 17:46:51 UTC (rev 205981)
+++ trunk/Source/WebCore/ChangeLog 2016-09-15 17:48:05 UTC (rev 205982)
@@ -1,3 +1,15 @@
+2016-09-15 Fujii Hironori <[email protected]>
+
+ [CMake] Refactor GENERATE_BINDINGS
+ https://bugs.webkit.org/show_bug.cgi?id=161854
+
+ Reviewed by Gyuyoung Kim.
+
+ * CMakeLists.txt: Changed the arguments of GENERATE_BINDINGS to
+ new style. Removed add_custom_command of preprocess-idls.pl which
+ is moved to GENERATE_BINDINGS. Moved IDL_ATTRIBUTES_FILE into
+ GENERATE_BINDINGS.
+
2016-09-14 Anders Carlsson <[email protected]>
Add CSS -webkit-appearance property for Apple Pay buttons
Modified: trunk/Source/cmake/WebKitMacros.cmake (205981 => 205982)
--- trunk/Source/cmake/WebKitMacros.cmake 2016-09-15 17:46:51 UTC (rev 205981)
+++ trunk/Source/cmake/WebKitMacros.cmake 2016-09-15 17:48:05 UTC (rev 205982)
@@ -1,3 +1,5 @@
+include(CMakeParseArguments)
+
macro(WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS)
set(_file ${CMAKE_CURRENT_SOURCE_DIR}/Platform${PORT}.cmake)
if (EXISTS ${_file})
@@ -41,57 +43,84 @@
#FIXME: Add support for Xcode.
endmacro()
-# Helper macro which wraps generate-bindings.pl script.
-# _output_source is a list name which will contain generated sources.(eg. WebCore_SOURCES)
-# _input_files are IDL files to generate.
-# _base_dir is base directory where script is called.
-# _idl_includes is value of --include argument. (eg. --include=${WEBCORE_DIR}/bindings/js)
-# _features is a value of --defines argument.
-# _destination is a value of --outputDir argument.
-# _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 _extension _idl_attributes_file)
+# Helper macro which wraps preprocess-idls.pl and generate-bindings.pl scripts.
+# OUTPUT_SOURCE is a list name which will contain generated sources.(eg. WebCore_SOURCES)
+# INPUT_FILES are IDL files to generate.
+# BASE_DIR is base directory where script is called.
+# IDL_INCLUDES is value of --include argument. (eg. ${WEBCORE_DIR}/bindings/js)
+# FEATURES is a value of --defines argument.
+# DESTINATION is a value of --outputDir argument.
+# GENERATOR is a value of --generator argument.
+# SUPPLEMENTAL_DEPFILE is a value of --supplementalDependencyFile. (optional)
+# PP_EXTRA_OUTPUT is extra outputs of preprocess-idls.pl. (optional)
+# PP_EXTRA_ARGS is extra arguments for preprocess-idls.pl. (optional)
+function(GENERATE_BINDINGS)
+ set(options)
+ set(oneValueArgs OUTPUT_SOURCE BASE_DIR FEATURES DESTINATION GENERATOR SUPPLEMENTAL_DEPFILE)
+ set(multiValueArgs INPUT_FILES IDL_INCLUDES PP_EXTRA_OUTPUT PP_EXTRA_ARGS)
+ cmake_parse_arguments(arg "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
+ set(binding_generator ${WEBCORE_DIR}/bindings/scripts/generate-bindings.pl)
+ set(idl_attributes_file ${WEBCORE_DIR}/bindings/scripts/IDLAttributes.txt)
+ set(id ${arg_OUTPUT_SOURCE})
+ set(idl_files_list ${CMAKE_CURRENT_BINARY_DIR}/idl_files_${id}.tmp)
set(_supplemental_dependency)
- set(_supplemental_dependency_file)
- set(_additional_dependencies)
- set(BINDING_GENERATOR ${WEBCORE_DIR}/bindings/scripts/generate-bindings.pl)
- set(_args ${ARGN})
- list(LENGTH _args _argCount)
- if (_argCount GREATER 0)
- list(GET _args 0 _supplemental_dependency_file)
- if (_supplemental_dependency_file)
- set(_supplemental_dependency --supplementalDependencyFile ${_supplemental_dependency_file})
+
+ set(content)
+ foreach (f ${arg_INPUT_FILES})
+ if (NOT IS_ABSOLUTE ${f})
+ set(f ${CMAKE_CURRENT_SOURCE_DIR}/${f})
endif ()
- list(GET _args 1 _additional_dependencies)
+ set(content "${content}${f}\n")
+ endforeach ()
+ file(WRITE ${idl_files_list} ${content})
+
+ if (arg_SUPPLEMENTAL_DEPFILE)
+ set(_supplemental_dependency --supplementalDependencyFile ${arg_SUPPLEMENTAL_DEPFILE})
+
+ add_custom_command(
+ OUTPUT ${arg_SUPPLEMENTAL_DEPFILE} ${arg_PP_EXTRA_OUTPUT}
+ DEPENDS ${WEBCORE_DIR}/bindings/scripts/preprocess-idls.pl ${arg_INPUT_FILES}
+ COMMAND ${PERL_EXECUTABLE} -I${WEBCORE_DIR}/bindings/scripts ${WEBCORE_DIR}/bindings/scripts/preprocess-idls.pl --defines ${arg_FEATURES} --idlFilesList ${idl_files_list} --supplementalDependencyFile ${arg_SUPPLEMENTAL_DEPFILE} ${arg_PP_EXTRA_ARGS}
+ VERBATIM)
endif ()
- set(COMMON_GENERATOR_DEPENDENCIES
- ${BINDING_GENERATOR}
+ set(idl_includes)
+ foreach (dir ${arg_IDL_INCLUDES})
+ if (IS_ABSOLUTE ${dir})
+ list(APPEND idl_includes --include=${dir})
+ else ()
+ list(APPEND idl_includes --include=${CMAKE_CURRENT_SOURCE_DIR}/${dir})
+ endif ()
+ endforeach ()
+
+ set(common_generator_dependencies
+ ${binding_generator}
${WEBCORE_DIR}/bindings/scripts/CodeGenerator.pm
${SCRIPTS_BINDINGS}
- ${_supplemental_dependency_file}
- ${_idl_attributes_file}
+ ${arg_SUPPLEMENTAL_DEPFILE}
+ ${idl_attributes_file}
)
- list(APPEND COMMON_GENERATOR_DEPENDENCIES ${_additional_dependencies})
+ list(APPEND common_generator_dependencies ${arg_PP_EXTRA_OUTPUT})
- if (EXISTS ${WEBCORE_DIR}/bindings/scripts/CodeGenerator${_generator}.pm)
- list(APPEND COMMON_GENERATOR_DEPENDENCIES ${WEBCORE_DIR}/bindings/scripts/CodeGenerator${_generator}.pm)
+ if (EXISTS ${WEBCORE_DIR}/bindings/scripts/CodeGenerator${arg_GENERATOR}.pm)
+ list(APPEND common_generator_dependencies ${WEBCORE_DIR}/bindings/scripts/CodeGenerator${arg_GENERATOR}.pm)
endif ()
- foreach (_file ${_input_files})
+ set(gen_sources)
+ foreach (_file ${arg_INPUT_FILES})
get_filename_component(_name ${_file} NAME_WE)
add_custom_command(
- OUTPUT ${_destination}/${_prefix}${_name}.${_extension} ${_destination}/${_prefix}${_name}.h
+ OUTPUT ${arg_DESTINATION}/JS${_name}.cpp ${arg_DESTINATION}/JS${_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}
+ DEPENDS ${common_generator_dependencies}
+ COMMAND ${PERL_EXECUTABLE} -I${WEBCORE_DIR}/bindings/scripts ${binding_generator} --defines ${arg_FEATURES} --generator ${arg_GENERATOR} ${idl_includes} --outputDir ${arg_DESTINATION} --preprocessor ${CODE_GENERATOR_PREPROCESSOR} --idlAttributesFile ${idl_attributes_file} ${_supplemental_dependency} ${_file}
+ WORKING_DIRECTORY ${arg_BASE_DIR}
VERBATIM)
- list(APPEND ${_output_source} ${_destination}/${_prefix}${_name}.${_extension})
+ list(APPEND gen_sources ${arg_DESTINATION}/JS${_name}.cpp)
endforeach ()
-endmacro()
+ set(${arg_OUTPUT_SOURCE} ${${arg_OUTPUT_SOURCE}} ${gen_sources} PARENT_SCOPE)
+endfunction()
macro(GENERATE_FONT_NAMES _infile)
set(NAMES_GENERATOR ${WEBCORE_DIR}/dom/make_names.pl)
Modified: trunk/Tools/ChangeLog (205981 => 205982)
--- trunk/Tools/ChangeLog 2016-09-15 17:46:51 UTC (rev 205981)
+++ trunk/Tools/ChangeLog 2016-09-15 17:48:05 UTC (rev 205982)
@@ -1,3 +1,14 @@
+2016-09-15 Fujii Hironori <[email protected]>
+
+ [CMake] Refactor GENERATE_BINDINGS
+ https://bugs.webkit.org/show_bug.cgi?id=161854
+
+ Reviewed by Gyuyoung Kim.
+
+ * DumpRenderTree/CMakeLists.txt: Changed the arguments of
+ GENERATE_BINDINGS to new style.
+ * WebKitTestRunner/CMakeLists.txt: Ditto.
+
2016-09-15 Ryan Haddad <[email protected]>
Disable failing API WebKit2.DataDetectionReferenceDate until it can be investigated.
Modified: trunk/Tools/DumpRenderTree/CMakeLists.txt (205981 => 205982)
--- trunk/Tools/DumpRenderTree/CMakeLists.txt 2016-09-15 17:46:51 UTC (rev 205981)
+++ trunk/Tools/DumpRenderTree/CMakeLists.txt 2016-09-15 17:48:05 UTC (rev 205982)
@@ -119,13 +119,14 @@
"${WEBKIT_TESTRUNNER_UISCRIPTCONTEXT_DIR}/Bindings/UIScriptController.idl"
)
-GENERATE_BINDINGS(DumpRenderTree_SOURCES
- "${DumpRenderTree_IDL_FILES}"
- "${DUMP_RENDER_TREE_BINDINGS_DIR}"
- "--include=${WEBKIT_TESTRUNNER_UISCRIPTCONTEXT_DIR}/Bindings"
- "${FEATURE_DEFINES_WITH_SPACE_SEPARATOR}"
- ${DERIVED_SOURCES_DIR}/DumpRenderTree JS DumpRenderTree cpp
- ${WEBCORE_DIR}/bindings/scripts/IDLAttributes.txt)
+GENERATE_BINDINGS(
+ OUTPUT_SOURCE DumpRenderTree_SOURCES
+ INPUT_FILES ${DumpRenderTree_IDL_FILES}
+ BASE_DIR ${DUMP_RENDER_TREE_BINDINGS_DIR}
+ IDL_INCLUDES Bindings
+ FEATURES ${FEATURE_DEFINES_WITH_SPACE_SEPARATOR}
+ DESTINATION ${DERIVED_SOURCES_DIR}/DumpRenderTree
+ GENERATOR DumpRenderTree)
WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
Modified: trunk/Tools/WebKitTestRunner/CMakeLists.txt (205981 => 205982)
--- trunk/Tools/WebKitTestRunner/CMakeLists.txt 2016-09-15 17:46:51 UTC (rev 205981)
+++ trunk/Tools/WebKitTestRunner/CMakeLists.txt 2016-09-15 17:48:05 UTC (rev 205982)
@@ -97,21 +97,23 @@
"${WEBKIT_TESTRUNNER_UISCRIPTCONTEXT_DIR}/Bindings/UIScriptController.idl"
)
-GENERATE_BINDINGS(WebKitTestRunnerInjectedBundle_SOURCES
- "${WebKitTestRunnerInjectedBundle_IDL_FILES}"
- "${WEBKIT_TESTRUNNER_INJECTEDBUNDLE_DIR}/Bindings"
- "--include=${WEBKIT_TESTRUNNER_INJECTEDBUNDLE_DIR}/Bindings"
- "${FEATURE_DEFINES_WITH_SPACE_SEPARATOR}"
- ${DERIVED_SOURCES_DIR}/InjectedBundle JS TestRunner cpp
- ${WEBCORE_DIR}/bindings/scripts/IDLAttributes.txt)
+GENERATE_BINDINGS(
+ OUTPUT_SOURCE WebKitTestRunnerInjectedBundle_SOURCES
+ INPUT_FILES ${WebKitTestRunnerInjectedBundle_IDL_FILES}
+ BASE_DIR ${WEBKIT_TESTRUNNER_INJECTEDBUNDLE_DIR}/Bindings
+ IDL_INCLUDES ${WEBKIT_TESTRUNNER_INJECTEDBUNDLE_DIR}/Bindings
+ FEATURES ${FEATURE_DEFINES_WITH_SPACE_SEPARATOR}
+ DESTINATION ${DERIVED_SOURCES_DIR}/InjectedBundle
+ GENERATOR TestRunner)
-GENERATE_BINDINGS(WebKitTestRunner_SOURCES
- "${WebKitTestRunner_IDL_FILES}"
- "${WEBKIT_TESTRUNNER_INJECTEDBUNDLE_DIR}/Bindings"
- "--include=${WEBKIT_TESTRUNNER_INJECTEDBUNDLE_DIR}/Bindings"
- "${FEATURE_DEFINES_WITH_SPACE_SEPARATOR}"
- ${DERIVED_SOURCES_DIR}/UIScriptContext JS TestRunner cpp
- ${WEBCORE_DIR}/bindings/scripts/IDLAttributes.txt)
+GENERATE_BINDINGS(
+ OUTPUT_SOURCE WebKitTestRunner_SOURCES
+ INPUT_FILES ${WebKitTestRunner_IDL_FILES}
+ BASE_DIR ${WEBKIT_TESTRUNNER_INJECTEDBUNDLE_DIR}/Bindings
+ IDL_INCLUDES ${WEBKIT_TESTRUNNER_INJECTEDBUNDLE_DIR}/Bindings
+ FEATURES ${FEATURE_DEFINES_WITH_SPACE_SEPARATOR}
+ DESTINATION ${DERIVED_SOURCES_DIR}/UIScriptContext
+ GENERATOR TestRunner)
WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
