Title: [164979] trunk
- Revision
- 164979
- Author
- commit-qu...@webkit.org
- Date
- 2014-03-03 02:15:52 -0800 (Mon, 03 Mar 2014)
Log Message
[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
Modified Paths
Diff
Modified: trunk/ChangeLog (164978 => 164979)
--- trunk/ChangeLog 2014-03-03 09:07:31 UTC (rev 164978)
+++ trunk/ChangeLog 2014-03-03 10:15:52 UTC (rev 164979)
@@ -1,3 +1,12 @@
+2014-03-03 Jozsef Berta <jberta.u-sze...@partner.samsung.com>
+
+ [cmake] *Names.cpp file should be regenerated after touching StaticString.pm
+ https://bugs.webkit.org/show_bug.cgi?id=129031
+
+ 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.
+
2014-03-03 Carlos Garcia Campos <cgar...@igalia.com>
[GTK] WebKit2WebExtension GIR can't be used in vala
Modified: trunk/Source/WebCore/CMakeLists.txt (164978 => 164979)
--- trunk/Source/WebCore/CMakeLists.txt 2014-03-03 09:07:31 UTC (rev 164978)
+++ trunk/Source/WebCore/CMakeLists.txt 2014-03-03 10:15:52 UTC (rev 164979)
@@ -2992,6 +2992,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: trunk/Source/WebCore/ChangeLog (164978 => 164979)
--- trunk/Source/WebCore/ChangeLog 2014-03-03 09:07:31 UTC (rev 164978)
+++ trunk/Source/WebCore/ChangeLog 2014-03-03 10:15:52 UTC (rev 164979)
@@ -1,3 +1,12 @@
+2014-03-03 Jozsef Berta <jberta.u-sze...@partner.samsung.com>
+
+ [cmake] *Names.cpp file should be regenerated after touching StaticString.pm
+ https://bugs.webkit.org/show_bug.cgi?id=129031
+
+ Reviewed by Csaba Osztrogonác.
+
+ * CMakeLists.txt: Added make_names.pl dependencies: bindings/scripts/Hasher.pm and bindings/scripts/StaticString.pm
+
2014-03-03 Xabier Rodriguez Calvar <calva...@igalia.com>
[GTK] Multimedia controls captions icon needs its own metaphor
Modified: trunk/Source/cmake/WebKitMacros.cmake (164978 => 164979)
--- trunk/Source/cmake/WebKitMacros.cmake 2014-03-03 09:07:31 UTC (rev 164978)
+++ trunk/Source/cmake/WebKitMacros.cmake 2014-03-03 10:15:52 UTC (rev 164979)
@@ -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
