Shell: Move to Userland/Shell/

CMakeLists.txt

@@ -137,9 +137,11 @@ add_link_options(--sysroot ${CMAKE_BINARY_DIR}/Root)
 include_directories(Libraries/LibC)
 include_directories(Libraries/LibM)
 include_directories(Services)
+include_directories(Userland)
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 include_directories(${CMAKE_CURRENT_BINARY_DIR}/Services)
 include_directories(${CMAKE_CURRENT_BINARY_DIR}/Libraries)
+include_directories(${CMAKE_CURRENT_BINARY_DIR}/Userland)
 
 add_subdirectory(AK)
 add_subdirectory(Kernel)
@@ -149,6 +151,5 @@ add_subdirectory(Applications)
 add_subdirectory(Games)
 add_subdirectory(DevTools)
 add_subdirectory(MenuApplets)
-add_subdirectory(Shell)
 add_subdirectory(Demos)
 add_subdirectory(Userland)

Meta/CLion/CMakeLists.txt

@@ -15,7 +15,7 @@ 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/Services/*.cpp")
-file(GLOB_RECURSE SHELL_SOURCES "serenity/Shell/*.cpp")
+file(GLOB_RECURSE SHELL_SOURCES "serenity/Userland/Shell/*.cpp")
 file(GLOB_RECURSE TESTS_SOURCES "serenity/Tests/*.cpp")
 file(GLOB_RECURSE TOOLCHAIN_SOURCES "serenity/Toolchain/*.cpp")
 file(GLOB_RECURSE USERLAND_SOURCES "serenity/Userland/*.cpp")

Meta/Lagom/CMakeLists.txt

@@ -65,9 +65,9 @@ file(GLOB LIBCRYPTO_SOURCES CONFIGURE_DEPENDS "../../Libraries/LibCrypto/*.cpp")
 file(GLOB LIBCRYPTO_SUBDIR_SOURCES CONFIGURE_DEPENDS "../../Libraries/LibCrypto/*/*.cpp")
 file(GLOB LIBTLS_SOURCES CONFIGURE_DEPENDS "../../Libraries/LibTLS/*.cpp")
 file(GLOB LIBTTF_SOURCES CONFIGURE_DEPENDS "../../Libraries/LibTTF/*.cpp")
-file(GLOB SHELL_SOURCES CONFIGURE_DEPENDS "../../Shell/*.cpp")
-file(GLOB SHELL_TESTS CONFIGURE_DEPENDS "../../Shell/Tests/*.sh")
-list(REMOVE_ITEM SHELL_SOURCES ../../Shell/main.cpp)
+file(GLOB SHELL_SOURCES CONFIGURE_DEPENDS "../../Userland/Shell/*.cpp")
+file(GLOB SHELL_TESTS CONFIGURE_DEPENDS "../../Userland/Shell/Tests/*.sh")
+list(REMOVE_ITEM SHELL_SOURCES ../../Userland/Shell/main.cpp)
 
 set(LAGOM_REGEX_SOURCES ${LIBREGEX_LIBC_SOURCES} ${LIBREGEX_SOURCES})
 set(LAGOM_CORE_SOURCES ${AK_SOURCES} ${LIBCORE_SOURCES})
@@ -131,7 +131,7 @@ if (BUILD_LAGOM)
         target_link_libraries(disasm_lagom Lagom)
         target_link_libraries(disasm_lagom stdc++)
 
-        add_executable(shell_lagom ../../Shell/main.cpp)
+        add_executable(shell_lagom ../../Userland/Shell/main.cpp)
         set_target_properties(shell_lagom PROPERTIES OUTPUT_NAME shell)
         target_link_libraries(shell_lagom Lagom)
         target_link_libraries(shell_lagom stdc++)

Meta/lint-missing-resources.sh

@@ -7,7 +7,7 @@ cd "$script_path/.."
 
 # The dollar symbol in sed's argument is for "end of line", not any shell variable.
 # shellcheck disable=SC2016
-grep -Pirh '(?<!file://)(?<!\.)(?<!})(?<!\()/(etc|res|usr|www)/' AK/ Applications/ Base Demos/ DevTools/ Documentation/ Games/ Kernel/ Libraries/ MenuApplets/ Services/ Shell/ Userland/ | \
+grep -Pirh '(?<!file://)(?<!\.)(?<!})(?<!\()/(etc|res|usr|www)/' AK/ Applications/ Base Demos/ DevTools/ Documentation/ Games/ Kernel/ Libraries/ MenuApplets/ Services/ Userland/ | \
 sed -re 's,^.*["= `]/([^"%`: ]+[^"%`: /.])/?(["%`: .].*)?$,\1,' | \
 sort -u | \
 while read -r referenced_resource

Meta/lint-shell-scripts.sh

@@ -11,7 +11,7 @@ if [ "$#" -eq "0" ]; then
             '*.sh' \
             ':!:Toolchain' \
             ':!:Ports' \
-            ':!:Shell/Tests'
+            ':!:Userland/Shell/Tests'
     )
 else
     files=()

Userland/CMakeLists.txt

@@ -48,5 +48,6 @@ target_link_libraries(tt LibPthread)
 target_link_libraries(grep LibRegex)
 target_link_libraries(gunzip LibCompress)
 
-add_subdirectory(Tests)
 add_subdirectory(DynamicLoader)
+add_subdirectory(Shell)
+add_subdirectory(Tests)