Update CMake build system to use new script for generating source files
authorabecsi@webkit.org <abecsi@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 17 Jun 2010 14:47:03 +0000 (14:47 +0000)
committerabecsi@webkit.org <abecsi@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 17 Jun 2010 14:47:03 +0000 (14:47 +0000)
        with gperf (r61091).
        https://bugs.webkit.org/show_bug.cgi?id=40628

        Patch by Lucas De Marchi <lucas.demarchi@profusion.mobi> on 2010-06-17
        Reviewed by Gustavo Noronha.

    * cmake/WebKitGenerators.cmake:

        WebCore: Update CMake build system to use new script for generating source files
        with gperf (r61091).
        This updates also the build system to cope with recent changes to
        source files list.
        https://bugs.webkit.org/show_bug.cgi?id=40628

        Patch by Lucas De Marchi <lucas.demarchi@profusion.mobi> on 2010-06-17
        Reviewed by Gustavo Noronha.

        No new tests since it's just compilation fixes.

    * CMakeLists.txt:

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

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

index aafcde7f96b8e699c4cb2c9799d5d47433ad90eb..4f634fe54ef1aba642c003391ee63a4346076ed8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2010-06-17  Lucas De Marchi  <lucas.demarchi@profusion.mobi>
+
+        Reviewed by Gustavo Noronha.
+
+        Update CMake build system to use new script for generating source files
+        with gperf (r61091).
+        https://bugs.webkit.org/show_bug.cgi?id=40628
+
+        * cmake/WebKitGenerators.cmake:
+
 2010-06-17  Mark Brand  <mabrand@mabrand.nl>
 
         Reviewed by Simon Hausmann.
