[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 19919bf786ca6b5194ea85f16f50b06e38c277bf
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Aug 16 03:28:58 2010 +0000

    2010-08-15  Ryuan Choi  <ryuan.choi at samsung.com>
    
            Reviewed by Antonio Gomes.
    
            [EFL] Build error on r65378
            https://bugs.webkit.org/show_bug.cgi?id=44019
    
            Add GENERATE_JSON macro for HTMLEntityNames.json instead of HTMLEntityNames.gperf
    
            * cmake/WebKitMacros.cmake:
    2010-08-15  Ryuan Choi  <ryuan.choi at samsung.com>
    
            Reviewed by Antonio Gomes.
    
            [EFL] Build error on r65378
            https://bugs.webkit.org/show_bug.cgi?id=44019
    
            Change build script for HTMLEntityNames.json instead of HTMLEntityNames.gperf
    
            * CMakeLists.txt:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65391 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index e9f3b78..33edad9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2010-08-15  Ryuan Choi  <ryuan.choi at samsung.com>
+
+        Reviewed by Antonio Gomes.
+
+        [EFL] Build error on r65378
+        https://bugs.webkit.org/show_bug.cgi?id=44019
+
+        Add GENERATE_JSON macro for HTMLEntityNames.json instead of HTMLEntityNames.gperf
+
+        * cmake/WebKitMacros.cmake:
+
 2010-08-14  Patrick Gansterer  <paroga at paroga.com>
 
         Reviewed by Kenneth Rohde Christiansen.
diff --git a/WebCore/CMakeLists.txt b/WebCore/CMakeLists.txt
index 32cd8fc..904b8a2 100644
--- a/WebCore/CMakeLists.txt
+++ b/WebCore/CMakeLists.txt
@@ -529,7 +529,7 @@ ENDIF()
 
 SET(WebCore_SOURCES
     ${DERIVED_SOURCES_DIR}/HTMLElementFactory.cpp
-    ${DERIVED_SOURCES_DIR}/HTMLEntityNames.cpp
+    ${DERIVED_SOURCES_DIR}/HTMLEntityTable.cpp
     ${DERIVED_SOURCES_DIR}/HTMLNames.cpp
     ${DERIVED_SOURCES_DIR}/JSHTMLElementWrapperFactory.cpp
     ${DERIVED_SOURCES_DIR}/MathMLElementFactory.cpp
@@ -1845,9 +1845,7 @@ GENERATE_INSPECTOR_FROM_IDL(inspector/Inspector.idl)
 LIST(APPEND WebCore_SOURCES ${JS_IDL_FILES} ${Inspector_IDL_FILES})
 
 
-GENERATE_GPERF(${WEBCORE_DIR}/html/HTMLEntityNames.gperf ${DERIVED_SOURCES_DIR}/HTMLEntityNames.cpp findEntity "-c")
-ADD_SOURCE_DERIVED_DEPENDENCIES(${WEBCORE_DIR}/html/LegacyPreloadScanner.cpp HTMLEntityNames.cpp)
-ADD_SOURCE_DERIVED_DEPENDENCIES(${WEBCORE_DIR}/html/HTMLEntityParser.cpp HTMLEntityNames.cpp)
+GENERATE_JSON(${WEBCORE_DIR}/html/HTMLEntityNames.json ${DERIVED_SOURCES_DIR}/HTMLEntityTable.cpp ${WEBCORE_DIR}/../WebKitTools/Scripts/create-html-entity-table)
 
 
 GENERATE_GPERF(${WEBCORE_DIR}/platform/ColorData.gperf ${DERIVED_SOURCES_DIR}/ColorData.cpp findColor "")
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 3383e62..5499b1d 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2010-08-15  Ryuan Choi  <ryuan.choi at samsung.com>
+
+        Reviewed by Antonio Gomes.
+
+        [EFL] Build error on r65378
+        https://bugs.webkit.org/show_bug.cgi?id=44019
+
+        Change build script for HTMLEntityNames.json instead of HTMLEntityNames.gperf
+
+        * CMakeLists.txt:
+
 2010-08-15  Kevin Ollivier  <kevino at theolliviers.com>
 
         [wx] Build fix, add missing header.
diff --git a/cmake/WebKitMacros.cmake b/cmake/WebKitMacros.cmake
index f79f196..147843c 100644
--- a/cmake/WebKitMacros.cmake
+++ b/cmake/WebKitMacros.cmake
@@ -110,3 +110,12 @@ MACRO (WEBKIT_WRAP_SOURCELIST _input)
         ENDFOREACH ()
     ENDIF ()
 ENDMACRO ()
+
+
+MACRO (GENERATE_JSON _json _output _script)
+    ADD_CUSTOM_COMMAND(
+        OUTPUT ${_output}
+        MAIN_DEPENDENCY ${_input} ${_script}
+        COMMAND ${PYTHON_EXECUTABLE} ${_script} -o ${_output} ${_json}
+        VERBATIM)
+ENDMACRO ()

-- 
WebKit Debian packaging