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

[paroga at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit fba4045860c02996e3019dd45d007a6c98c56c88
Author: paroga at webkit.org <paroga at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Dec 1 03:19:14 2010 +0000

    2010-11-30  Patrick Gansterer  <paroga at webkit.org>
    
            Reviewed by Andreas Kling.
    
            Move CSS generator logic into main CMakeLists.txt file
            https://bugs.webkit.org/show_bug.cgi?id=50230
    
            * CMakeLists.txt:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73003 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/CMakeLists.txt b/WebCore/CMakeLists.txt
index c7f1d16..3da0da5 100644
--- a/WebCore/CMakeLists.txt
+++ b/WebCore/CMakeLists.txt
@@ -540,8 +540,6 @@ ENDIF()
 
 SET(WebCore_SOURCES
     ${DERIVED_SOURCES_DIR}/DocTypeStrings.cpp
-    ${DERIVED_SOURCES_DIR}/CSSValueKeywords.cpp
-    ${DERIVED_SOURCES_DIR}/CSSPropertyNames.cpp
     ${DERIVED_SOURCES_DIR}/ColorData.cpp
     ${DERIVED_SOURCES_DIR}/InspectorBackendDispatcher.cpp
     ${DERIVED_SOURCES_DIR}/JSWebSocket.cpp
@@ -1617,6 +1615,14 @@ SET(WebCore_SOURCES
     xml/XSLTUnicodeSort.cpp
 )
 
+SET(WebCore_CSS_PROPERTY_NAMES
+    ${WEBCORE_DIR}/css/CSSPropertyNames.in
+)
+
+SET(WebCore_CSS_VALUE_KEYWORDS
+    ${WEBCORE_DIR}/css/CSSValueKeywords.in
+)
+
 SET(WebCore_USER_AGENT_STYLE_SHEETS
     ${WEBCORE_DIR}/css/html.css
     ${WEBCORE_DIR}/css/mathml.css
@@ -1938,6 +1944,14 @@ IF (ENABLE_SVG)
         svg/graphics/filters/SVGFilterBuilder.cpp
         svg/properties/SVGPathSegListPropertyTearOff.cpp
     )
+
+    LIST(APPEND WebCore_CSS_PROPERTY_NAMES
+        ${WEBCORE_DIR}/css/SVGCSSPropertyNames.in
+    )
+
+    LIST(APPEND WebCore_CSS_VALUE_KEYWORDS
+        ${WEBCORE_DIR}/css/SVGCSSValueKeywords.in
+    )
 ENDIF()
 
 IF (ENABLE_VIDEO)
@@ -2050,6 +2064,35 @@ ADD_CUSTOM_COMMAND(
 ADD_SOURCE_DERIVED_DEPENDENCIES(${WEBCORE_DIR}/css/CSSParser.cpp tokenizer.cpp)
 
 
+# Generate CSS property names
+ADD_CUSTOM_COMMAND (
+    OUTPUT ${DERIVED_SOURCES_DIR}/CSSPropertyNames.in ${DERIVED_SOURCES_DIR}/CSSPropertyNames.h ${DERIVED_SOURCES_DIR}/CSSPropertyNames.cpp ${DERIVED_SOURCES_DIR}/CSSPropertyNames.gperf
+    MAIN_DEPENDENCY ${WEBCORE_DIR}/css/makeprop.pl
+    DEPENDS ${WebCore_CSS_PROPERTY_NAMES}
+    WORKING_DIRECTORY ${DERIVED_SOURCES_DIR}
+    COMMAND ${PERL_EXECUTABLE} -ne "print" ${WebCore_CSS_PROPERTY_NAMES} > ${DERIVED_SOURCES_DIR}/CSSPropertyNames.in
+    COMMAND ${PERL_EXECUTABLE} ${WEBCORE_DIR}/css/makeprop.pl
+    VERBATIM)
+LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_DIR}/CSSPropertyNames.cpp)
+ADD_SOURCE_DERIVED_DEPENDENCIES(${WEBCORE_DIR}/css/CSSParser.cpp CSSValueKeywords.h)
+ADD_SOURCE_DERIVED_DEPENDENCIES(${DERIVED_SOURCES_DIR}/CSSGrammar.cpp CSSPropertyNames.h)
+
+
+# Generate CSS value keywords
+ADD_CUSTOM_COMMAND (
+    OUTPUT ${DERIVED_SOURCES_DIR}/CSSValueKeywords.in ${DERIVED_SOURCES_DIR}/CSSValueKeywords.h ${DERIVED_SOURCES_DIR}/CSSValueKeywords.cpp ${DERIVED_SOURCES_DIR}/CSSValueKeywords.gperf
+    MAIN_DEPENDENCY ${WEBCORE_DIR}/css/makevalues.pl
+    DEPENDS ${WebCore_CSS_VALUE_KEYWORDS}
+    WORKING_DIRECTORY ${DERIVED_SOURCES_DIR}
+    COMMAND ${PERL_EXECUTABLE} -ne "print lc" ${WebCore_CSS_VALUE_KEYWORDS} > ${DERIVED_SOURCES_DIR}/CSSValueKeywords.in
+    COMMAND ${PERL_EXECUTABLE} ${WEBCORE_DIR}/css/makevalues.pl
+    VERBATIM)
+LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_DIR}/CSSValueKeywords.cpp)
+ADD_SOURCE_DERIVED_DEPENDENCIES(${WEBCORE_DIR}/css/CSSParser.cpp CSSValueKeywords.h)
+ADD_SOURCE_DERIVED_DEPENDENCIES(${WEBCORE_DIR}/css/CSSPrimitiveValueMappings.h CSSValueKeywords.h)
+ADD_SOURCE_DERIVED_DEPENDENCIES(${DERIVED_SOURCES_DIR}/CSSGrammar.cpp CSSValueKeywords.h)
+
+
 # Generate user agent styles
 ADD_CUSTOM_COMMAND(
     OUTPUT ${DERIVED_SOURCES_DIR}/UserAgentStyleSheetsData.cpp ${DERIVED_SOURCES_DIR}/UserAgentStyleSheets.h
@@ -2069,14 +2112,8 @@ GENERATE_GRAMMAR(xpathyy ${WEBCORE_DIR}/xml/XPathGrammar.y ${DERIVED_SOURCES_DIR
 LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_DIR}/XPathGrammar.cpp)
 
 
-GENERATE_CSS_PROPERTY_NAMES()
-GENERATE_CSS_VALUE_KEYWORDS()
-
 
 ADD_SOURCE_DERIVED_DEPENDENCIES(${DERIVED_SOURCES_DIR}/HashTools.h DocTypeStrings.cpp CSSValueKeywords.cpp CSSPropertyNames.cpp ColorData.cpp)
-ADD_SOURCE_DERIVED_DEPENDENCIES(${DERIVED_SOURCES_DIR}/CSSGrammar.cpp CSSValueKeywords.h)
-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/HTMLTreeBuilder.cpp MathMLNames.cpp)
 
 
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index c234c90..010ef93 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2010-11-30  Patrick Gansterer  <paroga at webkit.org>
+
+        Reviewed by Andreas Kling.
+
+        Move CSS generator logic into main CMakeLists.txt file
+        https://bugs.webkit.org/show_bug.cgi?id=50230
+
+        * CMakeLists.txt:
+
 2010-11-30  Ojan Vafai  <ojan at chromium.org>
 
         Revert r72876. It caused a ~30% perf regression in chromium's bloat-http test

-- 
WebKit Debian packaging