mirror of
https://github.com/SerenityOS/serenity
synced 2024-10-07 00:19:27 +00:00
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.
This commit is contained in:
parent
042b1f6814
commit
cf3b58fbe8
|
@ -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
|
||||
|
|
|
@ -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.
|
||||
|
|
|
@ -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/
|
||||
|
|
|
@ -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:
|
||||
|
|
|
@ -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:
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
2
Makefile
2
Makefile
|
@ -2,7 +2,7 @@ SUBDIRS += \
|
|||
Libraries \
|
||||
AK \
|
||||
DevTools \
|
||||
Servers
|
||||
Services
|
||||
|
||||
SUBDIRS += \
|
||||
Applications \
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue