Skip to content
Permalink
Browse files
[cmake] *Names.cpp file should be regenerated after touching StaticSt…
…ring.pm

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

Canonical link: https://commits.webkit.org/147655@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@164979 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
Jozsef Berta authored and webkit-commit-queue committed Mar 3, 2014
1 parent 6414df7 commit 39b0ea64c366ae5723985a3177cd1cd215f26014
Showing 4 changed files with 25 additions and 2 deletions.
@@ -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
@@ -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)
@@ -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
@@ -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()

0 comments on commit 39b0ea6

Please sign in to comment.