index 9f27f525c7dc021c5cb6d29919e87e1c9a430c15..3a09e63c0a8f0426c4b6ee496afe77d806fd0d9c 100644 (file)
@@ -347,6 +347,8 @@ SET(WebCore_IDL_FILES
     storage/Storage.idl
     storage/StorageEvent.idl
 
+    websockets/WebSocket.idl
+
     workers/AbstractWorker.idl
     workers/DedicatedWorkerContext.idl
     workers/SharedWorker.idl
@@ -511,7 +513,7 @@ ENDIF()
 SET(WebCore_SOURCES
     ${DERIVED_SOURCES_DIR}/CSSGrammar.cpp
     ${DERIVED_SOURCES_DIR}/HTMLElementFactory.cpp
-    ${DERIVED_SOURCES_DIR}/HTMLEntityNames.c
+    ${DERIVED_SOURCES_DIR}/HTMLEntityNames.cpp
     ${DERIVED_SOURCES_DIR}/HTMLNames.cpp
     ${DERIVED_SOURCES_DIR}/JSHTMLElementWrapperFactory.cpp
     ${DERIVED_SOURCES_DIR}/UserAgentStyleSheetsData.cpp
@@ -1016,6 +1018,7 @@ SET(WebCore_SOURCES
     inspector/InspectorFrontendClientLocal.cpp
     inspector/InspectorFrontendHost.cpp
     inspector/InspectorResource.cpp
+    inspector/InspectorValues.cpp
     inspector/InspectorTimelineAgent.cpp
     inspector/TimelineRecordFactory.cpp
 
@@ -1403,6 +1406,13 @@ SET(WebCore_SOURCES
     storage/StorageNamespaceImpl.cpp
     storage/StorageSyncManager.cpp
 
+    websockets/ThreadableWebSocketChannel.cpp
+    websockets/WebSocket.cpp
+    websockets/WebSocketChannel.cpp
+    websockets/WebSocketHandshake.cpp
+    websockets/WebSocketHandshakeRequest.cpp
+    websockets/WorkerThreadableWebSocketChannel.cpp
+
     workers/AbstractWorker.cpp
     workers/DedicatedWorkerContext.cpp
     workers/DedicatedWorkerThread.cpp
@@ -1672,9 +1682,9 @@ ENDFOREACH ()
 
 LIST(APPEND WebCore_SOURCES ${JS_IDL_FILES})
 
-GENERATE_GPERF("c" ${WEBCORE_DIR}/html/HTMLEntityNames.gperf findEntity "-c")
-GENERATE_GPERF("c" ${WEBCORE_DIR}/platform/ColorData.gperf findColor "")
-GENERATE_GPERF("cpp" ${WEBCORE_DIR}/html/DocTypeStrings.gperf findDoctypeEntry "-F,PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards")
+GENERATE_GPERF(${WEBCORE_DIR}/html/HTMLEntityNames.gperf)
+GENERATE_GPERF(${WEBCORE_DIR}/platform/ColorData.gperf)
+GENERATE_GPERF(${WEBCORE_DIR}/html/DocTypeStrings.gperf)
 
 GENERATE_TOKENIZER()
 GENERATE_USER_AGENT_STYLES()
@@ -1689,9 +1699,10 @@ ADD_SOURCE_DERIVED_DEPENDENCIES(${DERIVED_SOURCES_DIR}/CSSGrammar.cpp CSSValueKe
 ADD_SOURCE_DERIVED_DEPENDENCIES(${DERIVED_SOURCES_DIR}/CSSGrammar.cpp CSSPropertyNames.h)
 ADD_SOURCE_DERIVED_DEPENDENCIES(${WEBCORE_DIR}/css/CSSPrimitiveValueMappings.h CSSValueKeywords.h)
 ADD_SOURCE_DERIVED_DEPENDENCIES(${WEBCORE_DIR}/html/HTMLDocument.cpp DocTypeStrings.cpp)
-ADD_SOURCE_DERIVED_DEPENDENCIES(${WEBCORE_DIR}/platform/graphics/Color.cpp ColorData.c)
+ADD_SOURCE_DERIVED_DEPENDENCIES(${WEBCORE_DIR}/platform/graphics/Color.cpp ColorData.cpp)
 ADD_SOURCE_DERIVED_DEPENDENCIES(${WEBCORE_DIR}/css/CSSParser.cpp tokenizer.cpp)
-ADD_SOURCE_DERIVED_DEPENDENCIES(${WEBCORE_DIR}/html/PreloadScanner.cpp HTMLEntityNames.c)
+ADD_SOURCE_DERIVED_DEPENDENCIES(${WEBCORE_DIR}/html/PreloadScanner.cpp HTMLEntityNames.cpp)
+ADD_SOURCE_DERIVED_DEPENDENCIES(${WEBCORE_DIR}/html/HTML5EntityParser.cpp HTMLEntityNames.cpp)
 ADD_SOURCE_DERIVED_DEPENDENCIES(${WEBCORE_DIR}/css/CSSStyleSelector.cpp UserAgentStyleSheetsData.cpp UserAgentStyleSheets.h)
 
 GENERATE_DOM_NAMES_FACTORY(HTML ${WEBCORE_DIR}/html/HTMLTagNames.in ${WEBCORE_DIR}/html/HTMLAttributeNames.in "${HTML_FEATURES}")
index e6e52ba3317c53ebfc64370809c445883d4accd9..09498043074d1bb8501af9efd2a475650f555b38 100644 (file)
@@ -1,3 +1,17 @@
+2010-06-17  Lucas De Marchi  <lucas.demarchi@profusion.mobi>
+
+        Reviewed by Gustavo Noronha.
+
+        Update CMake build system to use new script for generating source files
+        with gperf (r61091).
+        This updates also the build system to cope with recent changes to
+        source files list.
+        https://bugs.webkit.org/show_bug.cgi?id=40628
+
+        No new tests since it's just compilation fixes.
+
+        * CMakeLists.txt:
+
 2010-06-17  Darin Adler  <darin@apple.com>
 
         Reviewed by Sam Weinig.
index 6fe039958f7d68c42eec125d048a7d0443abfef9..0e08edfe1b138df0d90aad5d2f6e499b10a74451 100644 (file)
@@ -74,18 +74,18 @@ IF (NOT GPERF_EXECUTABLE)
   MESSAGE(FATAL_ERROR "Missing gperf")
 ENDIF ()
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(GPerf DEFAULT_MSG GPERF_EXECUTABLE)
+SET(PERF_HASH_GENERATOR ${WEBCORE_DIR}/make-hash-tools.pl)
 
 # - Create perfect hash tables using gperf
-# GENERATE_GPERF(extension source_file find_function gperf_options)
+# GENERATE_GPERF(extension source_file)
 #
-# The generated files lives in ${DERIVED_SOURCES_DIR} and ends in the
-# given extension.
-MACRO(GENERATE_GPERF _ext _source _func _opts)
+# The generated files lives in ${DERIVED_SOURCES_DIR} and ends in .cpp
+MACRO(GENERATE_GPERF _source)
   GET_FILENAME_COMPONENT(_name ${_source} NAME_WE)
   ADD_CUSTOM_COMMAND(
-    OUTPUT ${DERIVED_SOURCES_DIR}/${_name}.${_ext}
+    OUTPUT ${DERIVED_SOURCES_DIR}/${_name}.cpp
     DEPENDS ${_source}
-    COMMAND ${GPERF_EXECUTABLE} -CDEGIot -L ANSI-C -k * -s 2 -N ${_func} ${_opts} --output-file=${DERIVED_SOURCES_DIR}/${_name}.${_ext} ${_source}
+    COMMAND ${PERL_EXECUTABLE} ${PERF_HASH_GENERATOR} ${DERIVED_SOURCES_DIR} ${_source}
     VERBATIM)
 ENDMACRO ()