From cf3b58fbe8f836c13e44d6152d78960aff6089ef Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Fri, 8 May 2020 21:57:44 +0200 Subject: [PATCH] Services: Renamed from Servers It didn't feel right to have a "DHCPClient" in a "Servers" directory. Rename this to Services to better reflect the type of programs we'll be putting in there. --- Applications/Browser/Makefile | 6 +++--- Documentation/BuildInstructions.md | 2 +- Kernel/build-root-filesystem.sh | 20 +++++++++---------- Libraries/LibAudio/Makefile | 4 ++-- Libraries/LibGUI/Makefile | 10 +++++----- Libraries/LibProtocol/Makefile | 4 ++-- Libraries/LibWeb/Makefile | 4 ++-- Makefile | 2 +- Makefile.common | 2 +- Meta/CLion/CMakeLists.txt | 4 ++-- .../AudioServer/ASClientConnection.cpp | 0 .../AudioServer/ASClientConnection.h | 0 {Servers => Services}/AudioServer/ASMixer.cpp | 0 {Servers => Services}/AudioServer/ASMixer.h | 0 .../AudioServer/AudioClient.ipc | 0 .../AudioServer/AudioServer.ipc | 0 {Servers => Services}/AudioServer/Makefile | 0 {Servers => Services}/AudioServer/main.cpp | 0 {Servers => Services}/DHCPClient/DHCPv4.cpp | 0 {Servers => Services}/DHCPClient/DHCPv4.h | 0 .../DHCPClient/DHCPv4Client.cpp | 0 .../DHCPClient/DHCPv4Client.h | 0 {Servers => Services}/DHCPClient/Makefile | 0 {Servers => Services}/DHCPClient/main.cpp | 0 .../LookupServer/DNSAnswer.cpp | 0 .../LookupServer/DNSAnswer.h | 0 .../LookupServer/DNSPacket.h | 0 .../LookupServer/DNSQuestion.h | 0 .../LookupServer/DNSRequest.cpp | 0 .../LookupServer/DNSRequest.h | 0 .../LookupServer/DNSResponse.cpp | 0 .../LookupServer/DNSResponse.h | 0 .../LookupServer/LookupServer.cpp | 0 .../LookupServer/LookupServer.h | 0 {Servers => Services}/LookupServer/Makefile | 0 {Servers => Services}/LookupServer/main.cpp | 0 {Servers => Services}/Makefile | 0 .../NotificationServer/ClientConnection.cpp | 0 .../NotificationServer/ClientConnection.h | 0 .../NotificationServer/Makefile | 0 .../NotificationServer/NotificationClient.ipc | 0 .../NotificationServer/NotificationServer.ipc | 0 .../NotificationServer/NotificationWindow.cpp | 0 .../NotificationServer/NotificationWindow.h | 0 .../NotificationServer/main.cpp | 0 .../ProtocolServer/Download.cpp | 0 .../ProtocolServer/Download.h | 0 .../ProtocolServer/HttpDownload.cpp | 0 .../ProtocolServer/HttpDownload.h | 0 .../ProtocolServer/HttpProtocol.cpp | 0 .../ProtocolServer/HttpProtocol.h | 0 .../ProtocolServer/HttpsDownload.cpp | 0 .../ProtocolServer/HttpsDownload.h | 0 .../ProtocolServer/HttpsProtocol.cpp | 0 .../ProtocolServer/HttpsProtocol.h | 0 {Servers => Services}/ProtocolServer/Makefile | 0 .../ProtocolServer/PSClientConnection.cpp | 0 .../ProtocolServer/PSClientConnection.h | 0 .../ProtocolServer/Protocol.cpp | 0 .../ProtocolServer/Protocol.h | 0 .../ProtocolServer/ProtocolClient.ipc | 0 .../ProtocolServer/ProtocolServer.ipc | 0 {Servers => Services}/ProtocolServer/main.cpp | 0 {Servers => Services}/SystemServer/Makefile | 0 .../SystemServer/Service.cpp | 0 {Servers => Services}/SystemServer/Service.h | 0 {Servers => Services}/SystemServer/main.cpp | 0 {Servers => Services}/TTYServer/Makefile | 0 {Servers => Services}/TTYServer/main.cpp | 0 {Servers => Services}/TelnetServer/Client.cpp | 0 {Servers => Services}/TelnetServer/Client.h | 0 {Servers => Services}/TelnetServer/Command.h | 0 {Servers => Services}/TelnetServer/Makefile | 0 {Servers => Services}/TelnetServer/Parser.cpp | 0 {Servers => Services}/TelnetServer/Parser.h | 0 {Servers => Services}/TelnetServer/main.cpp | 0 {Servers => Services}/WebServer/Client.cpp | 0 {Servers => Services}/WebServer/Client.h | 0 {Servers => Services}/WebServer/Makefile | 0 {Servers => Services}/WebServer/main.cpp | 0 .../WindowServer/AppletManager.cpp | 0 .../WindowServer/AppletManager.h | 0 {Servers => Services}/WindowServer/Button.cpp | 0 {Servers => Services}/WindowServer/Button.h | 0 .../WindowServer/ClientConnection.cpp | 0 .../WindowServer/ClientConnection.h | 0 .../WindowServer/Clipboard.cpp | 0 .../WindowServer/Clipboard.h | 0 .../WindowServer/Compositor.cpp | 0 .../WindowServer/Compositor.h | 0 {Servers => Services}/WindowServer/Cursor.cpp | 0 {Servers => Services}/WindowServer/Cursor.h | 0 {Servers => Services}/WindowServer/Event.h | 0 .../WindowServer/EventLoop.cpp | 0 .../WindowServer/EventLoop.h | 0 {Servers => Services}/WindowServer/Makefile | 0 {Servers => Services}/WindowServer/Menu.cpp | 0 {Servers => Services}/WindowServer/Menu.h | 0 .../WindowServer/MenuBar.cpp | 0 {Servers => Services}/WindowServer/MenuBar.h | 0 .../WindowServer/MenuItem.cpp | 0 {Servers => Services}/WindowServer/MenuItem.h | 0 .../WindowServer/MenuManager.cpp | 0 .../WindowServer/MenuManager.h | 0 {Servers => Services}/WindowServer/Screen.cpp | 0 {Servers => Services}/WindowServer/Screen.h | 0 {Servers => Services}/WindowServer/Window.cpp | 0 {Servers => Services}/WindowServer/Window.h | 0 .../WindowServer/WindowClient.ipc | 0 .../WindowServer/WindowFrame.cpp | 0 .../WindowServer/WindowFrame.h | 0 .../WindowServer/WindowManager.cpp | 0 .../WindowServer/WindowManager.h | 0 .../WindowServer/WindowServer.ipc | 0 .../WindowServer/WindowSwitcher.cpp | 0 .../WindowServer/WindowSwitcher.h | 0 .../WindowServer/WindowType.h | 0 {Servers => Services}/WindowServer/main.cpp | 0 Toolchain/ComputeDependenciesHash.sh | 4 ++-- 119 files changed, 31 insertions(+), 31 deletions(-) rename {Servers => Services}/AudioServer/ASClientConnection.cpp (100%) rename {Servers => Services}/AudioServer/ASClientConnection.h (100%) rename {Servers => Services}/AudioServer/ASMixer.cpp (100%) rename {Servers => Services}/AudioServer/ASMixer.h (100%) rename {Servers => Services}/AudioServer/AudioClient.ipc (100%) rename {Servers => Services}/AudioServer/AudioServer.ipc (100%) rename {Servers => Services}/AudioServer/Makefile (100%) rename {Servers => Services}/AudioServer/main.cpp (100%) rename {Servers => Services}/DHCPClient/DHCPv4.cpp (100%) rename {Servers => Services}/DHCPClient/DHCPv4.h (100%) rename {Servers => Services}/DHCPClient/DHCPv4Client.cpp (100%) rename {Servers => Services}/DHCPClient/DHCPv4Client.h (100%) rename {Servers => Services}/DHCPClient/Makefile (100%) rename {Servers => Services}/DHCPClient/main.cpp (100%) rename {Servers => Services}/LookupServer/DNSAnswer.cpp (100%) rename {Servers => Services}/LookupServer/DNSAnswer.h (100%) rename {Servers => Services}/LookupServer/DNSPacket.h (100%) rename {Servers => Services}/LookupServer/DNSQuestion.h (100%) rename {Servers => Services}/LookupServer/DNSRequest.cpp (100%) rename {Servers => Services}/LookupServer/DNSRequest.h (100%) rename {Servers => Services}/LookupServer/DNSResponse.cpp (100%) rename {Servers => Services}/LookupServer/DNSResponse.h (100%) rename {Servers => Services}/LookupServer/LookupServer.cpp (100%) rename {Servers => Services}/LookupServer/LookupServer.h (100%) rename {Servers => Services}/LookupServer/Makefile (100%) rename {Servers => Services}/LookupServer/main.cpp (100%) rename {Servers => Services}/Makefile (100%) rename {Servers => Services}/NotificationServer/ClientConnection.cpp (100%) rename {Servers => Services}/NotificationServer/ClientConnection.h (100%) rename {Servers => Services}/NotificationServer/Makefile (100%) rename {Servers => Services}/NotificationServer/NotificationClient.ipc (100%) rename {Servers => Services}/NotificationServer/NotificationServer.ipc (100%) rename {Servers => Services}/NotificationServer/NotificationWindow.cpp (100%) rename {Servers => Services}/NotificationServer/NotificationWindow.h (100%) rename {Servers => Services}/NotificationServer/main.cpp (100%) rename {Servers => Services}/ProtocolServer/Download.cpp (100%) rename {Servers => Services}/ProtocolServer/Download.h (100%) rename {Servers => Services}/ProtocolServer/HttpDownload.cpp (100%) rename {Servers => Services}/ProtocolServer/HttpDownload.h (100%) rename {Servers => Services}/ProtocolServer/HttpProtocol.cpp (100%) rename {Servers => Services}/ProtocolServer/HttpProtocol.h (100%) rename {Servers => Services}/ProtocolServer/HttpsDownload.cpp (100%) rename {Servers => Services}/ProtocolServer/HttpsDownload.h (100%) rename {Servers => Services}/ProtocolServer/HttpsProtocol.cpp (100%) rename {Servers => Services}/ProtocolServer/HttpsProtocol.h (100%) rename {Servers => Services}/ProtocolServer/Makefile (100%) rename {Servers => Services}/ProtocolServer/PSClientConnection.cpp (100%) rename {Servers => Services}/ProtocolServer/PSClientConnection.h (100%) rename {Servers => Services}/ProtocolServer/Protocol.cpp (100%) rename {Servers => Services}/ProtocolServer/Protocol.h (100%) rename {Servers => Services}/ProtocolServer/ProtocolClient.ipc (100%) rename {Servers => Services}/ProtocolServer/ProtocolServer.ipc (100%) rename {Servers => Services}/ProtocolServer/main.cpp (100%) rename {Servers => Services}/SystemServer/Makefile (100%) rename {Servers => Services}/SystemServer/Service.cpp (100%) rename {Servers => Services}/SystemServer/Service.h (100%) rename {Servers => Services}/SystemServer/main.cpp (100%) rename {Servers => Services}/TTYServer/Makefile (100%) rename {Servers => Services}/TTYServer/main.cpp (100%) rename {Servers => Services}/TelnetServer/Client.cpp (100%) rename {Servers => Services}/TelnetServer/Client.h (100%) rename {Servers => Services}/TelnetServer/Command.h (100%) rename {Servers => Services}/TelnetServer/Makefile (100%) rename {Servers => Services}/TelnetServer/Parser.cpp (100%) rename {Servers => Services}/TelnetServer/Parser.h (100%) rename {Servers => Services}/TelnetServer/main.cpp (100%) rename {Servers => Services}/WebServer/Client.cpp (100%) rename {Servers => Services}/WebServer/Client.h (100%) rename {Servers => Services}/WebServer/Makefile (100%) rename {Servers => Services}/WebServer/main.cpp (100%) rename {Servers => Services}/WindowServer/AppletManager.cpp (100%) rename {Servers => Services}/WindowServer/AppletManager.h (100%) rename {Servers => Services}/WindowServer/Button.cpp (100%) rename {Servers => Services}/WindowServer/Button.h (100%) rename {Servers => Services}/WindowServer/ClientConnection.cpp (100%) rename {Servers => Services}/WindowServer/ClientConnection.h (100%) rename {Servers => Services}/WindowServer/Clipboard.cpp (100%) rename {Servers => Services}/WindowServer/Clipboard.h (100%) rename {Servers => Services}/WindowServer/Compositor.cpp (100%) rename {Servers => Services}/WindowServer/Compositor.h (100%) rename {Servers => Services}/WindowServer/Cursor.cpp (100%) rename {Servers => Services}/WindowServer/Cursor.h (100%) rename {Servers => Services}/WindowServer/Event.h (100%) rename {Servers => Services}/WindowServer/EventLoop.cpp (100%) rename {Servers => Services}/WindowServer/EventLoop.h (100%) rename {Servers => Services}/WindowServer/Makefile (100%) rename {Servers => Services}/WindowServer/Menu.cpp (100%) rename {Servers => Services}/WindowServer/Menu.h (100%) rename {Servers => Services}/WindowServer/MenuBar.cpp (100%) rename {Servers => Services}/WindowServer/MenuBar.h (100%) rename {Servers => Services}/WindowServer/MenuItem.cpp (100%) rename {Servers => Services}/WindowServer/MenuItem.h (100%) rename {Servers => Services}/WindowServer/MenuManager.cpp (100%) rename {Servers => Services}/WindowServer/MenuManager.h (100%) rename {Servers => Services}/WindowServer/Screen.cpp (100%) rename {Servers => Services}/WindowServer/Screen.h (100%) rename {Servers => Services}/WindowServer/Window.cpp (100%) rename {Servers => Services}/WindowServer/Window.h (100%) rename {Servers => Services}/WindowServer/WindowClient.ipc (100%) rename {Servers => Services}/WindowServer/WindowFrame.cpp (100%) rename {Servers => Services}/WindowServer/WindowFrame.h (100%) rename {Servers => Services}/WindowServer/WindowManager.cpp (100%) rename {Servers => Services}/WindowServer/WindowManager.h (100%) rename {Servers => Services}/WindowServer/WindowServer.ipc (100%) rename {Servers => Services}/WindowServer/WindowSwitcher.cpp (100%) rename {Servers => Services}/WindowServer/WindowSwitcher.h (100%) rename {Servers => Services}/WindowServer/WindowType.h (100%) rename {Servers => Services}/WindowServer/main.cpp (100%) diff --git a/Applications/Browser/Makefile b/Applications/Browser/Makefile index 354d07c7cb..1cd944c891 100644 --- a/Applications/Browser/Makefile +++ b/Applications/Browser/Makefile @@ -14,8 +14,8 @@ main.cpp: ../../Libraries/LibWeb/CSS/PropertyID.h ../../Libraries/LibWeb/CSS/PropertyID.h: @flock ../../Libraries/LibWeb $(MAKE) -C ../../Libraries/LibWeb -main.cpp: ../../Servers/ProtocolServer/ProtocolClientEndpoint.h -../../Servers/ProtocolServer/ProtocolClientEndpoint.h: - @flock ../../Servers/ProtocolServer $(MAKE) -C $(dir $(@)) +main.cpp: ../../Services/ProtocolServer/ProtocolClientEndpoint.h +../../Services/ProtocolServer/ProtocolClientEndpoint.h: + @flock ../../Services/ProtocolServer $(MAKE) -C $(dir $(@)) include ../../Makefile.common diff --git a/Documentation/BuildInstructions.md b/Documentation/BuildInstructions.md index 4dd79d15ee..5fbd287624 100644 --- a/Documentation/BuildInstructions.md +++ b/Documentation/BuildInstructions.md @@ -81,7 +81,7 @@ Bare curious users may even consider sourcing suitable hardware to [install Sere Later on, when you `git pull` to get the latest changes, there's no need to rebuild the toolchain. You can simply rerun **./makeall.sh** in the `Kernel/` directory and you'll be good to **./run** again. -You can even re-compile only parts of the system. Imagine you changed something in the **WindowServer**. Then run `make -C ../Servers/WindowServer` (from the `Kernel/` directory) followed by **./sync.sh** to update the disk image. Then you can start the system with **./run** again. +You can even re-compile only parts of the system. Imagine you changed something in the **WindowServer**. Then run `make -C ../Services/WindowServer` (from the `Kernel/` directory) followed by **./sync.sh** to update the disk image. Then you can start the system with **./run** again. #### Ports To add a package from the ports collection to Serenity, for example curl, go into `Ports/curl/` and run **./package.sh**. The sourcecode for the package will be downloaded and the package will be built. After that, run **./sync.sh** from the `Kernel/` directory to update the disk image. The next time you start Serenity with **./run**, `curl` will be available. diff --git a/Kernel/build-root-filesystem.sh b/Kernel/build-root-filesystem.sh index 3c078ad0ef..90b753c6cf 100755 --- a/Kernel/build-root-filesystem.sh +++ b/Kernel/build-root-filesystem.sh @@ -159,16 +159,16 @@ cp ../DevTools/Inspector/Inspector mnt/bin/Inspector cp ../DevTools/ProfileViewer/ProfileViewer mnt/bin/ProfileViewer cp ../Games/Minesweeper/Minesweeper mnt/bin/Minesweeper cp ../Games/Snake/Snake mnt/bin/Snake -cp ../Servers/DHCPClient/DHCPClient mnt/bin/DHCPClient -cp ../Servers/LookupServer/LookupServer mnt/bin/LookupServer -cp ../Servers/SystemServer/SystemServer mnt/bin/SystemServer -cp ../Servers/WindowServer/WindowServer mnt/bin/WindowServer -cp ../Servers/AudioServer/AudioServer mnt/bin/AudioServer -cp ../Servers/TTYServer/TTYServer mnt/bin/TTYServer -cp ../Servers/TelnetServer/TelnetServer mnt/bin/TelnetServer -cp ../Servers/ProtocolServer/ProtocolServer mnt/bin/ProtocolServer -cp ../Servers/NotificationServer/NotificationServer mnt/bin/NotificationServer -cp ../Servers/WebServer/WebServer mnt/bin/WebServer +cp ../Services/DHCPClient/DHCPClient mnt/bin/DHCPClient +cp ../Services/LookupServer/LookupServer mnt/bin/LookupServer +cp ../Services/SystemServer/SystemServer mnt/bin/SystemServer +cp ../Services/WindowServer/WindowServer mnt/bin/WindowServer +cp ../Services/AudioServer/AudioServer mnt/bin/AudioServer +cp ../Services/TTYServer/TTYServer mnt/bin/TTYServer +cp ../Services/TelnetServer/TelnetServer mnt/bin/TelnetServer +cp ../Services/ProtocolServer/ProtocolServer mnt/bin/ProtocolServer +cp ../Services/NotificationServer/NotificationServer mnt/bin/NotificationServer +cp ../Services/WebServer/WebServer mnt/bin/WebServer cp ../Shell/Shell mnt/bin/Shell cp ../MenuApplets/Audio/Audio.MenuApplet mnt/bin/ cp ../MenuApplets/ResourceGraph/ResourceGraph.MenuApplet mnt/bin/ diff --git a/Libraries/LibAudio/Makefile b/Libraries/LibAudio/Makefile index 51453a9665..41e9fd3549 100644 --- a/Libraries/LibAudio/Makefile +++ b/Libraries/LibAudio/Makefile @@ -5,8 +5,8 @@ OBJS = \ LIBRARY = libaudio.a -ClientConnection.cpp: ../../Servers/AudioServer/AudioClientEndpoint.h -../../Servers/AudioServer/AudioClientEndpoint.h: +ClientConnection.cpp: ../../Services/AudioServer/AudioClientEndpoint.h +../../Services/AudioServer/AudioClientEndpoint.h: @flock $(dir $(@)) $(MAKE) -C $(dir $(@)) install: diff --git a/Libraries/LibGUI/Makefile b/Libraries/LibGUI/Makefile index 2535132435..bbb1327472 100644 --- a/Libraries/LibGUI/Makefile +++ b/Libraries/LibGUI/Makefile @@ -77,18 +77,18 @@ OBJS = \ LIBRARY = libgui.a -Application.cpp: ../../Servers/WindowServer/WindowServerEndpoint.h +Application.cpp: ../../Services/WindowServer/WindowServerEndpoint.h -../../Servers/WindowServer/WindowServerEndpoint.h: +../../Services/WindowServer/WindowServerEndpoint.h: @flock $(dir $(@)) $(MAKE) -C $(dir $(@)) # HACK: NotificationServer depends on LibGUI so we don't flock for these.. -Notification.cpp: ../../Servers/NotificationServer/NotificationServerEndpoint.h ../../Servers/NotificationServer/NotificationClientEndpoint.h +Notification.cpp: ../../Services/NotificationServer/NotificationServerEndpoint.h ../../Services/NotificationServer/NotificationClientEndpoint.h -../../Servers/NotificationServer/NotificationServerEndpoint.h: +../../Services/NotificationServer/NotificationServerEndpoint.h: $(MAKE) -C $(dir $(@)) NotificationServerEndpoint.h -../../Servers/NotificationServer/NotificationClientEndpoint.h: +../../Services/NotificationServer/NotificationClientEndpoint.h: $(MAKE) -C $(dir $(@)) NotificationClientEndpoint.h install: diff --git a/Libraries/LibProtocol/Makefile b/Libraries/LibProtocol/Makefile index 05714ffb88..00b3605fb6 100644 --- a/Libraries/LibProtocol/Makefile +++ b/Libraries/LibProtocol/Makefile @@ -4,8 +4,8 @@ OBJS = \ LIBRARY = libprotocol.a -Download.cpp Client.cpp: ../../Servers/ProtocolServer/ProtocolClientEndpoint.h ../../Servers/ProtocolServer/ProtocolServerEndpoint.h -../../Servers/ProtocolServer/ProtocolClientEndpoint.h ../../Servers/ProtocolServer/ProtocolServerEndpoint.h: +Download.cpp Client.cpp: ../../Services/ProtocolServer/ProtocolClientEndpoint.h ../../Services/ProtocolServer/ProtocolServerEndpoint.h +../../Services/ProtocolServer/ProtocolClientEndpoint.h ../../Services/ProtocolServer/ProtocolServerEndpoint.h: @flock $(dir $(@)) $(MAKE) -C $(dir $(@)) include ../../Makefile.common diff --git a/Libraries/LibWeb/Makefile b/Libraries/LibWeb/Makefile index 2016f72898..c86aa8bf12 100644 --- a/Libraries/LibWeb/Makefile +++ b/Libraries/LibWeb/Makefile @@ -118,8 +118,8 @@ CSS/PropertyID.cpp: CSS/Properties.json $(GENERATE_CSS_PROPERTYID_CPP) @echo "GENERATE $@" $(QUIET) flock CSS $(GENERATE_CSS_PROPERTYID_CPP) $< > $@ -ResourceLoader.cpp: ../../Servers/ProtocolServer/ProtocolClientEndpoint.h ../../Servers/ProtocolServer/ProtocolServerEndpoint.h -../../Servers/ProtocolServer/ProtocolClientEndpoint.h ../../Servers/ProtocolServer/ProtocolServerEndpoint.h: +ResourceLoader.cpp: ../../Services/ProtocolServer/ProtocolClientEndpoint.h ../../Services/ProtocolServer/ProtocolServerEndpoint.h +../../Services/ProtocolServer/ProtocolClientEndpoint.h ../../Services/ProtocolServer/ProtocolServerEndpoint.h: @flock $(dir $(@)) $(MAKE) -C $(dir $(@)) EXTRA_CLEAN = CSS/DefaultStyleSheetSource.cpp CSS/PropertyID.h CSS/PropertyID.cpp diff --git a/Makefile b/Makefile index f59dd7517d..f8171d607a 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ SUBDIRS += \ Libraries \ AK \ DevTools \ - Servers + Services SUBDIRS += \ Applications \ diff --git a/Makefile.common b/Makefile.common index 50b7efd90e..0f40094a1d 100644 --- a/Makefile.common +++ b/Makefile.common @@ -18,7 +18,7 @@ INCLUDE_FLAGS += \ -I$(SERENITY_BASE_DIR)/DevTools \ -I$(SERENITY_BASE_DIR) \ -I$(SERENITY_BASE_DIR)/Libraries \ - -I$(SERENITY_BASE_DIR)/Servers + -I$(SERENITY_BASE_DIR)/Services VERBOSE = 0 diff --git a/Meta/CLion/CMakeLists.txt b/Meta/CLion/CMakeLists.txt index 4e060c8b4a..048e657892 100644 --- a/Meta/CLion/CMakeLists.txt +++ b/Meta/CLion/CMakeLists.txt @@ -12,7 +12,7 @@ file(GLOB_RECURSE KERNEL_SOURCES "serenity/Kernel/*.cpp") file(GLOB_RECURSE LIBRARIES_SOURCES "serenity/Libraries/*.cpp") file(GLOB_RECURSE MENU_APPLETS_SOURCES "serenity/MenuApplets/*.cpp") file(GLOB_RECURSE PORTS_SOURCES "serenity/Ports/*.cpp") -file(GLOB_RECURSE SERVERS_SOURCES "serenity/Servers/*.cpp") +file(GLOB_RECURSE SERVERS_SOURCES "serenity/Services/*.cpp") file(GLOB_RECURSE SHELL_SOURCES "serenity/Shell/*.cpp") file(GLOB_RECURSE TESTS_SOURCES "serenity/Tests/*.cpp") file(GLOB_RECURSE TOOLCHAIN_SOURCES "serenity/Toolchain/*.cpp") @@ -24,7 +24,7 @@ set(INCLUDE_DIRS "serenity/Libraries" "serenity/Libraries/LibC" "serenity/Libraries/LibPthread" - "serenity/Servers" + "serenity/Services" "serenity/Toolchain/Local/i686-pc-serenity/include/c++/9.3.0") add_library(serenity diff --git a/Servers/AudioServer/ASClientConnection.cpp b/Services/AudioServer/ASClientConnection.cpp similarity index 100% rename from Servers/AudioServer/ASClientConnection.cpp rename to Services/AudioServer/ASClientConnection.cpp diff --git a/Servers/AudioServer/ASClientConnection.h b/Services/AudioServer/ASClientConnection.h similarity index 100% rename from Servers/AudioServer/ASClientConnection.h rename to Services/AudioServer/ASClientConnection.h diff --git a/Servers/AudioServer/ASMixer.cpp b/Services/AudioServer/ASMixer.cpp similarity index 100% rename from Servers/AudioServer/ASMixer.cpp rename to Services/AudioServer/ASMixer.cpp diff --git a/Servers/AudioServer/ASMixer.h b/Services/AudioServer/ASMixer.h similarity index 100% rename from Servers/AudioServer/ASMixer.h rename to Services/AudioServer/ASMixer.h diff --git a/Servers/AudioServer/AudioClient.ipc b/Services/AudioServer/AudioClient.ipc similarity index 100% rename from Servers/AudioServer/AudioClient.ipc rename to Services/AudioServer/AudioClient.ipc diff --git a/Servers/AudioServer/AudioServer.ipc b/Services/AudioServer/AudioServer.ipc similarity index 100% rename from Servers/AudioServer/AudioServer.ipc rename to Services/AudioServer/AudioServer.ipc diff --git a/Servers/AudioServer/Makefile b/Services/AudioServer/Makefile similarity index 100% rename from Servers/AudioServer/Makefile rename to Services/AudioServer/Makefile diff --git a/Servers/AudioServer/main.cpp b/Services/AudioServer/main.cpp similarity index 100% rename from Servers/AudioServer/main.cpp rename to Services/AudioServer/main.cpp diff --git a/Servers/DHCPClient/DHCPv4.cpp b/Services/DHCPClient/DHCPv4.cpp similarity index 100% rename from Servers/DHCPClient/DHCPv4.cpp rename to Services/DHCPClient/DHCPv4.cpp diff --git a/Servers/DHCPClient/DHCPv4.h b/Services/DHCPClient/DHCPv4.h similarity index 100% rename from Servers/DHCPClient/DHCPv4.h rename to Services/DHCPClient/DHCPv4.h diff --git a/Servers/DHCPClient/DHCPv4Client.cpp b/Services/DHCPClient/DHCPv4Client.cpp similarity index 100% rename from Servers/DHCPClient/DHCPv4Client.cpp rename to Services/DHCPClient/DHCPv4Client.cpp diff --git a/Servers/DHCPClient/DHCPv4Client.h b/Services/DHCPClient/DHCPv4Client.h similarity index 100% rename from Servers/DHCPClient/DHCPv4Client.h rename to Services/DHCPClient/DHCPv4Client.h diff --git a/Servers/DHCPClient/Makefile b/Services/DHCPClient/Makefile similarity index 100% rename from Servers/DHCPClient/Makefile rename to Services/DHCPClient/Makefile diff --git a/Servers/DHCPClient/main.cpp b/Services/DHCPClient/main.cpp similarity index 100% rename from Servers/DHCPClient/main.cpp rename to Services/DHCPClient/main.cpp diff --git a/Servers/LookupServer/DNSAnswer.cpp b/Services/LookupServer/DNSAnswer.cpp similarity index 100% rename from Servers/LookupServer/DNSAnswer.cpp rename to Services/LookupServer/DNSAnswer.cpp diff --git a/Servers/LookupServer/DNSAnswer.h b/Services/LookupServer/DNSAnswer.h similarity index 100% rename from Servers/LookupServer/DNSAnswer.h rename to Services/LookupServer/DNSAnswer.h diff --git a/Servers/LookupServer/DNSPacket.h b/Services/LookupServer/DNSPacket.h similarity index 100% rename from Servers/LookupServer/DNSPacket.h rename to Services/LookupServer/DNSPacket.h diff --git a/Servers/LookupServer/DNSQuestion.h b/Services/LookupServer/DNSQuestion.h similarity index 100% rename from Servers/LookupServer/DNSQuestion.h rename to Services/LookupServer/DNSQuestion.h diff --git a/Servers/LookupServer/DNSRequest.cpp b/Services/LookupServer/DNSRequest.cpp similarity index 100% rename from Servers/LookupServer/DNSRequest.cpp rename to Services/LookupServer/DNSRequest.cpp diff --git a/Servers/LookupServer/DNSRequest.h b/Services/LookupServer/DNSRequest.h similarity index 100% rename from Servers/LookupServer/DNSRequest.h rename to Services/LookupServer/DNSRequest.h diff --git a/Servers/LookupServer/DNSResponse.cpp b/Services/LookupServer/DNSResponse.cpp similarity index 100% rename from Servers/LookupServer/DNSResponse.cpp rename to Services/LookupServer/DNSResponse.cpp diff --git a/Servers/LookupServer/DNSResponse.h b/Services/LookupServer/DNSResponse.h similarity index 100% rename from Servers/LookupServer/DNSResponse.h rename to Services/LookupServer/DNSResponse.h diff --git a/Servers/LookupServer/LookupServer.cpp b/Services/LookupServer/LookupServer.cpp similarity index 100% rename from Servers/LookupServer/LookupServer.cpp rename to Services/LookupServer/LookupServer.cpp diff --git a/Servers/LookupServer/LookupServer.h b/Services/LookupServer/LookupServer.h similarity index 100% rename from Servers/LookupServer/LookupServer.h rename to Services/LookupServer/LookupServer.h diff --git a/Servers/LookupServer/Makefile b/Services/LookupServer/Makefile similarity index 100% rename from Servers/LookupServer/Makefile rename to Services/LookupServer/Makefile diff --git a/Servers/LookupServer/main.cpp b/Services/LookupServer/main.cpp similarity index 100% rename from Servers/LookupServer/main.cpp rename to Services/LookupServer/main.cpp diff --git a/Servers/Makefile b/Services/Makefile similarity index 100% rename from Servers/Makefile rename to Services/Makefile diff --git a/Servers/NotificationServer/ClientConnection.cpp b/Services/NotificationServer/ClientConnection.cpp similarity index 100% rename from Servers/NotificationServer/ClientConnection.cpp rename to Services/NotificationServer/ClientConnection.cpp diff --git a/Servers/NotificationServer/ClientConnection.h b/Services/NotificationServer/ClientConnection.h similarity index 100% rename from Servers/NotificationServer/ClientConnection.h rename to Services/NotificationServer/ClientConnection.h diff --git a/Servers/NotificationServer/Makefile b/Services/NotificationServer/Makefile similarity index 100% rename from Servers/NotificationServer/Makefile rename to Services/NotificationServer/Makefile diff --git a/Servers/NotificationServer/NotificationClient.ipc b/Services/NotificationServer/NotificationClient.ipc similarity index 100% rename from Servers/NotificationServer/NotificationClient.ipc rename to Services/NotificationServer/NotificationClient.ipc diff --git a/Servers/NotificationServer/NotificationServer.ipc b/Services/NotificationServer/NotificationServer.ipc similarity index 100% rename from Servers/NotificationServer/NotificationServer.ipc rename to Services/NotificationServer/NotificationServer.ipc diff --git a/Servers/NotificationServer/NotificationWindow.cpp b/Services/NotificationServer/NotificationWindow.cpp similarity index 100% rename from Servers/NotificationServer/NotificationWindow.cpp rename to Services/NotificationServer/NotificationWindow.cpp diff --git a/Servers/NotificationServer/NotificationWindow.h b/Services/NotificationServer/NotificationWindow.h similarity index 100% rename from Servers/NotificationServer/NotificationWindow.h rename to Services/NotificationServer/NotificationWindow.h diff --git a/Servers/NotificationServer/main.cpp b/Services/NotificationServer/main.cpp similarity index 100% rename from Servers/NotificationServer/main.cpp rename to Services/NotificationServer/main.cpp diff --git a/Servers/ProtocolServer/Download.cpp b/Services/ProtocolServer/Download.cpp similarity index 100% rename from Servers/ProtocolServer/Download.cpp rename to Services/ProtocolServer/Download.cpp diff --git a/Servers/ProtocolServer/Download.h b/Services/ProtocolServer/Download.h similarity index 100% rename from Servers/ProtocolServer/Download.h rename to Services/ProtocolServer/Download.h diff --git a/Servers/ProtocolServer/HttpDownload.cpp b/Services/ProtocolServer/HttpDownload.cpp similarity index 100% rename from Servers/ProtocolServer/HttpDownload.cpp rename to Services/ProtocolServer/HttpDownload.cpp diff --git a/Servers/ProtocolServer/HttpDownload.h b/Services/ProtocolServer/HttpDownload.h similarity index 100% rename from Servers/ProtocolServer/HttpDownload.h rename to Services/ProtocolServer/HttpDownload.h diff --git a/Servers/ProtocolServer/HttpProtocol.cpp b/Services/ProtocolServer/HttpProtocol.cpp similarity index 100% rename from Servers/ProtocolServer/HttpProtocol.cpp rename to Services/ProtocolServer/HttpProtocol.cpp diff --git a/Servers/ProtocolServer/HttpProtocol.h b/Services/ProtocolServer/HttpProtocol.h similarity index 100% rename from Servers/ProtocolServer/HttpProtocol.h rename to Services/ProtocolServer/HttpProtocol.h diff --git a/Servers/ProtocolServer/HttpsDownload.cpp b/Services/ProtocolServer/HttpsDownload.cpp similarity index 100% rename from Servers/ProtocolServer/HttpsDownload.cpp rename to Services/ProtocolServer/HttpsDownload.cpp diff --git a/Servers/ProtocolServer/HttpsDownload.h b/Services/ProtocolServer/HttpsDownload.h similarity index 100% rename from Servers/ProtocolServer/HttpsDownload.h rename to Services/ProtocolServer/HttpsDownload.h diff --git a/Servers/ProtocolServer/HttpsProtocol.cpp b/Services/ProtocolServer/HttpsProtocol.cpp similarity index 100% rename from Servers/ProtocolServer/HttpsProtocol.cpp rename to Services/ProtocolServer/HttpsProtocol.cpp diff --git a/Servers/ProtocolServer/HttpsProtocol.h b/Services/ProtocolServer/HttpsProtocol.h similarity index 100% rename from Servers/ProtocolServer/HttpsProtocol.h rename to Services/ProtocolServer/HttpsProtocol.h diff --git a/Servers/ProtocolServer/Makefile b/Services/ProtocolServer/Makefile similarity index 100% rename from Servers/ProtocolServer/Makefile rename to Services/ProtocolServer/Makefile diff --git a/Servers/ProtocolServer/PSClientConnection.cpp b/Services/ProtocolServer/PSClientConnection.cpp similarity index 100% rename from Servers/ProtocolServer/PSClientConnection.cpp rename to Services/ProtocolServer/PSClientConnection.cpp diff --git a/Servers/ProtocolServer/PSClientConnection.h b/Services/ProtocolServer/PSClientConnection.h similarity index 100% rename from Servers/ProtocolServer/PSClientConnection.h rename to Services/ProtocolServer/PSClientConnection.h diff --git a/Servers/ProtocolServer/Protocol.cpp b/Services/ProtocolServer/Protocol.cpp similarity index 100% rename from Servers/ProtocolServer/Protocol.cpp rename to Services/ProtocolServer/Protocol.cpp diff --git a/Servers/ProtocolServer/Protocol.h b/Services/ProtocolServer/Protocol.h similarity index 100% rename from Servers/ProtocolServer/Protocol.h rename to Services/ProtocolServer/Protocol.h diff --git a/Servers/ProtocolServer/ProtocolClient.ipc b/Services/ProtocolServer/ProtocolClient.ipc similarity index 100% rename from Servers/ProtocolServer/ProtocolClient.ipc rename to Services/ProtocolServer/ProtocolClient.ipc diff --git a/Servers/ProtocolServer/ProtocolServer.ipc b/Services/ProtocolServer/ProtocolServer.ipc similarity index 100% rename from Servers/ProtocolServer/ProtocolServer.ipc rename to Services/ProtocolServer/ProtocolServer.ipc diff --git a/Servers/ProtocolServer/main.cpp b/Services/ProtocolServer/main.cpp similarity index 100% rename from Servers/ProtocolServer/main.cpp rename to Services/ProtocolServer/main.cpp diff --git a/Servers/SystemServer/Makefile b/Services/SystemServer/Makefile similarity index 100% rename from Servers/SystemServer/Makefile rename to Services/SystemServer/Makefile diff --git a/Servers/SystemServer/Service.cpp b/Services/SystemServer/Service.cpp similarity index 100% rename from Servers/SystemServer/Service.cpp rename to Services/SystemServer/Service.cpp diff --git a/Servers/SystemServer/Service.h b/Services/SystemServer/Service.h similarity index 100% rename from Servers/SystemServer/Service.h rename to Services/SystemServer/Service.h diff --git a/Servers/SystemServer/main.cpp b/Services/SystemServer/main.cpp similarity index 100% rename from Servers/SystemServer/main.cpp rename to Services/SystemServer/main.cpp diff --git a/Servers/TTYServer/Makefile b/Services/TTYServer/Makefile similarity index 100% rename from Servers/TTYServer/Makefile rename to Services/TTYServer/Makefile diff --git a/Servers/TTYServer/main.cpp b/Services/TTYServer/main.cpp similarity index 100% rename from Servers/TTYServer/main.cpp rename to Services/TTYServer/main.cpp diff --git a/Servers/TelnetServer/Client.cpp b/Services/TelnetServer/Client.cpp similarity index 100% rename from Servers/TelnetServer/Client.cpp rename to Services/TelnetServer/Client.cpp diff --git a/Servers/TelnetServer/Client.h b/Services/TelnetServer/Client.h similarity index 100% rename from Servers/TelnetServer/Client.h rename to Services/TelnetServer/Client.h diff --git a/Servers/TelnetServer/Command.h b/Services/TelnetServer/Command.h similarity index 100% rename from Servers/TelnetServer/Command.h rename to Services/TelnetServer/Command.h diff --git a/Servers/TelnetServer/Makefile b/Services/TelnetServer/Makefile similarity index 100% rename from Servers/TelnetServer/Makefile rename to Services/TelnetServer/Makefile diff --git a/Servers/TelnetServer/Parser.cpp b/Services/TelnetServer/Parser.cpp similarity index 100% rename from Servers/TelnetServer/Parser.cpp rename to Services/TelnetServer/Parser.cpp diff --git a/Servers/TelnetServer/Parser.h b/Services/TelnetServer/Parser.h similarity index 100% rename from Servers/TelnetServer/Parser.h rename to Services/TelnetServer/Parser.h diff --git a/Servers/TelnetServer/main.cpp b/Services/TelnetServer/main.cpp similarity index 100% rename from Servers/TelnetServer/main.cpp rename to Services/TelnetServer/main.cpp diff --git a/Servers/WebServer/Client.cpp b/Services/WebServer/Client.cpp similarity index 100% rename from Servers/WebServer/Client.cpp rename to Services/WebServer/Client.cpp diff --git a/Servers/WebServer/Client.h b/Services/WebServer/Client.h similarity index 100% rename from Servers/WebServer/Client.h rename to Services/WebServer/Client.h diff --git a/Servers/WebServer/Makefile b/Services/WebServer/Makefile similarity index 100% rename from Servers/WebServer/Makefile rename to Services/WebServer/Makefile diff --git a/Servers/WebServer/main.cpp b/Services/WebServer/main.cpp similarity index 100% rename from Servers/WebServer/main.cpp rename to Services/WebServer/main.cpp diff --git a/Servers/WindowServer/AppletManager.cpp b/Services/WindowServer/AppletManager.cpp similarity index 100% rename from Servers/WindowServer/AppletManager.cpp rename to Services/WindowServer/AppletManager.cpp diff --git a/Servers/WindowServer/AppletManager.h b/Services/WindowServer/AppletManager.h similarity index 100% rename from Servers/WindowServer/AppletManager.h rename to Services/WindowServer/AppletManager.h diff --git a/Servers/WindowServer/Button.cpp b/Services/WindowServer/Button.cpp similarity index 100% rename from Servers/WindowServer/Button.cpp rename to Services/WindowServer/Button.cpp diff --git a/Servers/WindowServer/Button.h b/Services/WindowServer/Button.h similarity index 100% rename from Servers/WindowServer/Button.h rename to Services/WindowServer/Button.h diff --git a/Servers/WindowServer/ClientConnection.cpp b/Services/WindowServer/ClientConnection.cpp similarity index 100% rename from Servers/WindowServer/ClientConnection.cpp rename to Services/WindowServer/ClientConnection.cpp diff --git a/Servers/WindowServer/ClientConnection.h b/Services/WindowServer/ClientConnection.h similarity index 100% rename from Servers/WindowServer/ClientConnection.h rename to Services/WindowServer/ClientConnection.h diff --git a/Servers/WindowServer/Clipboard.cpp b/Services/WindowServer/Clipboard.cpp similarity index 100% rename from Servers/WindowServer/Clipboard.cpp rename to Services/WindowServer/Clipboard.cpp diff --git a/Servers/WindowServer/Clipboard.h b/Services/WindowServer/Clipboard.h similarity index 100% rename from Servers/WindowServer/Clipboard.h rename to Services/WindowServer/Clipboard.h diff --git a/Servers/WindowServer/Compositor.cpp b/Services/WindowServer/Compositor.cpp similarity index 100% rename from Servers/WindowServer/Compositor.cpp rename to Services/WindowServer/Compositor.cpp diff --git a/Servers/WindowServer/Compositor.h b/Services/WindowServer/Compositor.h similarity index 100% rename from Servers/WindowServer/Compositor.h rename to Services/WindowServer/Compositor.h diff --git a/Servers/WindowServer/Cursor.cpp b/Services/WindowServer/Cursor.cpp similarity index 100% rename from Servers/WindowServer/Cursor.cpp rename to Services/WindowServer/Cursor.cpp diff --git a/Servers/WindowServer/Cursor.h b/Services/WindowServer/Cursor.h similarity index 100% rename from Servers/WindowServer/Cursor.h rename to Services/WindowServer/Cursor.h diff --git a/Servers/WindowServer/Event.h b/Services/WindowServer/Event.h similarity index 100% rename from Servers/WindowServer/Event.h rename to Services/WindowServer/Event.h diff --git a/Servers/WindowServer/EventLoop.cpp b/Services/WindowServer/EventLoop.cpp similarity index 100% rename from Servers/WindowServer/EventLoop.cpp rename to Services/WindowServer/EventLoop.cpp diff --git a/Servers/WindowServer/EventLoop.h b/Services/WindowServer/EventLoop.h similarity index 100% rename from Servers/WindowServer/EventLoop.h rename to Services/WindowServer/EventLoop.h diff --git a/Servers/WindowServer/Makefile b/Services/WindowServer/Makefile similarity index 100% rename from Servers/WindowServer/Makefile rename to Services/WindowServer/Makefile diff --git a/Servers/WindowServer/Menu.cpp b/Services/WindowServer/Menu.cpp similarity index 100% rename from Servers/WindowServer/Menu.cpp rename to Services/WindowServer/Menu.cpp diff --git a/Servers/WindowServer/Menu.h b/Services/WindowServer/Menu.h similarity index 100% rename from Servers/WindowServer/Menu.h rename to Services/WindowServer/Menu.h diff --git a/Servers/WindowServer/MenuBar.cpp b/Services/WindowServer/MenuBar.cpp similarity index 100% rename from Servers/WindowServer/MenuBar.cpp rename to Services/WindowServer/MenuBar.cpp diff --git a/Servers/WindowServer/MenuBar.h b/Services/WindowServer/MenuBar.h similarity index 100% rename from Servers/WindowServer/MenuBar.h rename to Services/WindowServer/MenuBar.h diff --git a/Servers/WindowServer/MenuItem.cpp b/Services/WindowServer/MenuItem.cpp similarity index 100% rename from Servers/WindowServer/MenuItem.cpp rename to Services/WindowServer/MenuItem.cpp diff --git a/Servers/WindowServer/MenuItem.h b/Services/WindowServer/MenuItem.h similarity index 100% rename from Servers/WindowServer/MenuItem.h rename to Services/WindowServer/MenuItem.h diff --git a/Servers/WindowServer/MenuManager.cpp b/Services/WindowServer/MenuManager.cpp similarity index 100% rename from Servers/WindowServer/MenuManager.cpp rename to Services/WindowServer/MenuManager.cpp diff --git a/Servers/WindowServer/MenuManager.h b/Services/WindowServer/MenuManager.h similarity index 100% rename from Servers/WindowServer/MenuManager.h rename to Services/WindowServer/MenuManager.h diff --git a/Servers/WindowServer/Screen.cpp b/Services/WindowServer/Screen.cpp similarity index 100% rename from Servers/WindowServer/Screen.cpp rename to Services/WindowServer/Screen.cpp diff --git a/Servers/WindowServer/Screen.h b/Services/WindowServer/Screen.h similarity index 100% rename from Servers/WindowServer/Screen.h rename to Services/WindowServer/Screen.h diff --git a/Servers/WindowServer/Window.cpp b/Services/WindowServer/Window.cpp similarity index 100% rename from Servers/WindowServer/Window.cpp rename to Services/WindowServer/Window.cpp diff --git a/Servers/WindowServer/Window.h b/Services/WindowServer/Window.h similarity index 100% rename from Servers/WindowServer/Window.h rename to Services/WindowServer/Window.h diff --git a/Servers/WindowServer/WindowClient.ipc b/Services/WindowServer/WindowClient.ipc similarity index 100% rename from Servers/WindowServer/WindowClient.ipc rename to Services/WindowServer/WindowClient.ipc diff --git a/Servers/WindowServer/WindowFrame.cpp b/Services/WindowServer/WindowFrame.cpp similarity index 100% rename from Servers/WindowServer/WindowFrame.cpp rename to Services/WindowServer/WindowFrame.cpp diff --git a/Servers/WindowServer/WindowFrame.h b/Services/WindowServer/WindowFrame.h similarity index 100% rename from Servers/WindowServer/WindowFrame.h rename to Services/WindowServer/WindowFrame.h diff --git a/Servers/WindowServer/WindowManager.cpp b/Services/WindowServer/WindowManager.cpp similarity index 100% rename from Servers/WindowServer/WindowManager.cpp rename to Services/WindowServer/WindowManager.cpp diff --git a/Servers/WindowServer/WindowManager.h b/Services/WindowServer/WindowManager.h similarity index 100% rename from Servers/WindowServer/WindowManager.h rename to Services/WindowServer/WindowManager.h diff --git a/Servers/WindowServer/WindowServer.ipc b/Services/WindowServer/WindowServer.ipc similarity index 100% rename from Servers/WindowServer/WindowServer.ipc rename to Services/WindowServer/WindowServer.ipc diff --git a/Servers/WindowServer/WindowSwitcher.cpp b/Services/WindowServer/WindowSwitcher.cpp similarity index 100% rename from Servers/WindowServer/WindowSwitcher.cpp rename to Services/WindowServer/WindowSwitcher.cpp diff --git a/Servers/WindowServer/WindowSwitcher.h b/Services/WindowServer/WindowSwitcher.h similarity index 100% rename from Servers/WindowServer/WindowSwitcher.h rename to Services/WindowServer/WindowSwitcher.h diff --git a/Servers/WindowServer/WindowType.h b/Services/WindowServer/WindowType.h similarity index 100% rename from Servers/WindowServer/WindowType.h rename to Services/WindowServer/WindowType.h diff --git a/Servers/WindowServer/main.cpp b/Services/WindowServer/main.cpp similarity index 100% rename from Servers/WindowServer/main.cpp rename to Services/WindowServer/main.cpp diff --git a/Toolchain/ComputeDependenciesHash.sh b/Toolchain/ComputeDependenciesHash.sh index abb9a99b22..0da2cf2a76 100755 --- a/Toolchain/ComputeDependenciesHash.sh +++ b/Toolchain/ComputeDependenciesHash.sh @@ -27,7 +27,7 @@ trap finish EXIT # on *all* of their implementation and recursive dependencies. # Scan all files for potential dependencies. # Thinking in graphs, this computes the edge list: -cat <(find AK/ Libraries/ Servers/ Kernel/ -name '*.h') \ +cat <(find AK/ Libraries/ Services/ Kernel/ -name '*.h') \ <(find Libraries/LibC/ Libraries/LibM/ -name '*.cpp' ! -name 'Test*.cpp' ) | \ xargs grep -F '#include ' | \ sed -r \ @@ -38,7 +38,7 @@ cat <(find AK/ Libraries/ Servers/ Kernel/ -name '*.h') \ -e 's^#include <((bits|netinet|sys|arpa|net)/.*)>^Libraries/LibC/\1^' \ -e 's^#include ^Libraries/LibC/fd_set.h^' \ -e 's^#include <([a-z]{3,10}(_numbers)?\.h)>^Libraries/LibC/\1^' \ - -e 's^#include <([A-Z][a-z]+Server/.*)>^Servers/\1^' \ + -e 's^#include <([A-Z][a-z]+Server/.*)>^Services/\1^' \ -e 's^#include <(.*)>^UNRESOLVED_I/\1^' \ -e 's^#include "(.*)"^UNRESOLVED_L/\1^' > "${DEPLIST_FILE}" # Some #include's cannot be resolved, like . However, these are only