Title: [168704] releases/WebKitGTK/webkit-2.4/Source
- Revision
- 168704
- Author
- g...@gnome.org
- Date
- 2014-05-13 12:27:45 -0700 (Tue, 13 May 2014)
Log Message
Merge 164979 - [cmake] *Names.cpp file should be regenerated after touching StaticString.pm
https://bugs.webkit.org/show_bug.cgi?id=129031
Patch by Jozsef Berta <jberta.u-sze...@partner.samsung.com> on 2014-03-03
Reviewed by Csaba Osztrogonác.
.:
* Source/cmake/WebKitMacros.cmake: Added a call for make_names.pm dependencies in GENERATE_FONT_NAMES and GENERATE_DOM_NAMES macros.
Source/WebCore:
* CMakeLists.txt: Added make_names.pl dependencies: bindings/scripts/Hasher.pm and bindings/scripts/StaticString.pm
Conflicts:
ChangeLog
Source/WebCore/ChangeLog
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/CMakeLists.txt (168703 => 168704)
--- releases/WebKitGTK/webkit-2.4/Source/WebCore/CMakeLists.txt 2014-05-13 19:27:32 UTC (rev 168703)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/CMakeLists.txt 2014-05-13 19:27:45 UTC (rev 168704)
@@ -2975,6 +2975,11 @@
${WEBCORE_DIR}/bindings/scripts/InFilesParser.pm
${WEBCORE_DIR}/bindings/scripts/preprocessor.pm
)
+
+set(MAKE_NAMES_DEPENDENCIES
+ ${WEBCORE_DIR}/bindings/scripts/Hasher.pm
+ ${WEBCORE_DIR}/bindings/scripts/StaticString.pm
+)
set(IDL_FILES_TMP ${DERIVED_SOURCES_WEBCORE_DIR}/idl_files.tmp)
set(SUPPLEMENTAL_DEPENDENCY_FILE ${DERIVED_SOURCES_WEBCORE_DIR}/supplemental_dependency.tmp)
set(WINDOW_CONSTRUCTORS_FILE ${DERIVED_SOURCES_WEBCORE_DIR}/DOMWindowConstructors.idl)
Modified: releases/WebKitGTK/webkit-2.4/Source/cmake/WebKitMacros.cmake (168703 => 168704)
--- releases/WebKitGTK/webkit-2.4/Source/cmake/WebKitMacros.cmake 2014-05-13 19:27:32 UTC (rev 168703)
+++ releases/WebKitGTK/webkit-2.4/Source/cmake/WebKitMacros.cmake 2014-05-13 19:27:45 UTC (rev 168704)
@@ -73,7 +73,7 @@
add_custom_command(
OUTPUT ${_outputfiles}
MAIN_DEPENDENCY ${_infile}
- DEPENDS ${NAMES_GENERATOR} ${SCRIPTS_BINDINGS}
+ DEPENDS ${MAKE_NAMES_DEPENDENCIES} ${NAMES_GENERATOR} ${SCRIPTS_BINDINGS}
COMMAND ${PERL_EXECUTABLE} -I${WEBCORE_DIR}/bindings/scripts ${NAMES_GENERATOR} --outputDir ${DERIVED_SOURCES_WEBCORE_DIR} ${_arguments}
VERBATIM)
endmacro()
@@ -141,7 +141,7 @@
add_custom_command(
OUTPUT ${_outputfiles}
- DEPENDS ${NAMES_GENERATOR} ${SCRIPTS_BINDINGS} ${_attrs} ${_tags}
+ DEPENDS ${MAKE_NAMES_DEPENDENCIES} ${NAMES_GENERATOR} ${SCRIPTS_BINDINGS} ${_attrs} ${_tags}
COMMAND ${PERL_EXECUTABLE} -I${WEBCORE_DIR}/bindings/scripts ${NAMES_GENERATOR} --preprocessor "${CODE_GENERATOR_PREPROCESSOR_WITH_LINEMARKERS}" --outputDir ${DERIVED_SOURCES_WEBCORE_DIR} ${_arguments} ${_additionArguments}
VERBATIM)
endmacro()
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
