mirror of
https://github.com/LadybirdBrowser/ladybird.git
synced 2024-09-11 05:25:32 +03:00
Userland: Move command-line utilities to Userland/Utilities/
This commit is contained in:
parent
c4e2fd8123
commit
ececac65c2
Notes:
sideshowbarker
2024-07-18 23:54:10 +09:00
Author: https://github.com/awesomekling Commit: https://github.com/SerenityOS/serenity/commit/ececac65c23
@ -91,27 +91,27 @@ if (BUILD_LAGOM)
|
||||
target_link_libraries(TestJson Lagom)
|
||||
target_link_libraries(TestJson stdc++)
|
||||
|
||||
add_executable(adjtime_lagom ../../Userland/adjtime.cpp)
|
||||
add_executable(adjtime_lagom ../../Userland/Utilities/adjtime.cpp)
|
||||
set_target_properties(adjtime_lagom PROPERTIES OUTPUT_NAME adjtime)
|
||||
target_link_libraries(adjtime_lagom Lagom)
|
||||
|
||||
add_executable(js_lagom ../../Userland/js.cpp)
|
||||
add_executable(js_lagom ../../Userland/Utilities/js.cpp)
|
||||
set_target_properties(js_lagom PROPERTIES OUTPUT_NAME js)
|
||||
target_link_libraries(js_lagom Lagom)
|
||||
target_link_libraries(js_lagom stdc++)
|
||||
target_link_libraries(js_lagom pthread)
|
||||
|
||||
add_executable(ntpquery_lagom ../../Userland/ntpquery.cpp)
|
||||
add_executable(ntpquery_lagom ../../Userland/Utilities/ntpquery.cpp)
|
||||
set_target_properties(ntpquery_lagom PROPERTIES OUTPUT_NAME ntpquery)
|
||||
target_link_libraries(ntpquery_lagom Lagom)
|
||||
|
||||
add_executable(test-js_lagom ../../Userland/test-js.cpp)
|
||||
add_executable(test-js_lagom ../../Userland/Utilities/test-js.cpp)
|
||||
set_target_properties(test-js_lagom PROPERTIES OUTPUT_NAME test-js)
|
||||
target_link_libraries(test-js_lagom Lagom)
|
||||
target_link_libraries(test-js_lagom stdc++)
|
||||
target_link_libraries(test-js_lagom pthread)
|
||||
|
||||
add_executable(test-crypto_lagom ../../Userland/test-crypto.cpp)
|
||||
add_executable(test-crypto_lagom ../../Userland/Utilities/test-crypto.cpp)
|
||||
set_target_properties(test-crypto_lagom PROPERTIES OUTPUT_NAME test-crypto)
|
||||
target_link_libraries(test-crypto_lagom Lagom)
|
||||
target_link_libraries(test-crypto_lagom stdc++)
|
||||
@ -121,12 +121,12 @@ if (BUILD_LAGOM)
|
||||
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
|
||||
)
|
||||
|
||||
add_executable(test-compress_lagom ../../Userland/test-compress.cpp)
|
||||
add_executable(test-compress_lagom ../../Userland/Utilities/test-compress.cpp)
|
||||
set_target_properties(test-compress_lagom PROPERTIES OUTPUT_NAME test-compress)
|
||||
target_link_libraries(test-compress_lagom Lagom)
|
||||
target_link_libraries(test-compress_lagom stdc++)
|
||||
|
||||
add_executable(disasm_lagom ../../Userland/disasm.cpp)
|
||||
add_executable(disasm_lagom ../../Userland/Utilities/disasm.cpp)
|
||||
set_target_properties(disasm_lagom PROPERTIES OUTPUT_NAME disasm)
|
||||
target_link_libraries(disasm_lagom Lagom)
|
||||
target_link_libraries(disasm_lagom stdc++)
|
||||
@ -137,7 +137,7 @@ if (BUILD_LAGOM)
|
||||
target_link_libraries(shell_lagom stdc++)
|
||||
target_link_libraries(shell_lagom pthread)
|
||||
|
||||
add_executable(gml-format_lagom ../../Userland/gml-format.cpp)
|
||||
add_executable(gml-format_lagom ../../Userland/Utilities/gml-format.cpp)
|
||||
set_target_properties(gml-format_lagom PROPERTIES OUTPUT_NAME gml-format)
|
||||
target_link_libraries(gml-format_lagom Lagom)
|
||||
target_link_libraries(gml-format_lagom stdc++)
|
||||
|
@ -1,53 +1,4 @@
|
||||
file(GLOB CMD_SOURCES CONFIGURE_DEPENDS "*.cpp")
|
||||
list(APPEND SPECIAL_TARGETS "test" "install")
|
||||
|
||||
foreach(CMD_SRC ${CMD_SOURCES})
|
||||
get_filename_component(CMD_NAME ${CMD_SRC} NAME_WE)
|
||||
if (CMD_NAME IN_LIST SPECIAL_TARGETS)
|
||||
add_executable("${CMD_NAME}-bin" ${CMD_SRC})
|
||||
target_link_libraries("${CMD_NAME}-bin" LibCore)
|
||||
install(TARGETS "${CMD_NAME}-bin" RUNTIME DESTINATION bin)
|
||||
install(CODE "execute_process(COMMAND mv ${CMD_NAME}-bin ${CMD_NAME} WORKING_DIRECTORY ${CMAKE_INSTALL_PREFIX}/bin)")
|
||||
else ()
|
||||
add_executable(${CMD_NAME} ${CMD_SRC})
|
||||
target_link_libraries(${CMD_NAME} LibCore)
|
||||
install(TARGETS ${CMD_NAME} RUNTIME DESTINATION bin)
|
||||
endif()
|
||||
endforeach()
|
||||
|
||||
target_link_libraries(aplay LibAudio)
|
||||
target_link_libraries(avol LibAudio)
|
||||
target_link_libraries(checksum LibCrypto)
|
||||
target_link_libraries(copy LibGUI)
|
||||
target_link_libraries(disasm LibX86)
|
||||
target_link_libraries(expr LibRegex)
|
||||
target_link_libraries(functrace LibDebug LibX86)
|
||||
target_link_libraries(gml-format LibGUI)
|
||||
target_link_libraries(html LibWeb)
|
||||
target_link_libraries(js LibJS LibLine)
|
||||
target_link_libraries(keymap LibKeyboard)
|
||||
target_link_libraries(lspci LibPCIDB)
|
||||
target_link_libraries(man LibMarkdown)
|
||||
target_link_libraries(md LibMarkdown)
|
||||
target_link_libraries(misbehaving-application LibCore)
|
||||
target_link_libraries(notify LibGUI)
|
||||
target_link_libraries(open LibDesktop)
|
||||
target_link_libraries(pape LibGUI)
|
||||
target_link_libraries(passwd LibCrypt)
|
||||
target_link_libraries(paste LibGUI)
|
||||
target_link_libraries(pro LibProtocol)
|
||||
target_link_libraries(su LibCrypt)
|
||||
target_link_libraries(tar LibTar LibCompress)
|
||||
target_link_libraries(test-crypto LibCrypto LibTLS LibLine)
|
||||
target_link_libraries(test-compress LibCompress)
|
||||
target_link_libraries(test-gfx-font LibGUI LibCore)
|
||||
target_link_libraries(test-js LibJS LibLine LibCore)
|
||||
target_link_libraries(test-pthread LibThread)
|
||||
target_link_libraries(test-web LibWeb)
|
||||
target_link_libraries(tt LibPthread)
|
||||
target_link_libraries(grep LibRegex)
|
||||
target_link_libraries(gunzip LibCompress)
|
||||
|
||||
add_subdirectory(DynamicLoader)
|
||||
add_subdirectory(Shell)
|
||||
add_subdirectory(Tests)
|
||||
add_subdirectory(Utilities)
|
||||
|
49
Userland/Utilities/CMakeLists.txt
Normal file
49
Userland/Utilities/CMakeLists.txt
Normal file
@ -0,0 +1,49 @@
|
||||
file(GLOB CMD_SOURCES CONFIGURE_DEPENDS "*.cpp")
|
||||
list(APPEND SPECIAL_TARGETS "test" "install")
|
||||
|
||||
foreach(CMD_SRC ${CMD_SOURCES})
|
||||
get_filename_component(CMD_NAME ${CMD_SRC} NAME_WE)
|
||||
if (CMD_NAME IN_LIST SPECIAL_TARGETS)
|
||||
add_executable("${CMD_NAME}-bin" ${CMD_SRC})
|
||||
target_link_libraries("${CMD_NAME}-bin" LibCore)
|
||||
install(TARGETS "${CMD_NAME}-bin" RUNTIME DESTINATION bin)
|
||||
install(CODE "execute_process(COMMAND mv ${CMD_NAME}-bin ${CMD_NAME} WORKING_DIRECTORY ${CMAKE_INSTALL_PREFIX}/bin)")
|
||||
else ()
|
||||
add_executable(${CMD_NAME} ${CMD_SRC})
|
||||
target_link_libraries(${CMD_NAME} LibCore)
|
||||
install(TARGETS ${CMD_NAME} RUNTIME DESTINATION bin)
|
||||
endif()
|
||||
endforeach()
|
||||
|
||||
target_link_libraries(aplay LibAudio)
|
||||
target_link_libraries(avol LibAudio)
|
||||
target_link_libraries(checksum LibCrypto)
|
||||
target_link_libraries(copy LibGUI)
|
||||
target_link_libraries(disasm LibX86)
|
||||
target_link_libraries(expr LibRegex)
|
||||
target_link_libraries(functrace LibDebug LibX86)
|
||||
target_link_libraries(gml-format LibGUI)
|
||||
target_link_libraries(html LibWeb)
|
||||
target_link_libraries(js LibJS LibLine)
|
||||
target_link_libraries(keymap LibKeyboard)
|
||||
target_link_libraries(lspci LibPCIDB)
|
||||
target_link_libraries(man LibMarkdown)
|
||||
target_link_libraries(md LibMarkdown)
|
||||
target_link_libraries(misbehaving-application LibCore)
|
||||
target_link_libraries(notify LibGUI)
|
||||
target_link_libraries(open LibDesktop)
|
||||
target_link_libraries(pape LibGUI)
|
||||
target_link_libraries(passwd LibCrypt)
|
||||
target_link_libraries(paste LibGUI)
|
||||
target_link_libraries(pro LibProtocol)
|
||||
target_link_libraries(su LibCrypt)
|
||||
target_link_libraries(tar LibTar LibCompress)
|
||||
target_link_libraries(test-crypto LibCrypto LibTLS LibLine)
|
||||
target_link_libraries(test-compress LibCompress)
|
||||
target_link_libraries(test-gfx-font LibGUI LibCore)
|
||||
target_link_libraries(test-js LibJS LibLine LibCore)
|
||||
target_link_libraries(test-pthread LibThread)
|
||||
target_link_libraries(test-web LibWeb)
|
||||
target_link_libraries(tt LibPthread)
|
||||
target_link_libraries(grep LibRegex)
|
||||
target_link_libraries(gunzip LibCompress)
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user