Everywhere: Hoist the Services folder to the top-level

Author: https://github.com/trflynn89
Commit: https://github.com/LadybirdBrowser/ladybird/commit/22e0eeada2f
Pull-request: https://github.com/LadybirdBrowser/ladybird/pull/2256
Reviewed-by: https://github.com/sideshowbarker

.github/CODEOWNERS

@@ -11,6 +11,6 @@
 /Userland/Libraries/LibWeb/WebAssembly @alimpfard
 /Userland/Libraries/LibWeb/WebDriver @trflynn89
 /Userland/Libraries/LibXML @alimpfard
-/Userland/Services/RequestServer @alimpfard
-/Userland/Services/WebDriver @trflynn89
+/Services/RequestServer @alimpfard
+/Services/WebDriver @trflynn89
 /Userland/Utilities/wasm.cpp @alimpfard

CMakeLists.txt

@@ -89,7 +89,7 @@ endif()
 include(CTest) # for BUILD_TESTING option, default ON
 
 if (ENABLE_GUI_TARGETS)
-    add_subdirectory(Userland/Services)
+    add_subdirectory(Services)
     add_subdirectory(Ladybird)
 endif()
 

Documentation/EditorConfiguration/QtCreatorConfiguration.md

@@ -24,11 +24,11 @@ First, make sure you have a working toolchain and can build and run Ladybird. Go
     ./
     Userland/
     Userland/Libraries/
-    Userland/Services/
+    Services/
     Build/release/
     Build/release/Userland/
     Build/release/Userland/Libraries/
