userland: add a "window server", clean up the userland directory structure

Author: 48cf

userland/Cargo.lock

@@ -1,5 +1,5 @@
 [workspace]
-members = ["aero_shell", "aero_ipc", "init", "system_server", "utest"]
+members = ["apps/*", "servers/*"]
 
 [profile.release]
 debug = true

userland/Cargo.toml

@@ -1,10 +1,10 @@
-[package]
-name = "aero_shell"
-version = "0.1.0"
-authors = ["Anhad Singh <andypythonappdeveloper@gmail.com>"]
-edition = "2021"
-
-[dependencies]
-aero_syscall = { path = "../../src/aero_syscall" }
-aero_ipc = { path = "../aero_ipc" }
-std = { path = "../aero_std" }
+[package]
+name = "aero_shell"
+version = "0.1.0"
+authors = ["Anhad Singh <andypythonappdeveloper@gmail.com>"]
+edition = "2021"
+
+[dependencies]
+std = { path = "../../libs/aero_std" }
+aero_syscall = { path = "../../../src/aero_syscall" }
+aero_ipc = { path = "../../libs/aero_ipc" }

userland/aero_shell/Cargo.toml userland/apps/aero_shell/Cargo.tomluserland/aero_shell/Cargo.toml renamed to userland/apps/aero_shell/Cargo.toml

@@ -5,5 +5,5 @@ authors = ["czapek1337 <czapek1337@gmail.com>"]
 edition = "2021"
 
 [dependencies]
-aero_syscall = { path = "../../src/aero_syscall" }
-std = { path = "../aero_std" }
+std = { path = "../../libs/aero_std" }
+aero_syscall = { path = "../../../src/aero_syscall" }

userland/aero_shell/src/main.rs userland/apps/aero_shell/src/main.rsuserland/aero_shell/src/main.rs renamed to userland/apps/aero_shell/src/main.rs

@@ -35,19 +35,6 @@ fn main() -> Result<(), AeroSyscallError> {
     sys_open("/dev/tty", OpenFlags::O_WRONLY)?;
     sys_open("/dev/tty", OpenFlags::O_WRONLY)?;
 
-    // TODO: make this test case succeed!
-    let _1 = Box::new(0);
-    let pid = sys_fork()?;
-
-    if pid == 0 {
-        let _2 = Box::new(0);
-        println!("from child: {}", _2);
-        return Ok(());
-    } else {
-        let _2 = Box::new(0);
-        println!("from parent: {}", _2);
-    }
-
     fork_and_exec("/bin/system_server", &[], &[])?;
     fork_and_exec("/bin/aero_shell", &[], &[])?;
 

userland/init/Cargo.toml userland/apps/init/Cargo.tomluserland/init/Cargo.toml renamed to userland/apps/init/Cargo.toml

@@ -5,7 +5,7 @@ edition = "2021"
 authors = ["Anhad Singh <andypythonappdeveloper@gmail.com>"]
 
 [dependencies]
-std = { path = "../aero_std" }
-aero_syscall = { path = "../../src/aero_syscall" }
-aero_ipc = { path = "../aero_ipc" }
+std = { path = "../../libs/aero_std" }
+aero_syscall = { path = "../../../src/aero_syscall" }
+aero_ipc = { path = "../../libs/aero_ipc" }
 utest-proc = { path = "../utest-proc" }