beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-11-21 23:20:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Meta: Use Lagom:: namespaced names for code generators

Browse source 
This will be required when we switch to a SuperBuild that has Lagom as
a configure time dependency, but is a distinct enough change to be
separate.
This commit is contained in:
Andrew Kaster 2021-09-07 00:54:27 -06:00 committed by Ali Mohammad Pur
parent fc8d1bf3ce
commit a269a32a17
Notes: sideshowbarker 2024-07-18 03:56:15 +09:00 
Author: https://github.com/ADKaster
Commit: https://github.com/SerenityOS/serenity/commit/a269a32a178
Pull-request: https://github.com/SerenityOS/serenity/pull/9297
Issue: https://github.com/SerenityOS/serenity/issues/9425
Reviewed-by: https://github.com/bgianfo
3 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CMakeLists.txt
View file

@ -103,10 +103,10 @@ add_custom_target(install-ports
) )
add_custom_target(configure-components add_custom_target(configure-components
COMMAND "$<TARGET_FILE:ConfigureComponents>" COMMAND "$<TARGET_FILE:Lagom::ConfigureComponents>"
USES_TERMINAL USES_TERMINAL
) )
add_dependencies(configure-components ConfigureComponents) add_dependencies(configure-components Lagom::ConfigureComponents)
set(CMAKE_CXX_STANDARD 20) set(CMAKE_CXX_STANDARD 20)
set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_STANDARD_REQUIRED ON)

8
Meta/CMake/code_generators.cmake
View file

@ -22,11 +22,11 @@ function(compile_ipc source output)
set(source ${CMAKE_CURRENT_SOURCE_DIR}/${source}) set(source ${CMAKE_CURRENT_SOURCE_DIR}/${source})
add_custom_command( add_custom_command(
OUTPUT ${output} OUTPUT ${output}
COMMAND $<TARGET_FILE:IPCCompiler> ${source} > ${output}.tmp COMMAND $<TARGET_FILE:Lagom::IPCCompiler> ${source} > ${output}.tmp
COMMAND "${CMAKE_COMMAND}" -E copy_if_different ${output}.tmp ${output} COMMAND "${CMAKE_COMMAND}" -E copy_if_different ${output}.tmp ${output}
COMMAND "${CMAKE_COMMAND}" -E remove ${output}.tmp COMMAND "${CMAKE_COMMAND}" -E remove ${output}.tmp
VERBATIM VERBATIM
DEPENDS IPCCompiler DEPENDS Lagom::IPCCompiler
MAIN_DEPENDENCY ${source} MAIN_DEPENDENCY ${source}
) )
get_filename_component(output_name ${output} NAME) get_filename_component(output_name ${output} NAME)
@ -45,11 +45,11 @@ function(generate_state_machine source header)
set(output ${CMAKE_CURRENT_BINARY_DIR}/${header}) set(output ${CMAKE_CURRENT_BINARY_DIR}/${header})
add_custom_command( add_custom_command(
OUTPUT ${output} OUTPUT ${output}
COMMAND $<TARGET_FILE:StateMachineGenerator> ${source} > ${output}.tmp COMMAND $<TARGET_FILE:Lagom::StateMachineGenerator> ${source} > ${output}.tmp
COMMAND "${CMAKE_COMMAND}" -E copy_if_different ${output}.tmp ${output} COMMAND "${CMAKE_COMMAND}" -E copy_if_different ${output}.tmp ${output}
COMMAND "${CMAKE_COMMAND}" -E remove ${output}.tmp COMMAND "${CMAKE_COMMAND}" -E remove ${output}.tmp
VERBATIM VERBATIM
DEPENDS StateMachineGenerator DEPENDS Lagom::StateMachineGenerator
MAIN_DEPENDENCY ${source} MAIN_DEPENDENCY ${source}
) )
add_custom_target(${target_name} DEPENDS ${output}) add_custom_target(${target_name} DEPENDS ${output})

20
Userland/Libraries/LibWeb/CMakeLists.txt
View file