-    Build/release/Userland/Services/
+    Build/release/Services/
     AK/
     ```
 

Documentation/EditorConfiguration/VSCodeConfiguration.md

@@ -61,10 +61,10 @@ following ``c_cpp_properties.json`` to circumvent some errors. Even with the con
                 "${workspaceFolder}/Build/release/",
                 "${workspaceFolder}/Build/release/Userland",
                 "${workspaceFolder}/Build/release/Userland/Libraries",
-                "${workspaceFolder}/Build/release/Userland/Services",
+                "${workspaceFolder}/Build/release/Services",
                 "${workspaceFolder}/Userland",
                 "${workspaceFolder}/Userland/Libraries",
-                "${workspaceFolder}/Userland/Services"
+                "${workspaceFolder}/Services"
             ],
             "defines": [
                 "DEBUG"
@@ -84,10 +84,10 @@ following ``c_cpp_properties.json`` to circumvent some errors. Even with the con
                     "${workspaceFolder}/Build/release/",
                     "${workspaceFolder}/Build/release/Userland",
                     "${workspaceFolder}/Build/release/Userland/Libraries",
-                    "${workspaceFolder}/Build/release/Userland/Services",
+                    "${workspaceFolder}/Build/release/Services",
                     "${workspaceFolder}/Userland",
                     "${workspaceFolder}/Userland/Libraries",
-                    "${workspaceFolder}/Userland/Services"
+                    "${workspaceFolder}/Services"
                 ],
                 "limitSymbolsToIncludedHeaders": true,
                 "databaseFilename": "${workspaceFolder}/Build/release/"
@@ -290,7 +290,7 @@ The following three example tasks should suffice in most situations, and allow y
 #### Mac
 If you want to run the debugger, first place the content below in `.vscode/launch.json` in the root of the project.
 
-```json 
+```json
 {
     "version": "0.2.0",
     "configurations": [
@@ -310,7 +310,7 @@ then run Ladybird with the debug preset and with the `--debug-process WebContent
 CC=$(brew --prefix llvm)/bin/clang CXX=$(brew --prefix llvm)/bin/clang++ BUILD_PRESET=Debug ./Meta/ladybird.sh run ladybird --debug-process WebContent
 ```
 
-Running Ladybird in this way will pause execution until a debugger is attached. You can then run the debugger by going to the **Run and Debug** menu and selecting the **Attach to WebContent** configuration. 
+Running Ladybird in this way will pause execution until a debugger is attached. You can then run the debugger by going to the **Run and Debug** menu and selecting the **Attach to WebContent** configuration.
 
 #### Linux
 For Linux, the `launch.json` will instead be the file below.

Ladybird/CMakeLists.txt

@@ -95,7 +95,7 @@ target_link_libraries(${LADYBIRD_TARGET} PRIVATE ${LADYBIRD_LIBS})
 
 target_include_directories(${LADYBIRD_TARGET} ${CMAKE_CURRENT_BINARY_DIR})
 target_include_directories(${LADYBIRD_TARGET} ${LADYBIRD_SOURCE_DIR}/Userland/)
-target_include_directories(${LADYBIRD_TARGET} ${LADYBIRD_SOURCE_DIR}/Userland/Services/)
+target_include_directories(${LADYBIRD_TARGET} ${LADYBIRD_SOURCE_DIR}/Services/)
 
 function(set_helper_process_properties)
     set(targets ${ARGV})

Ladybird/cmake/EnableLagom.cmake

@@ -7,10 +7,10 @@ set(LAGOM_BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/Lagom")
 
 # FIXME: Setting target_include_directories on Lagom libraries might make this unnecessary?
 include_directories(${LADYBIRD_SOURCE_DIR})
-include_directories(${LADYBIRD_SOURCE_DIR}/Userland/Services)
+include_directories(${LADYBIRD_SOURCE_DIR}/Services)
 include_directories(${LADYBIRD_SOURCE_DIR}/Userland/Libraries)
 include_directories(${LAGOM_BINARY_DIR})
-include_directories(${LAGOM_BINARY_DIR}/Userland/Services)
+include_directories(${LAGOM_BINARY_DIR}/Services)
 include_directories(${LAGOM_BINARY_DIR}/Userland/Libraries)
 
 add_subdirectory("${LAGOM_SOURCE_DIR}" "${LAGOM_BINARY_DIR}")

Meta/Lagom/CMakeLists.txt

@@ -177,11 +177,11 @@ configure_file(../../AK/Debug.h.in AK/Debug.h @ONLY)
 include_directories(../../)
 include_directories(../../Userland/)
 include_directories(../../Userland/Libraries/)
-include_directories(../../Userland/Services)
+include_directories(../../Services)
 include_directories(${CMAKE_BINARY_DIR})
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 include_directories(${CMAKE_CURRENT_BINARY_DIR}/Userland/Libraries)
-include_directories(${CMAKE_CURRENT_BINARY_DIR}/Userland/Services)
+include_directories(${CMAKE_CURRENT_BINARY_DIR}/Services)
 
 # install rules, think about moving to its own helper cmake file
 include(CMakePackageConfigHelpers)
@@ -234,7 +234,7 @@ function(lagom_lib target_name fs_name)
         target_include_directories(${target_name} INTERFACE
             $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/Services>
             $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/Userland/Libraries>
-            $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/Userland/Services>
+            $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/Services>
         )
     endif()
     add_lagom_library_install_rules(${target_name} ALIAS_NAME ${library})
@@ -425,12 +425,12 @@ if (HAIKU)
     target_link_libraries(LibCore PRIVATE network)
 endif()
 
-compile_ipc(${SERENITY_PROJECT_ROOT}/Userland/Services/RequestServer/RequestClient.ipc Userland/Services/RequestServer/RequestClientEndpoint.h)
-compile_ipc(${SERENITY_PROJECT_ROOT}/Userland/Services/RequestServer/RequestServer.ipc Userland/Services/RequestServer/RequestServerEndpoint.h)
-compile_ipc(${SERENITY_PROJECT_ROOT}/Userland/Services/WebContent/WebContentServer.ipc Userland/Services/WebContent/WebContentServerEndpoint.h)
-compile_ipc(${SERENITY_PROJECT_ROOT}/Userland/Services/WebContent/WebContentClient.ipc Userland/Services/WebContent/WebContentClientEndpoint.h)
-compile_ipc(${SERENITY_PROJECT_ROOT}/Userland/Services/WebContent/WebDriverClient.ipc Userland/Services/WebContent/WebDriverClientEndpoint.h)
-compile_ipc(${SERENITY_PROJECT_ROOT}/Userland/Services/WebContent/WebDriverServer.ipc Userland/Services/WebContent/WebDriverServerEndpoint.h)
+compile_ipc(${SERENITY_PROJECT_ROOT}/Services/RequestServer/RequestClient.ipc Services/RequestServer/RequestClientEndpoint.h)
+compile_ipc(${SERENITY_PROJECT_ROOT}/Services/RequestServer/RequestServer.ipc Services/RequestServer/RequestServerEndpoint.h)
+compile_ipc(${SERENITY_PROJECT_ROOT}/Services/WebContent/WebContentServer.ipc Services/WebContent/WebContentServerEndpoint.h)
+compile_ipc(${SERENITY_PROJECT_ROOT}/Services/WebContent/WebContentClient.ipc Services/WebContent/WebContentClientEndpoint.h)
+compile_ipc(${SERENITY_PROJECT_ROOT}/Services/WebContent/WebDriverClient.ipc Services/WebContent/WebDriverClientEndpoint.h)
+compile_ipc(${SERENITY_PROJECT_ROOT}/Services/WebContent/WebDriverServer.ipc Services/WebContent/WebDriverServerEndpoint.h)
 
 foreach(lib IN LISTS lagom_standard_libraries)
     add_serenity_subdirectory("Userland/Libraries/Lib${lib}")

Services/ImageDecoder/CMakeLists.txt

@@ -20,7 +20,7 @@ endif()
 add_executable(ImageDecoder main.cpp)
 
 target_include_directories(imagedecoderservice PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/../..)
-target_include_directories(imagedecoderservice PRIVATE ${LADYBIRD_SOURCE_DIR}/Userland/Services/)
+target_include_directories(imagedecoderservice PRIVATE ${LADYBIRD_SOURCE_DIR}/Services/)
 
 target_link_libraries(ImageDecoder PRIVATE imagedecoderservice LibCore LibMain)
 target_link_libraries(imagedecoderservice PRIVATE LibCore LibGfx LibIPC LibImageDecoderClient LibMain LibThreading)

Services/RequestServer/CMakeLists.txt

@@ -23,7 +23,7 @@ find_package(CURL REQUIRED)
 add_executable(RequestServer main.cpp)
 
 target_include_directories(requestserverservice PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/../..)
-target_include_directories(requestserverservice PRIVATE ${LADYBIRD_SOURCE_DIR}/Userland/Services/)
+target_include_directories(requestserverservice PRIVATE ${LADYBIRD_SOURCE_DIR}/Services/)
 
 target_link_libraries(RequestServer PRIVATE requestserverservice)
 target_link_libraries(requestserverservice PUBLIC LibCore LibMain LibCrypto LibFileSystem LibIPC LibMain LibTLS LibWebView LibWebSocket LibURL LibTextCodec LibThreading CURL::libcurl)

Services/WebContent/CMakeLists.txt

@@ -30,7 +30,7 @@ else()
 endif()
 
 target_include_directories(webcontentservice PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/../..>)
-target_include_directories(webcontentservice PUBLIC $<BUILD_INTERFACE:${LADYBIRD_SOURCE_DIR}/Userland/Services/>)
+target_include_directories(webcontentservice PUBLIC $<BUILD_INTERFACE:${LADYBIRD_SOURCE_DIR}/Services/>)
 target_include_directories(webcontentservice PUBLIC $<BUILD_INTERFACE:${LADYBIRD_SOURCE_DIR}/Userland/>)
 
 target_link_libraries(webcontentservice PUBLIC LibCore LibFileSystem LibGfx LibIPC LibJS LibMain LibMedia LibWeb LibWebSocket LibRequests LibWebView LibImageDecoderClient)
@@ -72,7 +72,7 @@ target_sources(webcontentservice PUBLIC FILE_SET ladybird TYPE HEADERS
           ${LADYBIRD_SOURCE_DIR}/Ladybird/ImageCodecPlugin.h
 )
 target_sources(webcontentservice PUBLIC FILE_SET server TYPE HEADERS
-    BASE_DIRS ${LADYBIRD_SOURCE_DIR}/Userland/Services
+    BASE_DIRS ${LADYBIRD_SOURCE_DIR}/Services
     FILES ConnectionFromClient.h
           ConsoleGlobalEnvironmentExtensions.h
           Forward.h

Services/WebDriver/CMakeLists.txt

@@ -11,6 +11,6 @@ add_executable(WebDriver ${SOURCES})
 target_include_directories(WebDriver PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../..)
 target_include_directories(WebDriver PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/../..)
 target_include_directories(WebDriver PRIVATE ${LADYBIRD_SOURCE_DIR}/Userland)
-target_include_directories(WebDriver PRIVATE ${LADYBIRD_SOURCE_DIR}/Userland/Services)
+target_include_directories(WebDriver PRIVATE ${LADYBIRD_SOURCE_DIR}/Services)
 
 target_link_libraries(WebDriver PRIVATE LibCore LibFileSystem LibGfx LibIPC LibJS LibMain LibWeb LibWebSocket LibWebView)

Services/WebWorker/CMakeLists.txt

@@ -15,7 +15,7 @@ add_library(webworkerservice STATIC ${WEBWORKER_SOURCES})
 set_target_properties(webworkerservice PROPERTIES AUTOMOC OFF AUTORCC OFF AUTOUIC OFF)
 
 target_include_directories(webworkerservice PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/../..)
-target_include_directories(webworkerservice PRIVATE ${LADYBIRD_SOURCE_DIR}/Userland/Services/)
+target_include_directories(webworkerservice PRIVATE ${LADYBIRD_SOURCE_DIR}/Services/)
 target_include_directories(webworkerservice PRIVATE ${LADYBIRD_SOURCE_DIR}/Userland/)
 
 target_link_libraries(webworkerservice PUBLIC LibCore LibFileSystem LibGfx LibIPC LibJS LibRequests LibWeb LibWebView LibUnicode LibImageDecoderClient LibMain LibURL)

Userland/Libraries/LibImageDecoderClient/CMakeLists.txt

@@ -3,13 +3,13 @@ set(SOURCES
 )
 
 if (NOT SERENITYOS)
-    compile_ipc(../../Services/ImageDecoder/ImageDecoderClient.ipc ../../Services/ImageDecoder/ImageDecoderClientEndpoint.h)
-    compile_ipc(../../Services/ImageDecoder/ImageDecoderServer.ipc ../../Services/ImageDecoder/ImageDecoderServerEndpoint.h)
+    compile_ipc(../../../Services/ImageDecoder/ImageDecoderClient.ipc ../../../Services/ImageDecoder/ImageDecoderClientEndpoint.h)
+    compile_ipc(../../../Services/ImageDecoder/ImageDecoderServer.ipc ../../../Services/ImageDecoder/ImageDecoderServerEndpoint.h)
 endif()
 
 set(GENERATED_SOURCES
-    ../../Services/ImageDecoder/ImageDecoderClientEndpoint.h
-    ../../Services/ImageDecoder/ImageDecoderServerEndpoint.h
+    ../../../Services/ImageDecoder/ImageDecoderClientEndpoint.h
+    ../../../Services/ImageDecoder/ImageDecoderServerEndpoint.h
 )
 
 serenity_lib(LibImageDecoderClient imagedecoderclient)

Userland/Libraries/LibRequests/CMakeLists.txt

@@ -6,8 +6,8 @@ set(SOURCES
 )
 
 set(GENERATED_SOURCES
-    ../../Services/RequestServer/RequestClientEndpoint.h
-    ../../Services/RequestServer/RequestServerEndpoint.h
+    ../../../Services/RequestServer/RequestClientEndpoint.h
+    ../../../Services/RequestServer/RequestServerEndpoint.h
 )
 
 serenity_lib(LibRequests requests)

Userland/Libraries/LibWebView/CMakeLists.txt

@@ -34,12 +34,12 @@ compile_ipc(UIProcessClient.ipc UIProcessClientEndpoint.h)
 
 set(GENERATED_SOURCES
     ${GENERATED_SOURCES}
-    ../../Services/RequestServer/RequestClientEndpoint.h
-    ../../Services/RequestServer/RequestServerEndpoint.h
-    ../../Services/WebContent/WebContentClientEndpoint.h
-    ../../Services/WebContent/WebContentServerEndpoint.h
-    ../../Services/WebContent/WebDriverClientEndpoint.h
-    ../../Services/WebContent/WebDriverServerEndpoint.h
+    ../../../Services/RequestServer/RequestClientEndpoint.h
+    ../../../Services/RequestServer/RequestServerEndpoint.h
+    ../../../Services/WebContent/WebContentClientEndpoint.h
+    ../../../Services/WebContent/WebContentServerEndpoint.h
+    ../../../Services/WebContent/WebDriverClientEndpoint.h
+    ../../../Services/WebContent/WebDriverServerEndpoint.h
     NativeStyleSheetSource.cpp
     UIProcessClientEndpoint.h
     UIProcessServerEndpoint.h