[cmake] *Names.cpp file should be regenerated after touching StaticString.pm
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 3 Mar 2014 10:15:52 +0000 (10:15 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 3 Mar 2014 10:15:52 +0000 (10:15 +0000)
https://bugs.webkit.org/show_bug.cgi?id=129031

Patch by Jozsef Berta <jberta.u-szeged@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

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@164979 268f45cc-cd09-0410-ab3c-d52691b4dbfc

ChangeLog
Source/WebCore/CMakeLists.txt
Source/WebCore/ChangeLog
Source/cmake/WebKitMacros.cmake

index a979b8d..1a4f639 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2014-03-03  Jozsef Berta  <jberta.u-szeged@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  <cgarcia@igalia.com>
 
         [GTK] WebKit2WebExtension GIR can't be used in vala
index 2347b57..0262af3 100644 (file)
@@ -2992,6 +2992,11 @@ set(SCRIPTS_BINDINGS
     ${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)
index f0b23f6..9669192 100644 (file)
@@ -1,3 +1,12 @@
+2014-03-03  Jozsef Berta  <jberta.u-szeged@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  <calvaris@igalia.com>
 
         [GTK] Multimedia controls captions icon needs its own metaphor
index ef37921..7dccede 100644 (file)
@@ -73,7 +73,7 @@ macro(GENERATE_FONT_NAMES _infile)
     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 @@ macro(GENERATE_DOM_NAMES _namespace _attrs)
 
     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()