@ -287,11 +287,11 @@ function(libweb_js_wrapper class)
list(GET BINDINGS_TYPES ${iter} bindings_type) list(GET BINDINGS_TYPES ${iter} bindings_type)
add_custom_command( add_custom_command(
OUTPUT "${bindings_src}" OUTPUT "${bindings_src}"
COMMAND "$<TARGET_FILE:WrapperGenerator>" "--${bindings_type}" "${CMAKE_CURRENT_SOURCE_DIR}/${class}.idl" > "${bindings_src}.tmp" COMMAND "$<TARGET_FILE:Lagom::WrapperGenerator>" "--${bindings_type}" "${CMAKE_CURRENT_SOURCE_DIR}/${class}.idl" > "${bindings_src}.tmp"
COMMAND "${CMAKE_COMMAND}" -E copy_if_different "${bindings_src}.tmp" "${bindings_src}" COMMAND "${CMAKE_COMMAND}" -E copy_if_different "${bindings_src}.tmp" "${bindings_src}"
COMMAND "${CMAKE_COMMAND}" -E remove "${bindings_src}.tmp" COMMAND "${CMAKE_COMMAND}" -E remove "${bindings_src}.tmp"
VERBATIM VERBATIM
DEPENDS WrapperGenerator DEPENDS Lagom::WrapperGenerator
MAIN_DEPENDENCY ${class}.idl MAIN_DEPENDENCY ${class}.idl
) )
endforeach() endforeach()
@ -430,11 +430,11 @@ libweb_js_wrapper(URL/URLSearchParams)
add_custom_command( add_custom_command(
OUTPUT CSS/PropertyID.h OUTPUT CSS/PropertyID.h
COMMAND ${CMAKE_COMMAND} -E make_directory CSS COMMAND ${CMAKE_COMMAND} -E make_directory CSS
COMMAND "$<TARGET_FILE:Generate_CSS_PropertyID_h>" "${CMAKE_CURRENT_SOURCE_DIR}/CSS/Properties.json" > CSS/PropertyID.h.tmp COMMAND "$<TARGET_FILE:Lagom::Generate_CSS_PropertyID_h>" "${CMAKE_CURRENT_SOURCE_DIR}/CSS/Properties.json" > CSS/PropertyID.h.tmp
COMMAND "${CMAKE_COMMAND}" -E copy_if_different CSS/PropertyID.h.tmp CSS/PropertyID.h COMMAND "${CMAKE_COMMAND}" -E copy_if_different CSS/PropertyID.h.tmp CSS/PropertyID.h
COMMAND "${CMAKE_COMMAND}" -E remove CSS/PropertyID.h.tmp COMMAND "${CMAKE_COMMAND}" -E remove CSS/PropertyID.h.tmp
VERBATIM VERBATIM
DEPENDS Generate_CSS_PropertyID_h DEPENDS Lagom::Generate_CSS_PropertyID_h
MAIN_DEPENDENCY CSS/Properties.json MAIN_DEPENDENCY CSS/Properties.json
) )
add_custom_target(generate_PropertyID.h DEPENDS CSS/PropertyID.h) add_custom_target(generate_PropertyID.h DEPENDS CSS/PropertyID.h)
@ -443,11 +443,11 @@ add_dependencies(all_generated generate_PropertyID.h)
add_custom_command( add_custom_command(
OUTPUT CSS/PropertyID.cpp OUTPUT CSS/PropertyID.cpp
COMMAND ${CMAKE_COMMAND} -E make_directory CSS COMMAND ${CMAKE_COMMAND} -E make_directory CSS
COMMAND "$<TARGET_FILE:Generate_CSS_PropertyID_cpp>" "${CMAKE_CURRENT_SOURCE_DIR}/CSS/Properties.json" > CSS/PropertyID.cpp.tmp COMMAND "$<TARGET_FILE:Lagom::Generate_CSS_PropertyID_cpp>" "${CMAKE_CURRENT_SOURCE_DIR}/CSS/Properties.json" > CSS/PropertyID.cpp.tmp
COMMAND "${CMAKE_COMMAND}" -E copy_if_different CSS/PropertyID.cpp.tmp CSS/PropertyID.cpp COMMAND "${CMAKE_COMMAND}" -E copy_if_different CSS/PropertyID.cpp.tmp CSS/PropertyID.cpp
COMMAND "${CMAKE_COMMAND}" -E remove CSS/PropertyID.cpp.tmp COMMAND "${CMAKE_COMMAND}" -E remove CSS/PropertyID.cpp.tmp
VERBATIM VERBATIM
DEPENDS Generate_CSS_PropertyID_cpp DEPENDS Lagom::Generate_CSS_PropertyID_cpp
MAIN_DEPENDENCY CSS/Properties.json MAIN_DEPENDENCY CSS/Properties.json
) )
add_custom_target(generate_PropertyID.cpp DEPENDS CSS/PropertyID.cpp) add_custom_target(generate_PropertyID.cpp DEPENDS CSS/PropertyID.cpp)
@ -456,11 +456,11 @@ add_dependencies(all_generated generate_PropertyID.cpp)
add_custom_command( add_custom_command(
OUTPUT CSS/ValueID.h OUTPUT CSS/ValueID.h
COMMAND "${CMAKE_COMMAND}" -E make_directory CSS COMMAND "${CMAKE_COMMAND}" -E make_directory CSS
COMMAND "$<TARGET_FILE:Generate_CSS_ValueID_h>" "${CMAKE_CURRENT_SOURCE_DIR}/CSS/Identifiers.json" > CSS/ValueID.h.tmp COMMAND "$<TARGET_FILE:Lagom::Generate_CSS_ValueID_h>" "${CMAKE_CURRENT_SOURCE_DIR}/CSS/Identifiers.json" > CSS/ValueID.h.tmp
COMMAND "${CMAKE_COMMAND}" -E copy_if_different CSS/ValueID.h.tmp CSS/ValueID.h COMMAND "${CMAKE_COMMAND}" -E copy_if_different CSS/ValueID.h.tmp CSS/ValueID.h
COMMAND "${CMAKE_COMMAND}" -E remove CSS/ValueID.h.tmp COMMAND "${CMAKE_COMMAND}" -E remove CSS/ValueID.h.tmp
VERBATIM VERBATIM
DEPENDS Generate_CSS_ValueID_h DEPENDS Lagom::Generate_CSS_ValueID_h
MAIN_DEPENDENCY CSS/Identifiers.json MAIN_DEPENDENCY CSS/Identifiers.json
) )
add_custom_target(generate_ValueID.h DEPENDS CSS/ValueID.h) add_custom_target(generate_ValueID.h DEPENDS CSS/ValueID.h)
@ -469,11 +469,11 @@ add_dependencies(all_generated generate_ValueID.h)
add_custom_command( add_custom_command(
OUTPUT CSS/ValueID.cpp OUTPUT CSS/ValueID.cpp
COMMAND "${CMAKE_COMMAND}" -E make_directory CSS COMMAND "${CMAKE_COMMAND}" -E make_directory CSS
COMMAND "$<TARGET_FILE:Generate_CSS_ValueID_cpp>" "${CMAKE_CURRENT_SOURCE_DIR}/CSS/Identifiers.json" > CSS/ValueID.cpp.tmp COMMAND "$<TARGET_FILE:Lagom::Generate_CSS_ValueID_cpp>" "${CMAKE_CURRENT_SOURCE_DIR}/CSS/Identifiers.json" > CSS/ValueID.cpp.tmp
COMMAND "${CMAKE_COMMAND}" -E copy_if_different CSS/ValueID.cpp.tmp CSS/ValueID.cpp COMMAND "${CMAKE_COMMAND}" -E copy_if_different CSS/ValueID.cpp.tmp CSS/ValueID.cpp
COMMAND "${CMAKE_COMMAND}" -E remove CSS/ValueID.cpp.tmp COMMAND "${CMAKE_COMMAND}" -E remove CSS/ValueID.cpp.tmp
VERBATIM VERBATIM
DEPENDS Generate_CSS_ValueID_cpp DEPENDS Lagom::Generate_CSS_ValueID_cpp
MAIN_DEPENDENCY CSS/Identifiers.json MAIN_DEPENDENCY CSS/Identifiers.json
) )
add_custom_target(generate_ValueID.cpp DEPENDS CSS/ValueID.cpp) add_custom_target(generate_ValueID.cpp DEPENDS CSS/ValueID.cpp)