Changeset 148571 in webkit
- Timestamp:
- Apr 16, 2013 4:45:40 PM (11 years ago)
- Location:
- trunk
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/ChangeLog
r148541 r148571 1 2013-04-16 Patrick Gansterer <paroga@webkit.org> 2 3 [CMake] Do not use JAVASCRIPTCORE_DIR in add_custom_command() of JavaScriptcore project 4 https://bugs.webkit.org/show_bug.cgi?id=114265 5 6 Reviewed by Brent Fulgham. 7 8 * Source/cmake/WebKitMacros.cmake: Removed macro GENERATE_HASH_LUT. 9 1 10 2013-04-16 Andy Estes <aestes@apple.com> 2 11 -
trunk/Source/JavaScriptCore/CMakeLists.txt
r148479 r148571 436 436 endif () 437 437 438 set(HASH_LUT_GENERATOR ${CMAKE_CURRENT_SOURCE_DIR}/create_hash_table) 439 macro(GENERATE_HASH_LUT _input _output) 440 add_custom_command( 441 OUTPUT ${_output} 442 DEPENDS ${HASH_LUT_GENERATOR} ${_input} 443 COMMAND ${PERL_EXECUTABLE} ${HASH_LUT_GENERATOR} ${_input} -i > ${_output} 444 VERBATIM) 445 list(APPEND JavaScriptCore_HEADERS ${_output}) 446 endmacro() 447 438 448 # GENERATOR 1-A: LUT creator 439 449 foreach (_file ${JavaScriptCore_LUT_FILES}) 440 450 get_filename_component(_name ${_file} NAME_WE) 441 GENERATE_HASH_LUT(${JAVASCRIPTCORE_DIR}/${_file} ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/${_name}.lut.h) 442 list(APPEND JavaScriptCore_HEADERS ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/${_name}.lut.h) 451 GENERATE_HASH_LUT(${CMAKE_CURRENT_SOURCE_DIR}/${_file} ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/${_name}.lut.h) 443 452 endforeach () 444 453 … … 483 492 484 493 # GENERATOR 1-B: particular LUT creator (for 1 file only) 485 GENERATE_HASH_LUT(${JAVASCRIPTCORE_DIR}/parser/Keywords.table ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/Lexer.lut.h MAIN_DEPENDENCY) 486 list(APPEND JavaScriptCore_HEADERS ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/Lexer.lut.h) 494 GENERATE_HASH_LUT(${CMAKE_CURRENT_SOURCE_DIR}/parser/Keywords.table ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/Lexer.lut.h) 487 495 488 496 #GENERATOR: "RegExpJitTables.h": tables used by Yarr 489 497 add_custom_command( 490 498 OUTPUT ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/RegExpJitTables.h 491 MAIN_DEPENDENCY ${ JAVASCRIPTCORE_DIR}/create_regex_tables492 COMMAND ${PYTHON_EXECUTABLE} ${ JAVASCRIPTCORE_DIR}/create_regex_tables > ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/RegExpJitTables.h499 MAIN_DEPENDENCY ${CMAKE_CURRENT_SOURCE_DIR}/create_regex_tables 500 COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/create_regex_tables > ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/RegExpJitTables.h 493 501 VERBATIM) 494 ADD_SOURCE_DEPENDENCIES(${ JAVASCRIPTCORE_DIR}/yarr/YarrPattern.cpp ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/RegExpJitTables.h)502 ADD_SOURCE_DEPENDENCIES(${CMAKE_CURRENT_SOURCE_DIR}/yarr/YarrPattern.cpp ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/RegExpJitTables.h) 495 503 496 504 … … 498 506 add_custom_command( 499 507 OUTPUT ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/KeywordLookup.h 500 MAIN_DEPENDENCY ${ JAVASCRIPTCORE_DIR}/KeywordLookupGenerator.py501 COMMAND ${PYTHON_EXECUTABLE} ${ JAVASCRIPTCORE_DIR}/KeywordLookupGenerator.py ${JAVASCRIPTCORE_DIR}/parser/Keywords.table > ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/KeywordLookup.h508 MAIN_DEPENDENCY ${CMAKE_CURRENT_SOURCE_DIR}/KeywordLookupGenerator.py 509 COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/KeywordLookupGenerator.py ${CMAKE_CURRENT_SOURCE_DIR}/parser/Keywords.table > ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/KeywordLookup.h 502 510 VERBATIM) 503 ADD_SOURCE_DEPENDENCIES(${ JAVASCRIPTCORE_DIR}/parser/Lexer.cpp ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/KeywordLookup.h)511 ADD_SOURCE_DEPENDENCIES(${CMAKE_CURRENT_SOURCE_DIR}/parser/Lexer.cpp ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/KeywordLookup.h) 504 512 505 513 if (WTF_CPU_ARM) -
trunk/Source/JavaScriptCore/ChangeLog
r148568 r148571 1 2013-04-16 Patrick Gansterer <paroga@webkit.org> 2 3 [CMake] Do not use JAVASCRIPTCORE_DIR in add_custom_command() of JavaScriptCore project 4 https://bugs.webkit.org/show_bug.cgi?id=114265 5 6 Reviewed by Brent Fulgham. 7 8 Use CMAKE_CURRENT_SOURCE_DIR instead, since it provides the same value and is more 9 understandable. Also move the GENERATE_HASH_LUT macro into the CMakeLists.txt 10 of JavaScriptCore to avoid the usage of JAVASCRIPTCORE_DIR there too. 11 12 * CMakeLists.txt: 13 1 14 2013-04-16 Anders Carlsson <andersca@apple.com> 2 15 -
trunk/Source/cmake/WebKitMacros.cmake
r139331 r148571 137 137 DEPENDS ${NAMES_GENERATOR} ${SCRIPTS_BINDINGS} ${_attrs} ${_tags} 138 138 COMMAND ${PERL_EXECUTABLE} -I${WEBCORE_DIR}/bindings/scripts ${NAMES_GENERATOR} --preprocessor "${CODE_GENERATOR_PREPROCESSOR_WITH_LINEMARKERS}" --outputDir ${DERIVED_SOURCES_WEBCORE_DIR} ${_arguments} ${_additionArguments} 139 VERBATIM)140 endmacro()141 142 143 # - Create hash table *.lut.h144 # GENERATE_HASH_LUT(input_file output_file)145 macro(GENERATE_HASH_LUT _input _output)146 set(HASH_LUT_GENERATOR "${JAVASCRIPTCORE_DIR}/create_hash_table")147 148 foreach (_tmp ${ARGN})149 if (${_tmp} STREQUAL "MAIN_DEPENDENCY")150 set(_main_dependency ${_input})151 endif ()152 endforeach ()153 154 add_custom_command(155 OUTPUT ${_output}156 MAIN_DEPENDENCY ${_main_dependency}157 DEPENDS ${_input} ${HASH_LUT_GENERATOR}158 COMMAND ${PERL_EXECUTABLE} ${HASH_LUT_GENERATOR} ${_input} -i > ${_output}159 139 VERBATIM) 160 140 endmacro()
Note: See TracChangeset
for help on using the changeset viewer.