[Opt] project structure refactored with workspace

M4tsuri · Nov 21, 2021 · adee611 · adee611
1 parent 50fabe7
commit adee611
Show file tree

Hide file tree

Showing 43 changed files with 505 additions and 21 deletions.
diff --git a/kernel/.cargo/config → .cargo/config b/kernel/.cargo/config → .cargo/config
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -0,0 +1,11 @@
+[workspace]
+
+members = [
+    "bootloader/shared",
+    "bootloader/stage_1",
+    "bootloader/stage_2",
+    "bootloader/stage_3",
+    "kernel",
+    "i386",
+    "kbuild"
+]
diff --git a/bootloader/bios/shared/Cargo.lock → bootloader/shared/Cargo.lock b/bootloader/bios/shared/Cargo.lock → bootloader/shared/Cargo.lock
diff --git a/bootloader/bios/shared/Cargo.toml → bootloader/shared/Cargo.toml b/bootloader/bios/shared/Cargo.toml → bootloader/shared/Cargo.toml
@@ -6,4 +6,4 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-i386 = { path = "../../../../i386" }
+i386 = { path = "../../i386" }
diff --git a/bootloader/bios/shared/src/gdt.rs → bootloader/shared/src/gdt.rs b/bootloader/bios/shared/src/gdt.rs → bootloader/shared/src/gdt.rs
diff --git a/bootloader/bios/shared/src/layout.rs → bootloader/shared/src/layout.rs b/bootloader/bios/shared/src/layout.rs → bootloader/shared/src/layout.rs
diff --git a/bootloader/bios/shared/src/layout.rs.temp → bootloader/shared/src/layout.rs.temp b/bootloader/bios/shared/src/layout.rs.temp → bootloader/shared/src/layout.rs.temp
diff --git a/bootloader/bios/shared/src/lib.rs → bootloader/shared/src/lib.rs b/bootloader/bios/shared/src/lib.rs → bootloader/shared/src/lib.rs
diff --git a/bootloader/bios/stage_1/.cargo/config → bootloader/stage_1/.cargo/config b/bootloader/bios/stage_1/.cargo/config → bootloader/stage_1/.cargo/config
diff --git a/bootloader/bios/stage_1/Cargo.lock → bootloader/stage_1/Cargo.lock b/bootloader/bios/stage_1/Cargo.lock → bootloader/stage_1/Cargo.lock
diff --git a/bootloader/bios/stage_1/Cargo.toml → bootloader/stage_1/Cargo.toml b/bootloader/bios/stage_1/Cargo.toml → bootloader/stage_1/Cargo.toml
@@ -6,5 +6,5 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-i386 = { path = "../../../../i386" }
+i386 = { path = "../../i386" }
 shared = { path = "../shared" }
diff --git a/bootloader/bios/stage_1/src/img_load.rs → bootloader/stage_1/src/img_load.rs b/bootloader/bios/stage_1/src/img_load.rs → bootloader/stage_1/src/img_load.rs
diff --git a/bootloader/bios/stage_1/src/main.rs → bootloader/stage_1/src/main.rs b/bootloader/bios/stage_1/src/main.rs → bootloader/stage_1/src/main.rs
diff --git a/bootloader/bios/stage_1/stage_1.ld → bootloader/stage_1/stage_1.ld b/bootloader/bios/stage_1/stage_1.ld → bootloader/stage_1/stage_1.ld
diff --git a/bootloader/bios/stage_1/stage_1.ld.temp → bootloader/stage_1/stage_1.ld.temp b/bootloader/bios/stage_1/stage_1.ld.temp → bootloader/stage_1/stage_1.ld.temp
diff --git a/bootloader/bios/stage_2/target.json → bootloader/stage_1/target.json b/bootloader/bios/stage_2/target.json → bootloader/stage_1/target.json
@@ -24,7 +24,7 @@
     "features": "-mmx,-sse,+soft-float",
     "pre-link-args": {
         "ld.lld": [
-            "--script=stage_2.ld"
+            "--script=bootloader/stage_1/stage_1.ld"
         ]
     }
 }
