Attachment 56159 Details for Bug 39164 – Patch

[patch] Patch

bug-39164.patch (text/plain), 18.06 KB, created by Patrick R. Gansterer on 2010-05-15 11:04:26 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Patrick R. Gansterer

Created: 2010-05-15 11:04:26 PDT

Size: 18.06 KB

patch

obsolete

>Index: ChangeLog
>===================================================================
>--- ChangeLog	(revision 59539)
>+++ ChangeLog	(working copy)
>@@ -1,3 +1,13 @@
>+2010-05-15  Patrick Gansterer  <paroga@paroga.com>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        [CMake] Cleanup generator code and port it to windows.
>+        https://bugs.webkit.org/show_bug.cgi?id=39164
>+
>+        * cmake/WebKitGenerators.cmake:
>+        * cmake/WebKitMacros.cmake:
>+
> 2010-05-15  Leandro Pereira  <leandro@profusion.mobi>
> 
>         Reviewed by Adam Treat.
>Index: cmake/WebKitGenerators.cmake
>===================================================================
>--- cmake/WebKitGenerators.cmake	(revision 59539)
>+++ cmake/WebKitGenerators.cmake	(working copy)
>@@ -7,89 +7,6 @@
> 
> INCLUDE (WebKitFS)
> 
>-FIND_PACKAGE(Perl REQUIRED)
>-
>-# - Create hash table *.lut.h
>-# GENERATE_HASH_LUT(input_file output_file)
>-MACRO(GENERATE_HASH_LUT _input _output)
>-    SET(HASH_LUT_GENERATOR "${JAVASCRIPTCORE_DIR}/create_hash_table")
>-
>-    FOREACH (_tmp ${ARGN})
>-        IF (${_tmp} STREQUAL "MAIN_DEPENDENCY")
>-            SET(_main_dependency ${_input})
>-        ENDIF ()
>-    ENDFOREACH ()
>-
>-    ADD_CUSTOM_COMMAND(
>-        OUTPUT ${_output}
>-        MAIN_DEPENDENCY ${_main_dependency}
>-        DEPENDS ${_input} ${HASH_LUT_GENERATOR}
>-        COMMAND ${PERL_EXECUTABLE} ${HASH_LUT_GENERATOR} ${_input} > ${_output}
>-        VERBATIM)
>-ENDMACRO()
>-
>-# - Create hash table *.lut.h using at JavaScriptCore/runtime
>-# GENERATE_HASH_LUT_RUNTIME(source)
>-#
>-# The generated files lives in ${CMAKE_BINARY_DIR}/JavaScriptCore/runtime/
>-# and will have suffix ".lut.h"
>-#
>-# Input file is assumed to be in JavaScriptCore/runtime/${source}.cpp
>-MACRO(GENERATE_HASH_LUT_RUNTIME _file)
>-  ADD_CUSTOM_COMMAND(
>-    OUTPUT  ${CMAKE_BINARY_DIR}/JavaScriptCore/runtime/${_file}.lut.h
>-    DEPENDS ${JAVASCRIPTCORE_DIR}/runtime/${_file}.cpp  ${HASH_LUT_GENERATOR}
>-    COMMAND ${PERL_EXECUTABLE} ${HASH_LUT_GENERATOR} ${JAVASCRIPTCORE_DIR}/runtime/${_file}.cpp -i > ${CMAKE_BINARY_DIR}/JavaScriptCore/runtime/${_file}.lut.h
>-    VERBATIM)
>-  LIST(APPEND GENERATED_HASH_LUT_RUNTIME_FILES "${CMAKE_BINARY_DIR}/JavaScriptCore/runtime/${_file}.lut.h")
>-ENDMACRO()
>-
>-
>-FIND_PROGRAM (BISON_EXECUTABLE bison)
>-IF (NOT BISON_EXECUTABLE)
>-  MESSAGE(FATAL_ERROR "Missing bison")
>-ENDIF (NOT BISON_EXECUTABLE)
>-FIND_PACKAGE_HANDLE_STANDARD_ARGS(Bison DEFAULT_MSG BISON_EXECUTABLE)
>-
>-# - Create a grammar using bison.
>-# GENERATE_GRAMMAR(prefix source_file)
>-#
>-# Reads a source_file (*.y) Generates the .cpp and .h files in
>-# ${DERIVED_SOURCES_DIR}
>-MACRO(GENERATE_GRAMMAR _prefix _source)
>-  GET_FILENAME_COMPONENT(_name ${_source} NAME_WE)
>-  SET(_out_base ${DERIVED_SOURCES_DIR}/${_name})
>-  ADD_CUSTOM_COMMAND(
>-    OUTPUT  ${_out_base}.cpp ${_out_base}.h
>-    DEPENDS ${_source}
>-    COMMAND ${BISON_EXECUTABLE} -p ${_prefix} ${_source} -o ${_out_base}.cpp --defines=${_out_base}.h
>-    VERBATIM)
>-  UNSET(_out_base)
>-  UNSET(_name)
>-ENDMACRO ()
>-
>-
>-FIND_PROGRAM(GPERF_EXECUTABLE gperf)
>-IF (NOT GPERF_EXECUTABLE)
>-  MESSAGE(FATAL_ERROR "Missing gperf")
>-ENDIF ()
>-FIND_PACKAGE_HANDLE_STANDARD_ARGS(GPerf DEFAULT_MSG GPERF_EXECUTABLE)
>-
>-# - 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)
>-  GET_FILENAME_COMPONENT(_name ${_source} NAME_WE)
>-  ADD_CUSTOM_COMMAND(
>-    OUTPUT ${DERIVED_SOURCES_DIR}/${_name}.${_ext}
>-    DEPENDS ${_source}
>-    COMMAND ${GPERF_EXECUTABLE} -CDEGIot -L ANSI-C -k * -s 2 -N ${_func} ${_opts} --output-file=${DERIVED_SOURCES_DIR}/${_name}.${_ext} ${_source}
>-    VERBATIM)
>-ENDMACRO ()
>-
>-
> # Modules that the bindings generator scripts may use
> SET(SCRIPTS_BINDINGS
>   ${WEBCORE_DIR}/bindings/scripts/CodeGenerator.pm
>@@ -183,76 +100,3 @@
>     COMMAND ${PERL_EXECUTABLE} ${JAVASCRIPTCORE_DIR}/pcre/dftables ${CMAKE_BINARY_DIR}/JavaScriptCore/pcre/chartables.c
>     VERBATIM)
> ENDMACRO()
>-
>-
>-FIND_PROGRAM(FLEX_EXECUTABLE flex)
>-IF (NOT FLEX_EXECUTABLE)
>-  MESSAGE(FATAL_ERROR "Missing flex")
>-ENDIF ()
>-FIND_PACKAGE_HANDLE_STANDARD_ARGS(Flex DEFAULT_MSG FLEX_EXECUTABLE)
>-
>-SET(MAKE_TOKENIZER ${WEBCORE_DIR}/css/maketokenizer)
>-# - Create ${DERIVED_SOURCES_DIR}/tokenizer.cpp
>-# GENERATE_TOKENIZER()
>-MACRO(GENERATE_TOKENIZER)
>-  ADD_CUSTOM_COMMAND(
>-    OUTPUT ${DERIVED_SOURCES_DIR}/tokenizer.cpp
>-    DEPENDS ${WEBCORE_DIR}/css/tokenizer.flex ${MAKE_TOKENIZER}
>-    COMMAND ${FLEX_EXECUTABLE} -t ${WEBCORE_DIR}/css/tokenizer.flex | ${PERL_EXECUTABLE} ${MAKE_TOKENIZER} > ${DERIVED_SOURCES_DIR}/tokenizer.cpp
>-    VERBATIM)
>-ENDMACRO()
>-
>-
>-SET(USER_AGENT_STYLE_SHEETS
>-  ${WEBCORE_DIR}/css/html.css
>-  ${WEBCORE_DIR}/css/mathml.css
>-  ${WEBCORE_DIR}/css/quirks.css
>-  ${WEBCORE_DIR}/css/view-source.css
>-  ${WEBCORE_DIR}/css/svg.css
>-  ${WEBCORE_DIR}/css/wml.css
>-  ${WEBCORE_DIR}/css/mediaControls.css
>-  ${WEBCORE_DIR}/css/mediaControlsGtk.css)
>-SET(USER_AGENT_STYLE_SHEETS_GENERATOR ${WEBCORE_DIR}/css/make-css-file-arrays.pl)
>-# - Create ${DERIVED_SOURCES_DIR}/UserAgentStyleSheetsData.cpp and
>-#   ${DERIVED_SOURCES_DIR}/UserAgentStyleSheets.h
>-# GENERATE_USER_AGENT_STYLES()
>-MACRO(GENERATE_USER_AGENT_STYLES)
>-  ADD_CUSTOM_COMMAND(
>-    OUTPUT ${DERIVED_SOURCES_DIR}/UserAgentStyleSheetsData.cpp ${DERIVED_SOURCES_DIR}/UserAgentStyleSheets.h
>-    DEPENDS ${USER_AGENT_STYLE_SHEETS_GENERATOR} ${USER_AGENT_STYLE_SHEETS}
>-    COMMAND ${PERL_EXECUTABLE} ${USER_AGENT_STYLE_SHEETS_GENERATOR} ${DERIVED_SOURCES_DIR}/UserAgentStyleSheets.h ${DERIVED_SOURCES_DIR}/UserAgentStyleSheetsData.cpp ${USER_AGENT_STYLE_SHEETS}
>-    VERBATIM)
>-ENDMACRO ()
>-
>-
>-SET(CSS_VALUE_KEYWORDS
>-  ${WEBCORE_DIR}/css/CSSValueKeywords.in
>-  ${WEBCORE_DIR}/css/SVGCSSValueKeywords.in)
>-SET(CSS_VALUE_GENERATOR ${WEBCORE_DIR}/css/makevalues.pl)
>-# - Create ${DERIVED_SOURCES_DIR}/CSSValueKeywords.*
>-# GENERATE_CSS_VALUE_KEYWORDS()
>-MACRO(GENERATE_CSS_VALUE_KEYWORDS)
>-  ADD_CUSTOM_COMMAND(
>-    OUTPUT ${DERIVED_SOURCES_DIR}/CSSValueKeywords.h ${DERIVED_SOURCES_DIR}/CSSValueKeywords.c ${DERIVED_SOURCES_DIR}/CSSValueKeywords.in ${DERIVED_SOURCES_DIR}/CSSValueKeywords.gperf
>-    DEPENDS ${CSS_VALUE_KEYWORDS} ${CSS_VALUE_GENERATOR}
>-    WORKING_DIRECTORY ${DERIVED_SOURCES_DIR}
>-    COMMAND ${PERL_EXECUTABLE} -ne "print lc" ${CSS_VALUE_KEYWORDS} > ${DERIVED_SOURCES_DIR}/CSSValueKeywords.in
>-    COMMAND ${PERL_EXECUTABLE} ${CSS_VALUE_GENERATOR}
>-    VERBATIM)
>-ENDMACRO ()
>-
>-SET(CSS_PROPERTY_NAMES
>-  ${WEBCORE_DIR}/css/CSSPropertyNames.in
>-  ${WEBCORE_DIR}/css/SVGCSSPropertyNames.in)
>-SET(MAKE_CSS_PROP ${WEBCORE_DIR}/css/makeprop.pl)
>-# - Create ${DERIVED_SOURCES_DIR}/CSSPropertyNames.*
>-# GENERATE_CSS_PROPERTY_NAMES()
>-MACRO(GENERATE_CSS_PROPERTY_NAMES)
>-  ADD_CUSTOM_COMMAND(
>-    OUTPUT ${DERIVED_SOURCES_DIR}/CSSPropertyNames.h ${DERIVED_SOURCES_DIR}/CSSPropertyNames.cpp ${DERIVED_SOURCES_DIR}/CSSPropertyNames.in ${DERIVED_SOURCES_DIR}/CSSPropertyNames.gperf
>-    DEPENDS ${MAKE_CSS_PROP} ${CSS_PROPERTY_NAMES}
>-    WORKING_DIRECTORY ${DERIVED_SOURCES_DIR}
>-    COMMAND cat ${CSS_PROPERTY_NAMES} > ${DERIVED_SOURCES_DIR}/CSSPropertyNames.in
>-    COMMAND ${PERL_EXECUTABLE} ${MAKE_CSS_PROP}
>-    VERBATIM)
>-ENDMACRO ()
>Index: cmake/WebKitMacros.cmake
>===================================================================
>--- cmake/WebKitMacros.cmake	(revision 59539)
>+++ cmake/WebKitMacros.cmake	(working copy)
>@@ -1,28 +1,67 @@
>-MACRO(INCLUDE_IF_EXISTS _file)
>+MACRO (INCLUDE_IF_EXISTS _file)
>     IF (EXISTS ${_file})
>         MESSAGE(STATUS "Using platform-specific CMakeLists: ${_file}")
> 	INCLUDE(${_file})
>     ELSE ()
>         MESSAGE(STATUS "Platform-specific CMakeLists not found: ${_file}")
>     ENDIF ()
>-ENDMACRO()
>+ENDMACRO ()
> 
> # Append the given dependencies to the source file
>-MACRO(ADD_SOURCE_DEPENDENCIES _source _deps)
>-    GET_SOURCE_FILE_PROPERTY (_tmp ${_source} OBJECT_DEPENDS)
>+MACRO (ADD_SOURCE_DEPENDENCIES _source _deps)
>+    GET_SOURCE_FILE_PROPERTY(_tmp ${_source} OBJECT_DEPENDS)
>     IF (NOT _tmp)
>-        SET (_tmp "")
>+        SET(_tmp "")
>     ENDIF ()
> 
>     FOREACH (f ${_deps})
>         LIST(APPEND _tmp "${f}")
>     ENDFOREACH ()
> 
>-    SET_SOURCE_FILES_PROPERTIES (${_source} PROPERTIES OBJECT_DEPENDS "${_tmp}")
>+    SET_SOURCE_FILES_PROPERTIES(${_source} PROPERTIES OBJECT_DEPENDS "${_tmp}")
>     UNSET(_tmp)
>-ENDMACRO()
>+ENDMACRO ()
> 
>-MACRO(WEBKIT_WRAP_SOURCELIST _input)
>+
>+# - Create hash table *.lut.h
>+# GENERATE_HASH_LUT(input_file output_file)
>+MACRO (GENERATE_HASH_LUT _input _output)
>+    SET(HASH_LUT_GENERATOR "${JAVASCRIPTCORE_DIR}/create_hash_table")
>+
>+    FOREACH (_tmp ${ARGN})
>+        IF (${_tmp} STREQUAL "MAIN_DEPENDENCY")
>+            SET(_main_dependency ${_input})
>+        ENDIF ()
>+    ENDFOREACH ()
>+
>+    ADD_CUSTOM_COMMAND(
>+        OUTPUT ${_output}
>+        MAIN_DEPENDENCY ${_main_dependency}
>+        DEPENDS ${_input} ${HASH_LUT_GENERATOR}
>+        COMMAND ${PERL_EXECUTABLE} ${HASH_LUT_GENERATOR} ${_input} > ${_output}
>+        VERBATIM)
>+ENDMACRO ()
>+
>+
>+MACRO (GENERATE_GRAMMAR _prefix _input _output_header _output_source)
>+    ADD_CUSTOM_COMMAND(
>+        OUTPUT ${_output_header} ${_output_source}
>+        MAIN_DEPENDENCY ${_input}
>+        COMMAND ${BISON_EXECUTABLE} -p ${_prefix} ${_input} -o ${_output_source} --defines=${_output_header}
>+        VERBATIM)
>+ENDMACRO ()
>+
>+
>+MACRO (GENERATE_GPERF _input _output _func _opts)
>+    ADD_CUSTOM_COMMAND(
>+        OUTPUT ${_output}
>+        MAIN_DEPENDENCY ${_input}
>+        COMMAND ${GPERF_EXECUTABLE} -CDEGIot -L ANSI-C --key-positions=* -s 2 -N ${_func} ${_opts} < ${_input} > ${_output}
>+        VERBATIM)
>+ENDMACRO ()
>+
>+
>+MACRO (WEBKIT_WRAP_SOURCELIST _input)
>     IF (WTF_PLATFORM_QT)
>         FOREACH (_file ${ARGN})
>             GET_FILENAME_COMPONENT(_basename ${_file} NAME_WE)
>@@ -34,7 +73,7 @@
>             IF (_match)
>                 QT4_GENERATE_MOC(${_file} ${_moc_filename})
>                 ADD_SOURCE_DEPENDENCIES(${_file} ${_moc_filename})
>-            ENDIF()
>+            ENDIF ()
>         ENDFOREACH ()
>     ENDIF ()
>-ENDMACRO()
>+ENDMACRO ()
>
>Property changes on: cmake\WebKitMacros.cmake
>___________________________________________________________________
>Added: svn:eol-style
>   + native
>
>Index: JavaScriptCore/ChangeLog
>===================================================================
>--- JavaScriptCore/ChangeLog	(revision 59539)
>+++ JavaScriptCore/ChangeLog	(working copy)
>@@ -1,3 +1,12 @@
>+2010-05-15  Patrick Gansterer  <paroga@paroga.com>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        [CMake] Cleanup generator code and port it to windows.
>+        https://bugs.webkit.org/show_bug.cgi?id=39164
>+
>+        * CMakeLists.txt:
>+
> 2010-05-15  Leandro Pereira  <leandro@profusion.mobi>
> 
>         Reviewed by Adam Treat.
>Index: JavaScriptCore/CMakeLists.txt
>===================================================================
>--- JavaScriptCore/CMakeLists.txt	(revision 59539)
>+++ JavaScriptCore/CMakeLists.txt	(working copy)
>@@ -197,13 +197,9 @@
> GENERATE_HASH_LUT(${JAVASCRIPTCORE_DIR}/parser/Keywords.table ${DERIVED_SOURCES_DIR}/Lexer.lut.h MAIN_DEPENDENCY)
> LIST(APPEND JavaScriptCore_HEADERS ${DERIVED_SOURCES_DIR}/Lexer.lut.h)
> 
>+
> # GENERATOR 2: bison grammar
>-ADD_CUSTOM_COMMAND(
>-    OUTPUT ${DERIVED_SOURCES_DIR}/Grammar.cpp ${DERIVED_SOURCES_DIR}/Grammar.h
>-    MAIN_DEPENDENCY ${JAVASCRIPTCORE_DIR}/parser/Grammar.y
>-    COMMAND ${BISON_EXECUTABLE} -d -p jscyy ${JAVASCRIPTCORE_DIR}/parser/Grammar.y -o ${DERIVED_SOURCES_DIR}/Grammar.cpp --defines=${DERIVED_SOURCES_DIR}/Grammar.h
>-    COMMENT "[BISON][JSCYY] Building parser with bison"
>-    VERBATIM)
>+GENERATE_GRAMMAR(jscyy ${JAVASCRIPTCORE_DIR}/parser/Grammar.y ${DERIVED_SOURCES_DIR}/Grammar.h ${DERIVED_SOURCES_DIR}/Grammar.cpp)
> LIST(APPEND JavaScriptCore_HEADERS ${DERIVED_SOURCES_DIR}/Grammar.h)
> LIST(APPEND JavaScriptCore_SOURCES ${DERIVED_SOURCES_DIR}/Grammar.cpp)
> 
>
>Property changes on: JavaScriptCore\CMakeLists.txt
>___________________________________________________________________
>Added: svn:eol-style
>   + native
>
>Index: WebCore/ChangeLog
>===================================================================
>--- WebCore/ChangeLog	(revision 59539)
>+++ WebCore/ChangeLog	(working copy)
>@@ -1,3 +1,12 @@
>+2010-05-15  Patrick Gansterer  <paroga@paroga.com>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        [CMake] Cleanup generator code and port it to windows.
>+        https://bugs.webkit.org/show_bug.cgi?id=39164
>+
>+        * CMakeLists.txt:
>+
> 2010-05-15  Leandro Pereira  <leandro@profusion.mobi>
> 
>         Reviewed by Adam Treat.
>Index: WebCore/CMakeLists.txt
>===================================================================
>--- WebCore/CMakeLists.txt	(revision 59539)
>+++ WebCore/CMakeLists.txt	(working copy)
>@@ -489,7 +489,6 @@
> ENDIF()
> 
> SET(WebCore_SOURCES
>-    ${DERIVED_SOURCES_DIR}/CSSGrammar.cpp
>     ${DERIVED_SOURCES_DIR}/HTMLElementFactory.cpp
>     ${DERIVED_SOURCES_DIR}/HTMLEntityNames.c
>     ${DERIVED_SOURCES_DIR}/HTMLNames.cpp
>@@ -497,7 +496,6 @@
>     ${DERIVED_SOURCES_DIR}/UserAgentStyleSheetsData.cpp
>     ${DERIVED_SOURCES_DIR}/XMLNames.cpp
>     ${DERIVED_SOURCES_DIR}/XMLNSNames.cpp
>-    ${DERIVED_SOURCES_DIR}/XPathGrammar.cpp
> 
>     accessibility/AXObjectCache.cpp
>     accessibility/AccessibilityARIAGrid.cpp
>@@ -1396,6 +1394,25 @@
>     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
>+    ${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_SVG)
>     LIST(APPEND WebCore_SOURCES
>         ${DERIVED_SOURCES_DIR}/JSSVGElementWrapperFactory.cpp
>@@ -1602,8 +1619,74 @@
>         svg/graphics/filters/SVGFilterBuilder.cpp
>         svg/graphics/filters/SVGLightSource.cpp
>     )
>+
>+    LIST(APPEND WebCore_CSS_PROPERTY_NAMES
>+        ${WEBCORE_DIR}/css/SVGCSSPropertyNames.in
>+    )
>+
>+    LIST(APPEND WebCore_CSS_VALUE_KEYWORDS
>+        ${WEBCORE_DIR}/css/SVGCSSValueKeywords.in
>+    )
> ENDIF()
> 
>+
>+
>+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
>+    COMMAND ${FLEX_EXECUTABLE} -t ${WEBCORE_DIR}/css/tokenizer.flex | ${PERL_EXECUTABLE_NATIVE_PATH} ${WEBCORE_DIR}/css/maketokenizer > ${DERIVED_SOURCES_DIR}/tokenizer.cpp
>+    VERBATIM)
>+
>+
>+GENERATE_GRAMMAR(cssyy ${WEBCORE_DIR}/css/CSSGrammar.y ${DERIVED_SOURCES_DIR}/CSSGrammar.h ${DERIVED_SOURCES_DIR}/CSSGrammar.cpp)
>+LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_DIR}/CSSGrammar.cpp)
>+
>+
>+GENERATE_GRAMMAR(xpathyy ${WEBCORE_DIR}/xml/XPathGrammar.y ${DERIVED_SOURCES_DIR}/XPathGrammar.h ${DERIVED_SOURCES_DIR}/XPathGrammar.cpp)
>+LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_DIR}/XPathGrammar.cpp)
>+
>+
>+GENERATE_GPERF(${WEBCORE_DIR}/html/HTMLEntityNames.gperf ${DERIVED_SOURCES_DIR}/HTMLEntityNames.c findEntity "-c")
>+
>+
>+GENERATE_GPERF(${WEBCORE_DIR}/platform/ColorData.gperf ${DERIVED_SOURCES_DIR}/ColorData.c findColor "")
>+
>+
>+GENERATE_GPERF(${WEBCORE_DIR}/html/DocTypeStrings.gperf ${DERIVED_SOURCES_DIR}/DocTypeStrings.cpp findDoctypeEntry "-F,PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards")
>+
>+
>+# Generate CSS property names 
>+ADD_CUSTOM_COMMAND (
>+    OUTPUT ${DERIVED_SOURCES_DIR}/CSSPropertyNames.h ${DERIVED_SOURCES_DIR}/CSSPropertyNames.cpp ${DERIVED_SOURCES_DIR}/CSSPropertyNames.in ${DERIVED_SOURCES_DIR}/CSSPropertyNames.gperf
>+    MAIN_DEPENDENCY ${WEBCORE_DIR}/css/makeprop.pl
>+    DEPENDS ${WebCore_CSS_PROPERTY_NAMES}
>+    WORKING_DIRECTORY ${DERIVED_SOURCES_DIR}
>+    COMMAND cat ${WebCore_CSS_PROPERTY_NAMES} > ${DERIVED_SOURCES_DIR}/CSSPropertyNames.in
>+    COMMAND ${PERL_EXECUTABLE} ${WEBCORE_DIR}/css/makeprop.pl
>+    VERBATIM)
>+
>+
>+# Generate CSS value keywords
>+ADD_CUSTOM_COMMAND (
>+    OUTPUT ${DERIVED_SOURCES_DIR}/CSSValueKeywords.h ${DERIVED_SOURCES_DIR}/CSSValueKeywords.c ${DERIVED_SOURCES_DIR}/CSSValueKeywords.in ${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)
>+
>+
>+# 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)
>+
>+
> SET(IDL_INCLUDES "")
> FOREACH (_include ${WebCore_IDL_INCLUDES})
>     LIST(APPEND IDL_INCLUDES --include=${WEBCORE_DIR}/${_include})
>@@ -1619,19 +1702,6 @@
> 
> 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_TOKENIZER()
>-GENERATE_USER_AGENT_STYLES()
>-
>-GENERATE_GRAMMAR(cssyy ${WEBCORE_DIR}/css/CSSGrammar.y)
>-GENERATE_GRAMMAR(xpathyy ${WEBCORE_DIR}/xml/XPathGrammar.y)
>-
>-GENERATE_CSS_PROPERTY_NAMES()
>-GENERATE_CSS_VALUE_KEYWORDS()
>-
> 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)
>
>Property changes on: WebCore\CMakeLists.txt
>___________________________________________________________________
>Added: svn:eol-style
>   + native
>

Flags:

commit-queue: commit-queue-

Actions: View | Formatted Diff | Diff

Attachments on bug 39164: 56156 | 56159 | 63151