2010-07-06 Leandro Pereira <leandro@profusion.mobi>
authorleandro@webkit.org <leandro@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 6 Jul 2010 18:18:27 +0000 (18:18 +0000)
committerleandro@webkit.org <leandro@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 6 Jul 2010 18:18:27 +0000 (18:18 +0000)
        Unreviewed build fix.

        [EFL] Generate code for RemoteInspector.

        * CMakeLists.txt:
2010-07-06  Leandro Pereira  <leandro@profusion.mobi>

        Unreviewed build fix.

        [EFL] Add macro to generate inspector code.

        * cmake/WebKitGenerators.cmake:

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

ChangeLog
WebCore/CMakeLists.txt
WebCore/ChangeLog
cmake/WebKitGenerators.cmake

index 3440b5f112c238340dd7a88493557f63f3cab7d0..7a2fc5f9dac081d036605f0d1a7cdf8acd8dff7a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-07-06  Leandro Pereira  <leandro@profusion.mobi>
+
+        Unreviewed build fix.
+
+        [EFL] Add macro to generate inspector code.
+
+        * cmake/WebKitGenerators.cmake:
+
 2010-07-06  Martin Robinson  <mrobinson@igalia.com>
 
         Unreviewed.
index feb31a066b63580483da42254067806513a080f3..5b8eaf8eb596a553ec5225784067f2a43ae14323 100644 (file)
@@ -289,7 +289,6 @@ SET(WebCore_IDL_FILES
 
     inspector/InjectedScriptHost.idl
     inspector/InspectorBackend.idl
-    inspector/InspectorFrontend2.idl
     inspector/InspectorFrontendHost.idl
     inspector/JavaScriptCallFrame.idl
     inspector/ScriptProfile.idl
@@ -1709,7 +1708,9 @@ FOREACH (_file ${WebCore_IDL_PURE_FILES})
     GENERATE_JS_FROM_IDL_PURE(${_file})
 ENDFOREACH ()
 
-LIST(APPEND WebCore_SOURCES ${JS_IDL_FILES})
+GENERATE_INSPECTOR_FROM_IDL(inspector/InspectorFrontend2.idl)
+
+LIST(APPEND WebCore_SOURCES ${JS_IDL_FILES} ${Inspector_IDL_FILES})
 
 GENERATE_GPERF(${WEBCORE_DIR}/html/HTMLEntityNames.gperf)
 GENERATE_GPERF(${WEBCORE_DIR}/platform/ColorData.gperf)
index a89c9d5890ad1ec182ae130a4aa38dba4a8c319c..d3d6348650df38d91648acc4d1dacab796745de7 100644 (file)
@@ -1,3 +1,11 @@
+2010-07-06  Leandro Pereira  <leandro@profusion.mobi>
+
+        Unreviewed build fix.
+
+        [EFL] Generate code for RemoteInspector.
+
+        * CMakeLists.txt:
+
 2010-07-06  Varun Jain  <varunjain@chromium.org>
 
         Reviewed by Oliver Hunt.
index aed5a6e717b50fce6a0aead701ac03a9326cbfb2..300347674d783f80284a3d1fd22c6fc25e49f5dc 100644 (file)
@@ -96,10 +96,12 @@ SET(SCRIPTS_BINDINGS
   ${WEBCORE_DIR}/bindings/scripts/IDLParser.pm
   ${WEBCORE_DIR}/bindings/scripts/IDLStructure.pm
   ${WEBCORE_DIR}/bindings/scripts/InFilesParser.pm)
-SET(JS_CODE_GENERATOR ${WEBCORE_DIR}/bindings/scripts/generate-bindings.pl)
+SET(BINDING_CODE_GENERATOR ${WEBCORE_DIR}/bindings/scripts/generate-bindings.pl)
 SET(JS_IDL_FILES "")
-# - Create JavaScript C++ code given an IDL input
-# GENERATE_JS_FROM_IDL(idl_source)
+SET(Inspector_IDL_FILES "")
+
+# - Create JS C++ code given an IDL input
+# GENERATE_FROM_IDL(generator idl_source)
 #
 # The generated files (.cpp, .h) lives in ${DERIVED_SOURCES_DIR}.
 #
@@ -113,21 +115,47 @@ MACRO(GENERATE_JS_FROM_IDL _source)
   GET_FILENAME_COMPONENT(_name ${_source} NAME_WE)
   ADD_CUSTOM_COMMAND(
     OUTPUT  ${DERIVED_SOURCES_DIR}/JS${_name}.cpp ${DERIVED_SOURCES_DIR}/JS${_name}.h
-    DEPENDS ${JS_CODE_GENERATOR} ${SCRIPTS_BINDINGS} ${WEBCORE_DIR}/${_source}
-    COMMAND ${PERL_EXECUTABLE} -I${WEBCORE_DIR}/bindings/scripts ${JS_CODE_GENERATOR} ${IDL_INCLUDES} --outputDir "${DERIVED_SOURCES_DIR}" --defines "LANGUAGE_JAVASCRIPT=1 ${FEATURE_DEFINES_STR}" --generator JS ${WEBCORE_DIR}/${_source}
+    DEPENDS ${BINDING_CODE_GENERATOR} ${SCRIPTS_BINDINGS} ${WEBCORE_DIR}/${_source}
+    COMMAND ${PERL_EXECUTABLE} -I${WEBCORE_DIR}/bindings/scripts ${BINDING_CODE_GENERATOR} ${IDL_INCLUDES} --outputDir "${DERIVED_SOURCES_DIR}" --defines "LANGUAGE_JAVASCRIPT=1 ${FEATURE_DEFINES_STR}" --generator JS ${WEBCORE_DIR}/${_source}
     VERBATIM)
   LIST(APPEND JS_IDL_FILES ${DERIVED_SOURCES_DIR}/JS${_name}.cpp)
   UNSET(_name)
   UNSET(_defines)
 ENDMACRO()
 
+
+# - Create Inspector C++ code given an IDL input
+# GENERATE_FROM_IDL(generator idl_source)
+#
+# The generated files (.cpp, .h) lives in ${DERIVED_SOURCES_DIR}.
+#
+# This function also appends the generated cpp file to Inspector_IDL_FILES list.
+MACRO(GENERATE_INSPECTOR_FROM_IDL _source)
+  SET(FEATURE_DEFINES_STR "")
+  FOREACH (f ${FEATURE_DEFINES})
+    SET(FEATURE_DEFINES_STR "${FEATURE_DEFINES_STR} ${f}")
+  ENDFOREACH ()
+
+  GET_FILENAME_COMPONENT(_name ${_source} NAME_WE)
+  ADD_CUSTOM_COMMAND(
+    OUTPUT  ${DERIVED_SOURCES_DIR}/Remote${_name}.cpp ${DERIVED_SOURCES_DIR}/Remote${_name}.h
+    DEPENDS ${BINDING_CODE_GENERATOR} ${SCRIPTS_BINDINGS} ${WEBCORE_DIR}/${_source}
+    COMMAND ${PERL_EXECUTABLE} -I${WEBCORE_DIR}/bindings/scripts -I${WEBCORE_DIR}/inspector ${BINDING_CODE_GENERATOR} ${IDL_INCLUDES} --outputDir "${DERIVED_SOURCES_DIR}" --defines "LANGUAGE_JAVASCRIPT=1 ${FEATURE_DEFINES_STR}" --generator Inspector ${WEBCORE_DIR}/${_source}
+    VERBATIM)
+  LIST(APPEND Inspector_IDL_FILES ${DERIVED_SOURCES_DIR}/Remote${_name}.cpp)
+  UNSET(_name)
+  UNSET(_defines)
+ENDMACRO()
+
+
+
 # - Create pure JavaScript functions (does nothing so far)
 MACRO(GENERATE_JS_FROM_IDL_PURE _source)
    GET_FILENAME_COMPONENT(_name ${_source} NAME_WE)
    ADD_CUSTOM_COMMAND(
      OUTPUT  ${DERIVED_SOURCES_DIR}/JS${_name}.cpp ${DERIVED_SOURCES_DIR}/JS${_name}.h
-     DEPENDS ${JS_CODE_GENERATOR} ${SCRIPTS_BINDINGS} ${WEBCORE_DIR}/${_source}
-     COMMAND ${PERL_EXECUTABLE} -I${WEBCORE_DIR}/bindings/scripts ${JS_CODE_GENERATOR} ${IDL_INCLUDES} --outputDir "${DERIVED_SOURCES_DIR}" --defines "LANGUAGE_JAVASCRIPT=1 ${FEATURE_DEFINES_STR}" --generator JS ${WEBCORE_DIR}/${_source}
+     DEPENDS ${BINDING_CODE_GENERATOR} ${SCRIPTS_BINDINGS} ${WEBCORE_DIR}/${_source}
+     COMMAND ${PERL_EXECUTABLE} -I${WEBCORE_DIR}/bindings/scripts ${BINDING_CODE_GENERATOR} ${IDL_INCLUDES} --outputDir "${DERIVED_SOURCES_DIR}" --defines "LANGUAGE_JAVASCRIPT=1 ${FEATURE_DEFINES_STR}" --generator JS ${WEBCORE_DIR}/${_source}
      VERBATIM)
    UNSET(_name)
 ENDMACRO()