diff --git a/bootloader/bios/stage_2/Cargo.lock → bootloader/stage_2/Cargo.lock b/bootloader/bios/stage_2/Cargo.lock → bootloader/stage_2/Cargo.lock
diff --git a/bootloader/bios/stage_2/Cargo.toml → bootloader/stage_2/Cargo.toml b/bootloader/bios/stage_2/Cargo.toml → bootloader/stage_2/Cargo.toml
@@ -6,5 +6,5 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-i386 = { path = "../../../../i386" }
+i386 = { path = "../../i386" }
 shared = { path = "../shared" }
diff --git a/bootloader/bios/stage_2/src/a20.rs → bootloader/stage_2/src/a20.rs b/bootloader/bios/stage_2/src/a20.rs → bootloader/stage_2/src/a20.rs
diff --git a/bootloader/bios/stage_2/src/display.rs → bootloader/stage_2/src/display.rs b/bootloader/bios/stage_2/src/display.rs → bootloader/stage_2/src/display.rs
diff --git a/bootloader/bios/stage_2/src/img_load.rs → bootloader/stage_2/src/img_load.rs b/bootloader/bios/stage_2/src/img_load.rs → bootloader/stage_2/src/img_load.rs
diff --git a/bootloader/bios/stage_2/src/main.rs → bootloader/stage_2/src/main.rs b/bootloader/bios/stage_2/src/main.rs → bootloader/stage_2/src/main.rs
diff --git a/bootloader/bios/stage_2/src/mode_switch.rs → bootloader/stage_2/src/mode_switch.rs b/bootloader/bios/stage_2/src/mode_switch.rs → bootloader/stage_2/src/mode_switch.rs
diff --git a/bootloader/bios/stage_2/stage_2.ld → bootloader/stage_2/stage_2.ld b/bootloader/bios/stage_2/stage_2.ld → bootloader/stage_2/stage_2.ld
diff --git a/bootloader/bios/stage_2/stage_2.ld.temp → bootloader/stage_2/stage_2.ld.temp b/bootloader/bios/stage_2/stage_2.ld.temp → bootloader/stage_2/stage_2.ld.temp
diff --git a/bootloader/bios/stage_1/target.json → bootloader/stage_2/target.json b/bootloader/bios/stage_1/target.json → bootloader/stage_2/target.json
@@ -24,7 +24,7 @@
     "features": "-mmx,-sse,+soft-float",
     "pre-link-args": {
         "ld.lld": [
-            "--script=stage_1.ld"
+            "--script=bootloader/stage_2/stage_2.ld"
         ]
     }
 }
diff --git a/bootloader/bios/stage_3/Cargo.lock → bootloader/stage_3/Cargo.lock b/bootloader/bios/stage_3/Cargo.lock → bootloader/stage_3/Cargo.lock
diff --git a/bootloader/bios/stage_3/Cargo.toml → bootloader/stage_3/Cargo.toml b/bootloader/bios/stage_3/Cargo.toml → bootloader/stage_3/Cargo.toml
@@ -6,5 +6,5 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-i386 = { path = "../../../../i386" }
+i386 = { path = "../../i386" }
 shared = { path = "../shared" }
diff --git a/bootloader/bios/stage_3/src/display.rs → bootloader/stage_3/src/display.rs b/bootloader/bios/stage_3/src/display.rs → bootloader/stage_3/src/display.rs
diff --git a/bootloader/bios/stage_3/src/main.rs → bootloader/stage_3/src/main.rs b/bootloader/bios/stage_3/src/main.rs → bootloader/stage_3/src/main.rs
diff --git a/bootloader/bios/stage_3/stage_3.ld → bootloader/stage_3/stage_3.ld b/bootloader/bios/stage_3/stage_3.ld → bootloader/stage_3/stage_3.ld
diff --git a/bootloader/bios/stage_3/stage_3.ld.temp → bootloader/stage_3/stage_3.ld.temp b/bootloader/bios/stage_3/stage_3.ld.temp → bootloader/stage_3/stage_3.ld.temp
diff --git a/bootloader/bios/stage_3/target.json → bootloader/stage_3/target.json b/bootloader/bios/stage_3/target.json → bootloader/stage_3/target.json
@@ -16,7 +16,7 @@
     "features": "-mmx,-sse,+soft-float",
     "pre-link-args": {
         "ld.lld": [
-            "--script=stage_3.ld"
+            "--script=bootloader/stage_3/stage_3.ld"
         ]
     }
 }
