From 950e819ee7aeddc5cf579d58ee6413d694fba149 Mon Sep 17 00:00:00 2001 From: Timothy Flynn Date: Sat, 9 Nov 2024 12:16:38 -0500 Subject: [PATCH] Everywhere: Hoist the Utilities folder to the top-level --- .github/CODEOWNERS | 2 +- Meta/Lagom/CMakeLists.txt | 22 +++++++++---------- {Userland/Utilities => Utilities}/abench.cpp | 0 .../Utilities => Utilities}/animation.cpp | 0 {Userland/Utilities => Utilities}/gzip.cpp | 0 {Userland/Utilities => Utilities}/icc.cpp | 0 {Userland/Utilities => Utilities}/image.cpp | 0 {Userland/Utilities => Utilities}/js.cpp | 0 {Userland/Utilities => Utilities}/lzcat.cpp | 0 {Userland/Utilities => Utilities}/tar.cpp | 0 {Userland/Utilities => Utilities}/wasm.cpp | 0 {Userland/Utilities => Utilities}/xml.cpp | 0 {Userland/Utilities => Utilities}/xzcat.cpp | 0 13 files changed, 12 insertions(+), 12 deletions(-) rename {Userland/Utilities => Utilities}/abench.cpp (100%) rename {Userland/Utilities => Utilities}/animation.cpp (100%) rename {Userland/Utilities => Utilities}/gzip.cpp (100%) rename {Userland/Utilities => Utilities}/icc.cpp (100%) rename {Userland/Utilities => Utilities}/image.cpp (100%) rename {Userland/Utilities => Utilities}/js.cpp (100%) rename {Userland/Utilities => Utilities}/lzcat.cpp (100%) rename {Userland/Utilities => Utilities}/tar.cpp (100%) rename {Userland/Utilities => Utilities}/wasm.cpp (100%) rename {Userland/Utilities => Utilities}/xml.cpp (100%) rename {Userland/Utilities => Utilities}/xzcat.cpp (100%) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 0976743de0e..6d8fad18e14 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -13,4 +13,4 @@ /Userland/Libraries/LibXML @alimpfard /Services/RequestServer @alimpfard /Services/WebDriver @trflynn89 -/Userland/Utilities/wasm.cpp @alimpfard +/Utilities/wasm.cpp @alimpfard diff --git a/Meta/Lagom/CMakeLists.txt b/Meta/Lagom/CMakeLists.txt index 17798267999..88532fe7566 100644 --- a/Meta/Lagom/CMakeLists.txt +++ b/Meta/Lagom/CMakeLists.txt @@ -446,20 +446,20 @@ if (ENABLE_FUZZERS OR ENABLE_COMPILER_EXPLORER_BUILD OR ANDROID OR IOS) endif() # Lagom Utilities -lagom_utility(abench SOURCES ../../Userland/Utilities/abench.cpp LIBS LibMain LibFileSystem LibMedia) +lagom_utility(abench SOURCES ../../Utilities/abench.cpp LIBS LibMain LibFileSystem LibMedia) if (ENABLE_GUI_TARGETS) - lagom_utility(animation SOURCES ../../Userland/Utilities/animation.cpp LIBS LibGfx LibMain) - lagom_utility(icc SOURCES ../../Userland/Utilities/icc.cpp LIBS LibGfx LibMain LibURL) - lagom_utility(image SOURCES ../../Userland/Utilities/image.cpp LIBS LibGfx LibMain) + lagom_utility(animation SOURCES ../../Utilities/animation.cpp LIBS LibGfx LibMain) + lagom_utility(icc SOURCES ../../Utilities/icc.cpp LIBS LibGfx LibMain LibURL) + lagom_utility(image SOURCES ../../Utilities/image.cpp LIBS LibGfx LibMain) endif() -lagom_utility(js SOURCES ../../Userland/Utilities/js.cpp LIBS LibCrypto LibJS LibLine LibUnicode LibMain LibTextCodec Threads::Threads) +lagom_utility(js SOURCES ../../Utilities/js.cpp LIBS LibCrypto LibJS LibLine LibUnicode LibMain LibTextCodec Threads::Threads) -lagom_utility(gzip SOURCES ../../Userland/Utilities/gzip.cpp LIBS LibCompress LibMain) -lagom_utility(lzcat SOURCES ../../Userland/Utilities/lzcat.cpp LIBS LibCompress LibMain) +lagom_utility(gzip SOURCES ../../Utilities/gzip.cpp LIBS LibCompress LibMain) +lagom_utility(lzcat SOURCES ../../Utilities/lzcat.cpp LIBS LibCompress LibMain) -lagom_utility(tar SOURCES ../../Userland/Utilities/tar.cpp LIBS LibArchive LibCompress LibFileSystem LibMain) +lagom_utility(tar SOURCES ../../Utilities/tar.cpp LIBS LibArchive LibCompress LibFileSystem LibMain) lagom_utility(test262-runner SOURCES ../../Tests/LibJS/test262-runner.cpp LIBS LibJS LibFileSystem) if (CMAKE_SYSTEM_NAME STREQUAL "Linux") @@ -479,9 +479,9 @@ if (ASSERT_FAIL_HAS_INT OR EMSCRIPTEN) target_compile_definitions(test262-runner PRIVATE ASSERT_FAIL_HAS_INT) endif() -lagom_utility(wasm SOURCES ../../Userland/Utilities/wasm.cpp LIBS LibFileSystem LibWasm LibLine LibMain LibJS) -lagom_utility(xml SOURCES ../../Userland/Utilities/xml.cpp LIBS LibFileSystem LibMain LibXML LibURL) -lagom_utility(xzcat SOURCES ../../Userland/Utilities/xzcat.cpp LIBS LibCompress LibMain) +lagom_utility(wasm SOURCES ../../Utilities/wasm.cpp LIBS LibFileSystem LibWasm LibLine LibMain LibJS) +lagom_utility(xml SOURCES ../../Utilities/xml.cpp LIBS LibFileSystem LibMain LibXML LibURL) +lagom_utility(xzcat SOURCES ../../Utilities/xzcat.cpp LIBS LibCompress LibMain) include(CTest) if (BUILD_TESTING) diff --git a/Userland/Utilities/abench.cpp b/Utilities/abench.cpp similarity index 100% rename from Userland/Utilities/abench.cpp rename to Utilities/abench.cpp diff --git a/Userland/Utilities/animation.cpp b/Utilities/animation.cpp similarity index 100% rename from Userland/Utilities/animation.cpp rename to Utilities/animation.cpp diff --git a/Userland/Utilities/gzip.cpp b/Utilities/gzip.cpp similarity index 100% rename from Userland/Utilities/gzip.cpp rename to Utilities/gzip.cpp diff --git a/Userland/Utilities/icc.cpp b/Utilities/icc.cpp similarity index 100% rename from Userland/Utilities/icc.cpp rename to Utilities/icc.cpp diff --git a/Userland/Utilities/image.cpp b/Utilities/image.cpp similarity index 100% rename from Userland/Utilities/image.cpp rename to Utilities/image.cpp diff --git a/Userland/Utilities/js.cpp b/Utilities/js.cpp similarity index 100% rename from Userland/Utilities/js.cpp rename to Utilities/js.cpp diff --git a/Userland/Utilities/lzcat.cpp b/Utilities/lzcat.cpp similarity index 100% rename from Userland/Utilities/lzcat.cpp rename to Utilities/lzcat.cpp diff --git a/Userland/Utilities/tar.cpp b/Utilities/tar.cpp similarity index 100% rename from Userland/Utilities/tar.cpp rename to Utilities/tar.cpp diff --git a/Userland/Utilities/wasm.cpp b/Utilities/wasm.cpp similarity index 100% rename from Userland/Utilities/wasm.cpp rename to Utilities/wasm.cpp diff --git a/Userland/Utilities/xml.cpp b/Utilities/xml.cpp similarity index 100% rename from Userland/Utilities/xml.cpp rename to Utilities/xml.cpp diff --git a/Userland/Utilities/xzcat.cpp b/Utilities/xzcat.cpp similarity index 100% rename from Userland/Utilities/xzcat.cpp rename to Utilities/xzcat.cpp