Title: [96607] trunk/Source/WebCore
- Revision
- 96607
- Author
- lean...@webkit.org
- Date
- 2011-10-04 10:44:49 -0700 (Tue, 04 Oct 2011)
Log Message
[CMake] Unreviewed: pass feature definitions in the right format for the CSS scripts.
The Perl scripts in the css/ directory expect the definitions passed via
--defines to be a string of space-separated entries, however we were passing a
list of semicolon-separated strings, thus making all feature defines actually
be ignored.
Detected after r96433, which checked for some definitions in
CSSPropertyNames.in.
No new tests, this is a build fix.
* CMakeLists.txt:
Modified Paths
Diff
Modified: trunk/Source/WebCore/CMakeLists.txt (96606 => 96607)
--- trunk/Source/WebCore/CMakeLists.txt 2011-10-04 17:39:33 UTC (rev 96606)
+++ trunk/Source/WebCore/CMakeLists.txt 2011-10-04 17:44:49 UTC (rev 96607)
@@ -2279,6 +2279,13 @@
ADD_SOURCE_WEBCORE_DERIVED_DEPENDENCIES(${WEBCORE_DIR}/css/CSSParser.cpp tokenizer.cpp)
+# Replace ";" with "space" in order to recognize feature definition in css files.
+SET(FEATURE_DEFINES_WITH_SPACE_SEPARATOR "")
+FOREACH(_feature ${FEATURE_DEFINES})
+ SET(FEATURE_DEFINES_WITH_SPACE_SEPARATOR "${FEATURE_DEFINES_WITH_SPACE_SEPARATOR} ${_feature}")
+ENDFOREACH()
+
+
# Generate CSS property names
ADD_CUSTOM_COMMAND (
OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/CSSPropertyNames.in ${DERIVED_SOURCES_WEBCORE_DIR}/CSSPropertyNames.h ${DERIVED_SOURCES_WEBCORE_DIR}/CSSPropertyNames.cpp ${DERIVED_SOURCES_WEBCORE_DIR}/CSSPropertyNames.gperf
@@ -2286,7 +2293,7 @@
DEPENDS ${WebCore_CSS_PROPERTY_NAMES}
WORKING_DIRECTORY ${DERIVED_SOURCES_WEBCORE_DIR}
COMMAND ${PERL_EXECUTABLE} -ne "print" ${WebCore_CSS_PROPERTY_NAMES} > ${DERIVED_SOURCES_WEBCORE_DIR}/CSSPropertyNames.in
- COMMAND ${PERL_EXECUTABLE} -I${WEBCORE_DIR}/bindings/scripts ${WEBCORE_DIR}/css/makeprop.pl --defines "${FEATURE_DEFINES}" --preprocessor "${CODE_GENERATOR_PREPROCESSOR}"
+ COMMAND ${PERL_EXECUTABLE} -I${WEBCORE_DIR}/bindings/scripts ${WEBCORE_DIR}/css/makeprop.pl --defines "${FEATURE_DEFINES_WITH_SPACE_SEPARATOR}" --preprocessor "${CODE_GENERATOR_PREPROCESSOR}"
VERBATIM)
LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/CSSPropertyNames.cpp)
ADD_SOURCE_WEBCORE_DERIVED_DEPENDENCIES(${WEBCORE_DIR}/css/CSSParser.cpp CSSValueKeywords.h)
@@ -2300,19 +2307,13 @@
DEPENDS ${WebCore_CSS_VALUE_KEYWORDS}
WORKING_DIRECTORY ${DERIVED_SOURCES_WEBCORE_DIR}
COMMAND ${PERL_EXECUTABLE} -ne "print" ${WebCore_CSS_VALUE_KEYWORDS} > ${DERIVED_SOURCES_WEBCORE_DIR}/CSSValueKeywords.in
- COMMAND ${PERL_EXECUTABLE} -I${WEBCORE_DIR}/bindings/scripts ${WEBCORE_DIR}/css/makevalues.pl --defines "${FEATURE_DEFINES}" --preprocessor "${CODE_GENERATOR_PREPROCESSOR}"
+ COMMAND ${PERL_EXECUTABLE} -I${WEBCORE_DIR}/bindings/scripts ${WEBCORE_DIR}/css/makevalues.pl --defines "${FEATURE_DEFINES_WITH_SPACE_SEPARATOR}" --preprocessor "${CODE_GENERATOR_PREPROCESSOR}"
VERBATIM)
LIST(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/CSSValueKeywords.cpp)
ADD_SOURCE_WEBCORE_DERIVED_DEPENDENCIES(${WEBCORE_DIR}/css/CSSParser.cpp CSSValueKeywords.h)
ADD_SOURCE_WEBCORE_DERIVED_DEPENDENCIES(${WEBCORE_DIR}/css/CSSPrimitiveValueMappings.h CSSValueKeywords.h)
ADD_SOURCE_WEBCORE_DERIVED_DEPENDENCIES(${DERIVED_SOURCES_WEBCORE_DIR}/CSSGrammar.cpp CSSValueKeywords.h)
-# Replace ";" with "space" in order to recognize feature definition in css files.
-SET(FEATURE_DEFINES_WITH_SPACE_SEPARATOR "")
-FOREACH(_feature ${FEATURE_DEFINES})
- SET(FEATURE_DEFINES_WITH_SPACE_SEPARATOR "${FEATURE_DEFINES_WITH_SPACE_SEPARATOR} ${_feature}")
-ENDFOREACH()
-
# Generate user agent styles
ADD_CUSTOM_COMMAND(
OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/UserAgentStyleSheetsData.cpp ${DERIVED_SOURCES_WEBCORE_DIR}/UserAgentStyleSheets.h
Modified: trunk/Source/WebCore/ChangeLog (96606 => 96607)
--- trunk/Source/WebCore/ChangeLog 2011-10-04 17:39:33 UTC (rev 96606)
+++ trunk/Source/WebCore/ChangeLog 2011-10-04 17:44:49 UTC (rev 96607)
@@ -1,3 +1,19 @@
+2011-10-04 Leandro Pereira <lean...@profusion.mobi>
+
+ [CMake] Unreviewed: pass feature definitions in the right format for the CSS scripts.
+
+ The Perl scripts in the css/ directory expect the definitions passed via
+ --defines to be a string of space-separated entries, however we were passing a
+ list of semicolon-separated strings, thus making all feature defines actually
+ be ignored.
+
+ Detected after r96433, which checked for some definitions in
+ CSSPropertyNames.in.
+
+ No new tests, this is a build fix.
+
+ * CMakeLists.txt:
+
2011-10-04 Pavel Feldman <pfeld...@google.com>
Web Inspector: make SourceFrame compile.
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