diff --git a/bootloader/i386-32bit.xml → i386-32bit.xml b/bootloader/i386-32bit.xml → i386-32bit.xml
diff --git a/kernel/kbuild/Cargo.lock → kbuild/Cargo.lock b/kernel/kbuild/Cargo.lock → kbuild/Cargo.lock
diff --git a/kernel/kbuild/Cargo.toml → kbuild/Cargo.toml b/kernel/kbuild/Cargo.toml → kbuild/Cargo.toml
diff --git a/kernel/kbuild/src/bootloader.rs → kbuild/src/bootloader.rs b/kernel/kbuild/src/bootloader.rs → kbuild/src/bootloader.rs
@@ -24,16 +24,16 @@ lazy_static! {
 
 pub fn build() -> Vec<PathBuf> {
     [
-        "bios/shared/src/layout.rs.temp",
-        "bios/stage_1/stage_1.ld.temp",
-        "bios/stage_2/stage_2.ld.temp",
-        "bios/stage_3/stage_3.ld.temp",
+        "shared/src/layout.rs.temp",
+        "stage_1/stage_1.ld.temp",
+        "stage_2/stage_2.ld.temp",
+        "stage_3/stage_3.ld.temp",
     ].map(|x| PREFIX.join(x))
      .map(|x| apply_template(&LAYOUT_CONF, &x));
     [
-        "bios/stage_1",
-        "bios/stage_2",
-        "bios/stage_3",
+        "stage_1",
+        "stage_2",
+        "stage_3",
     ].map(|x| PREFIX.join(x))
      .map(|x| build_subproject(&x, &x.join("target.json")))
      .to_vec()

diff --git a/kernel/kbuild/src/config.rs → kbuild/src/config.rs b/kernel/kbuild/src/config.rs → kbuild/src/config.rs
@@ -14,8 +14,5 @@ lazy_static! {
             .tool(&exe("llvm-objcopy"))
             .expect("llvm-objcopy not found")
     };
-    pub static ref TARGET: PathBuf = {
-        let cur = env::current_dir().unwrap();
-        cur.join("target")
-    };
+    pub static ref TARGET: PathBuf = ROOT_PROJ.join("target");
 }
diff --git a/kernel/kbuild/src/kernel.rs → kbuild/src/kernel.rs b/kernel/kbuild/src/kernel.rs → kbuild/src/kernel.rs
diff --git a/kernel/kbuild/src/main.rs → kbuild/src/main.rs b/kernel/kbuild/src/main.rs → kbuild/src/main.rs
@@ -7,6 +7,7 @@ use std::process::Command;
 use std::str::FromStr;
 extern crate clap;
 use clap::{Arg, value_t};
+use config::ROOT_PROJ;
 
 mod bootloader;
 mod kernel;
@@ -78,8 +79,8 @@ fn main() {
         .unwrap_or_else(|e| e.exit());
 
     match ty {
-        Choice::Build => build(&kernel::PREFIX.join("target").join("orusts")),
-        Choice::Run => run(&kernel::PREFIX.join("target").join("orusts"))
+        Choice::Build => build(&ROOT_PROJ.join("target").join("orusts")),
+        Choice::Run => run(&ROOT_PROJ.join("target").join("orusts"))
     }
 
     println!("Build Done.");

diff --git a/kernel/target.json b/kernel/target.json
@@ -17,7 +17,7 @@
     "features": "-mmx,-sse,+soft-float",
     "pre-link-args": {
         "ld.lld": [
-            "--script=kernel.ld"
+            "--script=kernel/kernel.ld"
         ]
     }
 }
diff --git a/kernel/target.xml → target.xml b/kernel/target.xml → target.xml