Title: [148571] trunk
- Revision
- 148571
- Author
- [email protected]
- Date
- 2013-04-16 16:45:40 -0700 (Tue, 16 Apr 2013)
Log Message
.: [CMake] Do not use _javascript_CORE_DIR in add_custom_command() of _javascript_core project
https://bugs.webkit.org/show_bug.cgi?id=114265
Reviewed by Brent Fulgham.
* Source/cmake/WebKitMacros.cmake: Removed macro GENERATE_HASH_LUT.
Source/_javascript_Core: [CMake] Do not use _javascript_CORE_DIR in add_custom_command() of _javascript_Core project
https://bugs.webkit.org/show_bug.cgi?id=114265
Reviewed by Brent Fulgham.
Use CMAKE_CURRENT_SOURCE_DIR instead, since it provides the same value and is more
understandable. Also move the GENERATE_HASH_LUT macro into the CMakeLists.txt
of _javascript_Core to avoid the usage of _javascript_CORE_DIR there too.
* CMakeLists.txt:
Modified Paths
Diff
Modified: trunk/ChangeLog (148570 => 148571)
--- trunk/ChangeLog 2013-04-16 23:31:42 UTC (rev 148570)
+++ trunk/ChangeLog 2013-04-16 23:45:40 UTC (rev 148571)
@@ -1,3 +1,12 @@
+2013-04-16 Patrick Gansterer <[email protected]>
+
+ [CMake] Do not use _javascript_CORE_DIR in add_custom_command() of _javascript_core project
+ https://bugs.webkit.org/show_bug.cgi?id=114265
+
+ Reviewed by Brent Fulgham.
+
+ * Source/cmake/WebKitMacros.cmake: Removed macro GENERATE_HASH_LUT.
+
2013-04-16 Andy Estes <[email protected]>
Changed the default debugger from GDB to LLDB for the 'All Source' scheme in WebKit.xcworkspace.
Modified: trunk/Source/_javascript_Core/CMakeLists.txt (148570 => 148571)
--- trunk/Source/_javascript_Core/CMakeLists.txt 2013-04-16 23:31:42 UTC (rev 148570)
+++ trunk/Source/_javascript_Core/CMakeLists.txt 2013-04-16 23:45:40 UTC (rev 148571)
@@ -435,11 +435,20 @@
)
endif ()
+set(HASH_LUT_GENERATOR ${CMAKE_CURRENT_SOURCE_DIR}/create_hash_table)
+macro(GENERATE_HASH_LUT _input _output)
+ add_custom_command(
+ OUTPUT ${_output}
+ DEPENDS ${HASH_LUT_GENERATOR} ${_input}
+ COMMAND ${PERL_EXECUTABLE} ${HASH_LUT_GENERATOR} ${_input} -i > ${_output}
+ VERBATIM)
+ list(APPEND _javascript_Core_HEADERS ${_output})
+endmacro()
+
# GENERATOR 1-A: LUT creator
foreach (_file ${_javascript_Core_LUT_FILES})
get_filename_component(_name ${_file} NAME_WE)
- GENERATE_HASH_LUT(${_javascript_CORE_DIR}/${_file} ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/${_name}.lut.h)
- list(APPEND _javascript_Core_HEADERS ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/${_name}.lut.h)
+ GENERATE_HASH_LUT(${CMAKE_CURRENT_SOURCE_DIR}/${_file} ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/${_name}.lut.h)
endforeach ()
set(_javascript_Core_FORWARDING_HEADERS_DIRECTORIES
@@ -482,25 +491,24 @@
# GENERATOR 1-B: particular LUT creator (for 1 file only)
-GENERATE_HASH_LUT(${_javascript_CORE_DIR}/parser/Keywords.table ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/Lexer.lut.h MAIN_DEPENDENCY)
-list(APPEND _javascript_Core_HEADERS ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/Lexer.lut.h)
+GENERATE_HASH_LUT(${CMAKE_CURRENT_SOURCE_DIR}/parser/Keywords.table ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/Lexer.lut.h)
#GENERATOR: "RegExpJitTables.h": tables used by Yarr
add_custom_command(
OUTPUT ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/RegExpJitTables.h
- MAIN_DEPENDENCY ${_javascript_CORE_DIR}/create_regex_tables
- COMMAND ${PYTHON_EXECUTABLE} ${_javascript_CORE_DIR}/create_regex_tables > ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/RegExpJitTables.h
+ MAIN_DEPENDENCY ${CMAKE_CURRENT_SOURCE_DIR}/create_regex_tables
+ COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/create_regex_tables > ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/RegExpJitTables.h
VERBATIM)
-ADD_SOURCE_DEPENDENCIES(${_javascript_CORE_DIR}/yarr/YarrPattern.cpp ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/RegExpJitTables.h)
+ADD_SOURCE_DEPENDENCIES(${CMAKE_CURRENT_SOURCE_DIR}/yarr/YarrPattern.cpp ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/RegExpJitTables.h)
#GENERATOR: "KeywordLookup.h": keyword decision tree used by the lexer
add_custom_command(
OUTPUT ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/KeywordLookup.h
- MAIN_DEPENDENCY ${_javascript_CORE_DIR}/KeywordLookupGenerator.py
- COMMAND ${PYTHON_EXECUTABLE} ${_javascript_CORE_DIR}/KeywordLookupGenerator.py ${_javascript_CORE_DIR}/parser/Keywords.table > ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/KeywordLookup.h
+ MAIN_DEPENDENCY ${CMAKE_CURRENT_SOURCE_DIR}/KeywordLookupGenerator.py
+ COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/KeywordLookupGenerator.py ${CMAKE_CURRENT_SOURCE_DIR}/parser/Keywords.table > ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/KeywordLookup.h
VERBATIM)
-ADD_SOURCE_DEPENDENCIES(${_javascript_CORE_DIR}/parser/Lexer.cpp ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/KeywordLookup.h)
+ADD_SOURCE_DEPENDENCIES(${CMAKE_CURRENT_SOURCE_DIR}/parser/Lexer.cpp ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/KeywordLookup.h)
if (WTF_CPU_ARM)
list(APPEND _javascript_Core_SOURCES
Modified: trunk/Source/_javascript_Core/ChangeLog (148570 => 148571)
--- trunk/Source/_javascript_Core/ChangeLog 2013-04-16 23:31:42 UTC (rev 148570)
+++ trunk/Source/_javascript_Core/ChangeLog 2013-04-16 23:45:40 UTC (rev 148571)
@@ -1,3 +1,16 @@
+2013-04-16 Patrick Gansterer <[email protected]>
+
+ [CMake] Do not use _javascript_CORE_DIR in add_custom_command() of _javascript_Core project
+ https://bugs.webkit.org/show_bug.cgi?id=114265
+
+ Reviewed by Brent Fulgham.
+
+ Use CMAKE_CURRENT_SOURCE_DIR instead, since it provides the same value and is more
+ understandable. Also move the GENERATE_HASH_LUT macro into the CMakeLists.txt
+ of _javascript_Core to avoid the usage of _javascript_CORE_DIR there too.
+
+ * CMakeLists.txt:
+
2013-04-16 Anders Carlsson <[email protected]>
Another Windows build fix attempt.
Modified: trunk/Source/cmake/WebKitMacros.cmake (148570 => 148571)
--- trunk/Source/cmake/WebKitMacros.cmake 2013-04-16 23:31:42 UTC (rev 148570)
+++ trunk/Source/cmake/WebKitMacros.cmake 2013-04-16 23:45:40 UTC (rev 148571)
@@ -140,26 +140,6 @@
endmacro()
-# - Create hash table *.lut.h
-# GENERATE_HASH_LUT(input_file output_file)
-macro(GENERATE_HASH_LUT _input _output)
- set(HASH_LUT_GENERATOR "${_javascript_CORE_DIR}/create_hash_table")
-
- foreach (_tmp ${ARGN})
- if (${_tmp} STREQUAL "MAIN_DEPENDENCY")
- set(_main_dependency ${_input})
- endif ()
- endforeach ()
-
- add_custom_command(
- OUTPUT ${_output}
- MAIN_DEPENDENCY ${_main_dependency}
- DEPENDS ${_input} ${HASH_LUT_GENERATOR}
- COMMAND ${PERL_EXECUTABLE} ${HASH_LUT_GENERATOR} ${_input} -i > ${_output}
- VERBATIM)
-endmacro()
-
-
macro(GENERATE_GRAMMAR _prefix _input _output_header _output_source _features)
# This is a workaround for winflexbison, which does not work corretly when
# run in a different working directory than the installation directory.
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
