[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da
paroga at webkit.org
paroga at webkit.org
Wed Dec 22 17:47:33 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 4ca0835be273a68cdf2ed9c5d937ce6a96a3722d
Author: paroga at webkit.org <paroga at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Nov 30 13:19:24 2010 +0000
2010-11-30 Patrick Gansterer <paroga at webkit.org>
Reviewed by Andreas Kling.
Move generator logic into WebCore CMakeLists.txt file
https://bugs.webkit.org/show_bug.cgi?id=49885
* cmake/WebKitMacros.cmake:
2010-11-30 Patrick Gansterer <paroga at webkit.org>
Reviewed by Andreas Kling.
Move generator logic into main CMakeLists.txt file
https://bugs.webkit.org/show_bug.cgi?id=49885
Also make the generator calls more portable.
* CMakeLists.txt:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72906 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/ChangeLog b/ChangeLog
index f51a36e..2ce2618 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2010-11-30 Patrick Gansterer <paroga at webkit.org>
+
+ Reviewed by Andreas Kling.
+
+ Move generator logic into WebCore CMakeLists.txt file
+ https://bugs.webkit.org/show_bug.cgi?id=49885
+
+ * cmake/WebKitMacros.cmake:
+
2010-11-29 Xan Lopez <xlopez at igalia.com>
Reviewed by Martin Robinson.
diff --git a/WebCore/CMakeLists.txt b/WebCore/CMakeLists.txt
index fa3ce9c..c7f1d16 100644
--- a/WebCore/CMakeLists.txt
+++ b/WebCore/CMakeLists.txt
@@ -543,8 +543,6 @@ SET(WebCore_SOURCES
${DERIVED_SOURCES_DIR}/CSSValueKeywords.cpp
${DERIVED_SOURCES_DIR}/CSSPropertyNames.cpp
${DERIVED_SOURCES_DIR}/ColorData.cpp
- ${DERIVED_SOURCES_DIR}/HTMLEntityTable.cpp
- ${DERIVED_SOURCES_DIR}/UserAgentStyleSheetsData.cpp
${DERIVED_SOURCES_DIR}/InspectorBackendDispatcher.cpp
${DERIVED_SOURCES_DIR}/JSWebSocket.cpp
@@ -1619,6 +1617,17 @@ SET(WebCore_SOURCES
xml/XSLTUnicodeSort.cpp
)
+SET(WebCore_USER_AGENT_STYLE_SHEETS
+ ${WEBCORE_DIR}/css/html.css
+ ${WEBCORE_DIR}/css/mathml.css
+ ${WEBCORE_DIR}/css/mediaControls.css
+ ${WEBCORE_DIR}/css/mediaControlsGtk.css
+ ${WEBCORE_DIR}/css/quirks.css
+ ${WEBCORE_DIR}/css/svg.css
+ ${WEBCORE_DIR}/css/view-source.css
+ ${WEBCORE_DIR}/css/wml.css
+)
+
IF (ENABLE_BLOB)
LIST(APPEND WebCore_SOURCES
fileapi/FileReader.cpp
@@ -2012,17 +2021,44 @@ GENERATE_INSPECTOR_FROM_IDL(inspector/Inspector.idl)
LIST(APPEND WebCore_SOURCES ${JS_IDL_FILES} ${Inspector_IDL_FILES})
-GENERATE_ENTITIES(${WEBCORE_DIR}/html/parser/HTMLEntityNames.in ${DERIVED_SOURCES_DIR}/HTMLEntityTable.cpp ${WEBCORE_DIR}/html/parser/create-html-entity-table)
-
MAKE_HASH_TOOLS(${WEBCORE_DIR}/platform/ColorData)
ADD_SOURCE_DERIVED_DEPENDENCIES(${WEBCORE_DIR}/platform/graphics/Color.cpp ColorData.cpp)
+
MAKE_HASH_TOOLS(${WEBCORE_DIR}/html/DocTypeStrings)
ADD_SOURCE_DERIVED_DEPENDENCIES(${WEBCORE_DIR}/html/HTMLDocument.cpp DocTypeStrings.cpp)
-GENERATE_TOKENIZER()
-GENERATE_USER_AGENT_STYLES()
+# Generate HTML entity table
+ADD_CUSTOM_COMMAND(
+ OUTPUT ${DERIVED_SOURCES_DIR}/HTMLEntityTable.cpp
+ MAIN_DEPENDENCY ${WEBCORE_DIR}/html/parser/HTMLEntityNames.in
+ DEPENDS ${WEBCORE_DIR}/html/parser/create-html-entity-table
+ COMMAND ${PYTHON_EXECUTABLE} ${WEBCORE_DIR}/html/parser/create-html-entity-table -o ${DERIVED_SOURCES_DIR}/HTMLEntityTable.cpp ${WEBCORE_DIR}/html/parser/HTMLEntityNames.in
+ VERBATIM)
+LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_DIR}/HTMLEntityTable.cpp)
+
+
+# Generate tokenizer
+FILE(TO_NATIVE_PATH ${PERL_EXECUTABLE} PERL_EXECUTABLE_NATIVE_PATH)
+ADD_CUSTOM_COMMAND(
+ OUTPUT ${DERIVED_SOURCES_DIR}/tokenizer.cpp
+ MAIN_DEPENDENCY ${WEBCORE_DIR}/css/maketokenizer
+ DEPENDS ${WEBCORE_DIR}/css/tokenizer.flex
+ COMMAND ${FLEX_EXECUTABLE} -t ${WEBCORE_DIR}/css/tokenizer.flex | ${PERL_EXECUTABLE_NATIVE_PATH} ${WEBCORE_DIR}/css/maketokenizer > ${DERIVED_SOURCES_DIR}/tokenizer.cpp
+ VERBATIM)
+ADD_SOURCE_DERIVED_DEPENDENCIES(${WEBCORE_DIR}/css/CSSParser.cpp tokenizer.cpp)
+
+
+# Generate user agent styles
+ADD_CUSTOM_COMMAND(
+ OUTPUT ${DERIVED_SOURCES_DIR}/UserAgentStyleSheetsData.cpp ${DERIVED_SOURCES_DIR}/UserAgentStyleSheets.h
+ MAIN_DEPENDENCY ${WEBCORE_DIR}/css/make-css-file-arrays.pl
+ DEPENDS ${WebCore_USER_AGENT_STYLE_SHEETS}
+ COMMAND ${PERL_EXECUTABLE} ${WEBCORE_DIR}/css/make-css-file-arrays.pl ${DERIVED_SOURCES_DIR}/UserAgentStyleSheets.h ${DERIVED_SOURCES_DIR}/UserAgentStyleSheetsData.cpp ${WebCore_USER_AGENT_STYLE_SHEETS}
+ VERBATIM)
+LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_DIR}/UserAgentStyleSheetsData.cpp)
+ADD_SOURCE_DERIVED_DEPENDENCIES(${WEBCORE_DIR}/css/CSSStyleSelector.cpp UserAgentStyleSheetsData.cpp UserAgentStyleSheets.h)
GENERATE_GRAMMAR(cssyy ${WEBCORE_DIR}/css/CSSGrammar.y ${DERIVED_SOURCES_DIR}/CSSGrammar.h ${DERIVED_SOURCES_DIR}/CSSGrammar.cpp)
@@ -2041,9 +2077,7 @@ ADD_SOURCE_DERIVED_DEPENDENCIES(${DERIVED_SOURCES_DIR}/HashTools.h DocTypeString
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}/css/CSSParser.cpp tokenizer.cpp)
ADD_SOURCE_DERIVED_DEPENDENCIES(${WEBCORE_DIR}/html/HTMLTreeBuilder.cpp MathMLNames.cpp)
-ADD_SOURCE_DERIVED_DEPENDENCIES(${WEBCORE_DIR}/css/CSSStyleSelector.cpp UserAgentStyleSheetsData.cpp UserAgentStyleSheets.h)
GENERATE_DOM_NAMES(HTML ${WEBCORE_DIR}/html/HTMLAttributeNames.in ${WEBCORE_DIR}/html/HTMLTagNames.in "${HTML_FEATURES}")
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index c9606f6..5da7786 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2010-11-30 Patrick Gansterer <paroga at webkit.org>
+
+ Reviewed by Andreas Kling.
+
+ Move generator logic into main CMakeLists.txt file
+ https://bugs.webkit.org/show_bug.cgi?id=49885
+
+ Also make the generator calls more portable.
+
+ * CMakeLists.txt:
+
2010-11-30 Mario Sanchez Prada <msanchez at igalia.com>
Unreviewed, rolling out r72902.
diff --git a/cmake/WebKitMacros.cmake b/cmake/WebKitMacros.cmake
index 5652483..8c1f543 100644
--- a/cmake/WebKitMacros.cmake
+++ b/cmake/WebKitMacros.cmake
@@ -119,12 +119,3 @@ MACRO (WEBKIT_WRAP_SOURCELIST _input)
ENDFOREACH ()
ENDIF ()
ENDMACRO ()
-
-
-MACRO (GENERATE_ENTITIES _input _output _script)
- ADD_CUSTOM_COMMAND(
- OUTPUT ${_output}
- MAIN_DEPENDENCY ${_input} ${_script}
- COMMAND ${PYTHON_EXECUTABLE} ${_script} -o ${_output} ${_input}
- VERBATIM)
-ENDMACRO ()
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list