Changeset 61323 in webkit

Timestamp:

Jun 17, 2010 7:47:03 AM (14 years ago)

Author:

abecsi@webkit.org

Message:

Update CMake build system to use new script for generating source files
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:

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• WebCore/CMakeLists.txt (modified) (6 diffs)
• WebCore/ChangeLog (modified) (1 diff)
• cmake/WebKitGenerators.cmake (modified) (1 diff)

trunk/ChangeLog

@@ +1 @@
+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>
 

trunk/WebCore/CMakeLists.txt

@@ -347 +347 @@
     storage/Storage.idl
     storage/StorageEvent.idl
+
+    websockets/WebSocket.idl
 
     workers/AbstractWorker.idl
@@ -512 +514 @@
     ${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
@@ -1017 +1019 @@
     inspector/InspectorFrontendHost.cpp
     inspector/InspectorResource.cpp
+    inspector/InspectorValues.cpp
     inspector/InspectorTimelineAgent.cpp
     inspector/TimelineRecordFactory.cpp
@@ -1403 +1406 @@
     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
@@ -1673 +1683 @@
 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()
@@ -1690 +1700 @@
 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)
 

trunk/WebCore/ChangeLog

@@ +1 @@
+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>
 

trunk/cmake/WebKitGenerators.cmake

@@ -75 +75 @@
 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)
-#
-# The generated files lives in ${DERIVED_SOURCES_DIR} and ends in the
-# given extension.
-MACRO(GENERATE_GPERF _ext _source _func _opts)
+# GENERATE_GPERF(extension source_file)
+#
+# 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 ()